From 5174c0055830818f0b772004422211d1eb91b121 Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Tue, 9 Jan 2024 20:35:40 +0100
Subject: [PATCH] make timestamp abbreviations plurals (#4202)

some languages require it

closes #4145

Changing all the strings was easy with the Regex replace feature
https://www.jetbrains.com/help/idea/tutorial-finding-and-replacing-text-using-regular-expressions.html
---
 .../tusky/util/TimestampUtils.kt              | 37 ++++++++--------
 app/src/main/res/values-ar/strings.xml        | 40 ++++++++++++-----
 app/src/main/res/values-be/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-bg/strings.xml        | 40 ++++++++++++-----
 app/src/main/res/values-bn-rBD/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-bn-rIN/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-ca/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-ckb/strings.xml       | 42 +++++++++++++-----
 app/src/main/res/values-cs/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-cy/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-de/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-eo/strings.xml        | 44 ++++++++++++++-----
 app/src/main/res/values-es/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-eu/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-fa/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-fr/strings.xml        | 44 ++++++++++++++-----
 app/src/main/res/values-fy/strings.xml        | 20 ++++++---
 app/src/main/res/values-ga/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-gd/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-gl/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-hu/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-is/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-it/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-ja/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-kab/strings.xml       | 35 +++++++++++----
 app/src/main/res/values-ko/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-lv/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-nb-rNO/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-nl/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-oc/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-pl/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-pt-rBR/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-pt-rPT/strings.xml    | 40 ++++++++++++-----
 app/src/main/res/values-ru/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-sa/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-si/strings.xml        | 40 ++++++++++++-----
 app/src/main/res/values-sl/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-sv/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-ta/strings.xml        | 40 ++++++++++++-----
 app/src/main/res/values-th/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-tr/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-uk/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-vi/strings.xml        | 42 +++++++++++++-----
 app/src/main/res/values-zh-rCN/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-zh-rHK/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-zh-rMO/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values-zh-rSG/strings.xml    | 40 ++++++++++++-----
 app/src/main/res/values-zh-rTW/strings.xml    | 42 +++++++++++++-----
 app/src/main/res/values/strings.xml           | 40 ++++++++++++-----
 49 files changed, 1480 insertions(+), 534 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/util/TimestampUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/TimestampUtils.kt
index a6717ed4..c4d96afa 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/TimestampUtils.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/TimestampUtils.kt
@@ -39,44 +39,43 @@ fun getRelativeTimeSpanString(context: Context, then: Long, now: Long): String {
         future = true
         span = -span
     }
-    val format: Int
-    if (span < MINUTE_IN_MILLIS) {
+    val format = if (span < MINUTE_IN_MILLIS) {
         span /= SECOND_IN_MILLIS
-        format = if (future) {
-            R.string.abbreviated_in_seconds
+        if (future) {
+            R.plurals.abbreviated_in_seconds
         } else {
-            R.string.abbreviated_seconds_ago
+            R.plurals.abbreviated_seconds_ago
         }
     } else if (span < HOUR_IN_MILLIS) {
         span /= MINUTE_IN_MILLIS
-        format = if (future) {
-            R.string.abbreviated_in_minutes
+        if (future) {
+            R.plurals.abbreviated_in_minutes
         } else {
-            R.string.abbreviated_minutes_ago
+            R.plurals.abbreviated_minutes_ago
         }
     } else if (span < DAY_IN_MILLIS) {
         span /= HOUR_IN_MILLIS
-        format = if (future) {
-            R.string.abbreviated_in_hours
+        if (future) {
+            R.plurals.abbreviated_in_hours
         } else {
-            R.string.abbreviated_hours_ago
+            R.plurals.abbreviated_hours_ago
         }
     } else if (span < YEAR_IN_MILLIS) {
         span /= DAY_IN_MILLIS
-        format = if (future) {
-            R.string.abbreviated_in_days
+        if (future) {
+            R.plurals.abbreviated_in_days
         } else {
-            R.string.abbreviated_days_ago
+            R.plurals.abbreviated_days_ago
         }
     } else {
         span /= YEAR_IN_MILLIS
-        format = if (future) {
-            R.string.abbreviated_in_years
+        if (future) {
+            R.plurals.abbreviated_in_years
         } else {
-            R.string.abbreviated_years_ago
+            R.plurals.abbreviated_years_ago
         }
     }
-    return context.getString(format, span)
+    return context.resources.getQuantityString(format, span.toInt(), span)
 }
 
 fun formatPollDuration(context: Context, then: Long, now: Long): String {
@@ -98,5 +97,5 @@ fun formatPollDuration(context: Context, then: Long, now: Long): String {
         span /= DAY_IN_MILLIS
         format = R.plurals.poll_timespan_days
     }
-    return context.resources.getQuantityString(format, span.toInt(), span.toInt())
+    return context.resources.getQuantityString(format, span.toInt(), span)
 }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 31e7d562..5e33f2c7 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -240,16 +240,36 @@
     <string name="post_media_video">فيديو</string>
     <string name="state_follow_requested">طلب متابعة</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">في %dy</string>
-    <string name="abbreviated_in_days">في %dd</string>
-    <string name="abbreviated_in_hours">في %dh</string>
-    <string name="abbreviated_in_minutes">في %dm</string>
-    <string name="abbreviated_in_seconds">في %ds</string>
-    <string name="abbreviated_years_ago">%dس</string>
-    <string name="abbreviated_days_ago">%dأيام</string>
-    <string name="abbreviated_hours_ago">%dسا</string>
-    <string name="abbreviated_minutes_ago">%dد</string>
-    <string name="abbreviated_seconds_ago">%dثا</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">في %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">في %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">في %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">في %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">في %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dس</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dأيام</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dسا</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dد</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dثا</item>
+    </plurals>
     <string name="follows_you">يتبعك الآن</string>
     <string name="pref_title_alway_show_sensitive_media">أظهر دائما المحتوى الحساس</string>
     <string name="title_media">الوسائط</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 89a941cd..d82b567a 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -323,16 +323,36 @@
     <string name="status_count_one_plus">1+</string>
     <string name="status_created_at_now">зараз</string>
     <string name="state_follow_requested">Запыт на падпіску</string>
-    <string name="abbreviated_in_years">праз %dг</string>
-    <string name="abbreviated_in_days">праз %dд</string>
-    <string name="abbreviated_in_hours">праз %dгад</string>
-    <string name="abbreviated_in_minutes">праз %dхв</string>
-    <string name="abbreviated_in_seconds">праз %dс</string>
-    <string name="abbreviated_years_ago">%dг</string>
-    <string name="abbreviated_days_ago">%dд</string>
-    <string name="abbreviated_hours_ago">%dгад</string>
-    <string name="abbreviated_minutes_ago">%dхв</string>
-    <string name="abbreviated_seconds_ago">%dс</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">праз %dг</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">праз %dд</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">праз %dгад</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">праз %dхв</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">праз %dс</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dг</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dд</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dгад</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dхв</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dс</item>
+    </plurals>
     <string name="title_media">Медыя</string>
     <string name="pref_title_alway_open_spoiler">Заўсёды разгортваць допіс з далікатным зместам</string>
     <string name="replying_to">Адказ для @%s</string>
@@ -659,4 +679,4 @@
     <string name="filter_keyword_display_format">%s (цэлае слова)</string>
     <string name="filter_keyword_addition_title">Дадаць ключавое слова</string>
     <string name="filter_edit_keyword_title">Змяніць ключавое слова</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 9aa38a2b..1be60f18 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -163,16 +163,36 @@
     <string name="pref_title_alway_open_spoiler">Винаги разгъване на публикации, маркирани с предупреждения за съдържание</string>
     <string name="pref_title_alway_show_sensitive_media">Винаги показване на деликатно съдържание</string>
     <string name="follows_you">Следва ви</string>
-    <string name="abbreviated_seconds_ago">%dс</string>
-    <string name="abbreviated_minutes_ago">%dм</string>
-    <string name="abbreviated_hours_ago">%dч</string>
-    <string name="abbreviated_days_ago">%dд</string>
-    <string name="abbreviated_years_ago">%dг</string>
-    <string name="abbreviated_in_seconds">след %dс</string>
-    <string name="abbreviated_in_minutes">след %dм</string>
-    <string name="abbreviated_in_hours">след %dч</string>
-    <string name="abbreviated_in_years">след %dг</string>
-    <string name="abbreviated_in_days">след %dд</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dс</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dм</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dч</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dд</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dг</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">след %dс</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">след %dм</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">след %dч</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">след %dг</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">след %dд</item>
+    </plurals>
     <string name="state_follow_requested">Заявено последване</string>
     <string name="post_media_attachments">Прикачени файлове</string>
     <string name="post_media_audio">Аудио</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 794e4008..7be26a64 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="conversation_1_recipients">%1$s</string>
-    <string name="abbreviated_seconds_ago">%dসে</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dসে</item>
+    </plurals>
     <string name="description_poll">পছন্দগুলি সহ নর্বাচন: %1$s, %2$s, %3$s, %4$s; %5$s</string>
     <string name="description_visibility_direct">সরাসরি</string>
     <string name="description_visibility_private">অনুগামিবৃন্দ</string>
@@ -85,11 +87,21 @@
     <string name="title_media">মিডিয়া</string>
     <string name="pref_title_alway_show_sensitive_media">সর্বদা সংবেদনশীল কন্টেন্ট প্রদর্শন করুন</string>
     <string name="follows_you">আপনাকে অনুসরন করে</string>
-    <string name="abbreviated_in_seconds">\'%ds এ\'</string>
-    <string name="abbreviated_in_minutes">\'%dm এ\'</string>
-    <string name="abbreviated_in_hours">\'%dh এ\'</string>
-    <string name="abbreviated_in_days">\'%dd এ\'</string>
-    <string name="abbreviated_in_years">\'%dy এ\'</string>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">\'%ds এ\'</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">\'%dm এ\'</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">\'%dh এ\'</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">\'%dd এ\'</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">\'%dy এ\'</item>
+    </plurals>
     <string name="state_follow_requested">অনুরোধ অনুসরণ করুন</string>
     <string name="post_media_video">ভিডিও</string>
     <string name="post_media_images">চিত্রগুলি</string>
@@ -298,10 +310,18 @@
     <string name="title_follow_requests">অনুরোধ অনুসরণ করুন</string>
     <string name="title_blocks">অবরুদ্ধ ব্যবহারকারী</string>
     <string name="title_mutes">শব্দ বন্ধ ব্যবহারকারী</string>
-    <string name="abbreviated_days_ago">%dদি</string>
-    <string name="abbreviated_minutes_ago">%dমা</string>
-    <string name="abbreviated_hours_ago">%dঘ</string>
-    <string name="abbreviated_years_ago">%dব</string>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dদি</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dমা</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dঘ</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dব</item>
+    </plurals>
     <string name="post_boosted_format">%s বুস্টকৃত</string>
     <string name="post_username_format">\@%s</string>
     <string name="dialog_mute_hide_notifications">বিজ্ঞপ্তি লুকাও</string>
@@ -503,4 +523,4 @@
     <string name="notification_summary_small">%1$s আর %2$s</string>
     <string name="notification_summary_medium">%1$s, %2$s, আর %3$s</string>
     <string name="notification_mention_format">%s তোমাকে উল্লেখ করেছে</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index ca2e7ad2..6ec39f0f 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -247,16 +247,36 @@
     <string name="post_media_video">ভিডিও</string>
     <string name="state_follow_requested">অনুরোধ অনুসরণ করুন</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%dy এ</string>
-    <string name="abbreviated_in_days">%dd এ</string>
-    <string name="abbreviated_in_hours">%dh এ</string>
-    <string name="abbreviated_in_minutes">%dm এ</string>
-    <string name="abbreviated_in_seconds">%ds এ</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">%dy এ</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">%dd এ</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">%dh এ</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%dm এ</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%ds এ</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">আপনাকে অনুসরন করে</string>
     <string name="pref_title_alway_show_sensitive_media">সর্বদা সংবেদনশীল কন্টেন্ট প্রদর্শন করুন</string>
     <string name="title_media">মিডিয়া</string>
@@ -463,4 +483,4 @@
     <string name="no_drafts">তোমার কোনো খসড়া নেই।</string>
     <string name="warning_scheduling_interval">মাস্টোডনের সর্বনিম্ন ৫ মিনিটের সময়সূচীর বিরতি আছে।</string>
     <string name="pref_title_hide_top_toolbar">শীর্ষস্থানীয় সরঞ্জামদণ্ডের শিরোনামটি লুকান</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index e91de25d..6b867035 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -177,16 +177,36 @@
     <string name="post_media_images">Imatges</string>
     <string name="post_media_video">Vídeo</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">en %d anys</string>
-    <string name="abbreviated_in_days">en %dd</string>
-    <string name="abbreviated_in_hours">en %dh</string>
-    <string name="abbreviated_in_minutes">en %dm</string>
-    <string name="abbreviated_in_seconds">en %ds</string>
-    <string name="abbreviated_years_ago">%d anys</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">en %d anys</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">en %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">en %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">en %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">en %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d anys</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Et segueix</string>
     <string name="pref_title_alway_show_sensitive_media">Mostra el contingut no apte (NSFW)</string>
     <string name="title_media">Multimèdia</string>
@@ -629,4 +649,4 @@
     <string name="status_filtered_show_anyway">Mostra de totes maneres</string>
     <string name="socket_timeout_exception">El contacte amb el teu servidor ha trigat massa</string>
     <string name="ui_error_unknown">motiu desconegut</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index 43b04159..b3ce28d1 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -410,16 +410,36 @@
     <string name="pref_title_alway_open_spoiler">هەمیشە ئەو توتانەی کە بە ئاگادارکردنەوەکانی ناوەڕۆکەوە نیشانەکراون فراوان بکە</string>
     <string name="pref_title_alway_show_sensitive_media">هەمیشە ناوەڕۆکی هەستیار نیشان بدە</string>
     <string name="follows_you">دوای تۆ دەکەوێت</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_in_seconds">لە %ds</string>
-    <string name="abbreviated_in_minutes">لە %dm</string>
-    <string name="abbreviated_in_hours">لە %dh</string>
-    <string name="abbreviated_in_days">لە %dd</string>
-    <string name="abbreviated_in_years">لە %dy</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">لە %ds</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">لە %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">لە %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">لە %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">لە %dy</item>
+    </plurals>
     <string name="state_follow_requested">بەدواداچوونەوەی داواکراو</string>
     <string name="post_media_video">ڤیدیۆ</string>
     <string name="post_media_images">وێنەکان</string>
@@ -471,4 +491,4 @@
     <string name="pref_failed_to_sync">سەرکەوتوو نەبوو لە هاودەمکردنی ڕێکبەندەکان</string>
     <string name="pref_publishing">بڵاوکردنەوە (هاوکاتکراوە لەگەڵ سێرڤەر)</string>
     <string name="pref_default_media_sensitivity">هەمیشە میدیا وەک هەستیار نیشان بکە</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index a365ddb0..6972f042 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -248,16 +248,36 @@
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Vyžádáno sledování</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">za %d let</string>
-    <string name="abbreviated_in_days">za %d d</string>
-    <string name="abbreviated_in_hours">za %d h</string>
-    <string name="abbreviated_in_minutes">za %d m</string>
-    <string name="abbreviated_in_seconds">za %d s</string>
-    <string name="abbreviated_years_ago">%d let</string>
-    <string name="abbreviated_days_ago">%d d</string>
-    <string name="abbreviated_hours_ago">%d h</string>
-    <string name="abbreviated_minutes_ago">%d min</string>
-    <string name="abbreviated_seconds_ago">%d s</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">za %d let</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">za %d d</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">za %d h</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">za %d m</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">za %d s</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d let</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d d</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d h</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d min</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d s</item>
+    </plurals>
     <string name="follows_you">Sleduje vás</string>
     <string name="pref_title_alway_show_sensitive_media">Vždy zobrazovat citlivý obsah</string>
     <string name="title_media">Média</string>
@@ -573,4 +593,4 @@
     <string name="dialog_delete_conversation_warning">Smazat tuto konverzaci\?</string>
     <string name="pref_title_notification_filter_follow_requests">Požádáno o sledování</string>
     <string name="pref_title_animate_custom_emojis">Animovat vlastní emotikony</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index d243d569..941fc818 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -213,16 +213,36 @@
     <string name="post_media_video">Fideo</string>
     <string name="state_follow_requested">Ceisiwyd</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">ymhen %dy</string>
-    <string name="abbreviated_in_days">ymhen %dd</string>
-    <string name="abbreviated_in_hours">ymhen %dh</string>
-    <string name="abbreviated_in_minutes">ymhen %dm</string>
-    <string name="abbreviated_in_seconds">ymhen %ds</string>
-    <string name="abbreviated_years_ago">%db yn ôl</string>
-    <string name="abbreviated_days_ago">%dd yn ôl</string>
-    <string name="abbreviated_hours_ago">%da yn ôl</string>
-    <string name="abbreviated_minutes_ago">%dm yn ôl</string>
-    <string name="abbreviated_seconds_ago">%de yn ôl</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">ymhen %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">ymhen %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">ymhen %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">ymhen %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">ymhen %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%db yn ôl</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd yn ôl</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%da yn ôl</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm yn ôl</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%de yn ôl</item>
+    </plurals>
     <string name="follows_you">Yn dy ddilyn di</string>
     <string name="pref_title_alway_show_sensitive_media">Dangos cynnwys sensitif bob tro</string>
     <string name="title_media">Cyfryngau</string>
@@ -749,4 +769,4 @@
     <string name="pref_title_show_self_boosts">Dangos hunan-hybiau</string>
     <string name="pref_title_show_self_boosts_description">Rhywun yn hybu ei neges ei hunan</string>
     <string name="pref_title_per_timeline_preferences">Dewisiadau i bob ffrwd</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index caa06531..1fb31db3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -455,10 +455,18 @@
     <string name="pref_main_nav_position">Position der Hauptnavigation</string>
     <string name="dialog_mute_hide_notifications">Benachrichtigungen ausblenden</string>
     <string name="action_unmute_desc">%s nicht mehr stummschalten</string>
-    <string name="abbreviated_seconds_ago">%d Sek.</string>
-    <string name="abbreviated_hours_ago">%d Std.</string>
-    <string name="abbreviated_in_days">in %d T.</string>
-    <string name="abbreviated_years_ago">%d J.</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d Sek.</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d Std.</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">in %d T.</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d J.</item>
+    </plurals>
     <string name="account_note_saved">Gespeichert!</string>
     <string name="account_note_hint">Private Notiz über dieses Konto</string>
     <string name="pref_title_hide_top_toolbar">Titel der Hauptnavigation ausblenden</string>
@@ -482,7 +490,9 @@
     <string name="pref_title_animate_custom_emojis">GIF-Emojis animieren</string>
     <string name="pref_title_notification_filter_subscriptions">jemand, den ich abonniert habe, etwas Neues veröffentlicht</string>
     <string name="notification_subscription_format">%s hat gerade etwas veröffentlicht</string>
-    <string name="abbreviated_minutes_ago">%d Min.</string>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d Min.</item>
+    </plurals>
     <string name="review_notifications">Benachrichtigungen überprüfen</string>
     <string name="wellbeing_mode_notice">Informationen, die dein geistiges Wohlbefinden beeinflussen könnten, werden ausgeblendet. Dazu gehören:
 \n
@@ -497,12 +507,22 @@
     <string name="limit_notifications">Timeline-Benachrichtigungen einschränken</string>
     <string name="action_subscribe_account">Abonnieren</string>
     <string name="action_unsubscribe_account">Deabonnieren</string>
-    <string name="abbreviated_in_minutes">in %d Min.</string>
-    <string name="abbreviated_in_hours">in %d Std.</string>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">in %d Min.</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">in %d Std.</item>
+    </plurals>
     <string name="drafts_failed_loading_reply">Informationen zur Antwort konnten nicht geladen werden</string>
-    <string name="abbreviated_days_ago">%d T.</string>
-    <string name="abbreviated_in_years">in %d J.</string>
-    <string name="abbreviated_in_seconds">in %d Sek.</string>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d T.</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">in %d J.</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">in %d Sek.</item>
+    </plurals>
     <string name="action_unbookmark">Lesezeichen entfernen</string>
     <string name="pref_title_confirm_favourites">Vor dem Favorisieren bestätigen</string>
     <string name="dialog_delete_conversation_warning">Diese Unterhaltung wirklich löschen\?</string>
@@ -705,4 +725,4 @@
     <string name="pref_title_show_self_boosts">Eigene geteilte Beiträge anzeigen</string>
     <string name="pref_title_show_self_boosts_description">Die Person teilt ihre eigenen Beiträge</string>
     <string name="pref_title_per_timeline_preferences">Einstellungen pro Zeitleiste</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 0cea3aa1..bdd4f68b 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -243,16 +243,36 @@
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Sekvado petita</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">post %dj</string>
-    <string name="abbreviated_in_days">post %dt</string>
-    <string name="abbreviated_in_hours">post %dh</string>
-    <string name="abbreviated_in_minutes">post %dm</string>
-    <string name="abbreviated_in_seconds">post %ds</string>
-    <string name="abbreviated_years_ago">%dj</string>
-    <string name="abbreviated_days_ago">%dt</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">post %dj</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">post %dt</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">post %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">post %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">post %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dj</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dt</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Sekvas vin</string>
     <string name="pref_title_alway_show_sensitive_media">Ĉiam montri tiklan enhavon</string>
     <string name="title_media">Aŭdovidaĵoj</string>
@@ -280,7 +300,7 @@
     <string name="action_remove_from_list">Forigi konton el la listo</string>
     <string name="compose_active_account_description">Afiŝi per konto %1$s</string>
     <plurals name="hint_describe_for_visually_impaired">
-        <item quantity="one"/>
+        <item quantity="one" />
         <item quantity="other">Priskribi por vide handikapitaj homoj
 \n(%d signoj maksimume)</item>
     </plurals>
@@ -557,4 +577,4 @@
     <string name="description_post_language">Mesaĝolingvo</string>
     <string name="dialog_push_notification_migration">Por ricevi sciigoj per UnifiedPush, Tusky bezonas taŭgan permeson el Mastodon-servilo. Tio postulas re-ensaluton por ŝanĝi OAuth-rajtoj donitaj al Tusky. Se vi uzas la opcion re-ensaluti ĉi tie aŭ en la agordoj de la konto, viaj malnetoj kaj kaŝmemoroj estos konservitaj.</string>
     <string name="dialog_push_notification_migration_other_accounts">Vi re-ensalutis en tiu konto por doni sciigo-permeson al Tusky. Vi havas tamen aliajn kontojn, ĉe kiuj vi devas re-sensaluti. Iru al ili, kaj re-ensalutu por ebligi ricevon de sciigoj per UnifiedPush.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 5926ec7b..af805833 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -232,16 +232,36 @@
     <string name="state_follow_requested">Solicitud enviada</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="status_created_at_now">Ahora</string>
-    <string name="abbreviated_in_years">en %dy</string>
-    <string name="abbreviated_in_days">en %dd</string>
-    <string name="abbreviated_in_hours">en %dh</string>
-    <string name="abbreviated_in_minutes">en %dm</string>
-    <string name="abbreviated_in_seconds">en %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">en %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">en %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">en %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">en %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">en %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Te sigue</string>
     <string name="pref_title_alway_show_sensitive_media">Mostrar contenido NSFW</string>
     <string name="title_media">Multimedia</string>
@@ -678,4 +698,4 @@
     <string name="notification_notification_worker">Obteniendo notificaciones…</string>
     <string name="load_newest_notifications">Cargar nuevas notificaciones</string>
     <string name="compose_delete_draft">¿Eliminar borrador\?</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 8a2a1a49..a9fa97a8 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -217,13 +217,27 @@
     <string name="post_media_video">Bideoa</string>
     <string name="state_follow_requested">Eskaera bidalita</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%du-an</string>
-    <string name="abbreviated_in_days">%de-an</string>
-    <string name="abbreviated_in_hours">%dh-an</string>
-    <string name="abbreviated_in_minutes">%dm-an</string>
-    <string name="abbreviated_in_seconds">%ds-an</string>
-    <string name="abbreviated_years_ago">%du</string>
-    <string name="abbreviated_days_ago">%de</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">%du-an</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">%de-an</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">%dh-an</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%dm-an</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%ds-an</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%du</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%de</item>
+    </plurals>
     <string name="follows_you">Jarraitzen zaitu</string>
     <string name="pref_title_alway_show_sensitive_media">Eduki mingarria erakutsi</string>
     <string name="title_media">Multimedia</string>
@@ -323,9 +337,15 @@
     <string name="action_hashtags">Traolak</string>
     <string name="title_hashtags_dialog">Traolak</string>
     <string name="about_powered_by_tusky">Tusky-k sustatuta</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="pref_title_alway_open_spoiler">Beti zabaldu edukien abisuekin markatutako tootak</string>
     <string name="pref_title_thread_filter_keywords">Elkarrizketak</string>
     <string name="filter_addition_title">Gehitu iragazkia</string>
@@ -538,4 +558,4 @@
     <string name="post_edited">%s editatua</string>
     <string name="notification_sign_up_format">%s-(e)k izena eman du</string>
     <string name="error_status_source_load">Akatsa zerbitzaritik egoeraren iturria kargatzean.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e3b53f98..96da62d1 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -212,11 +212,21 @@
     <string name="post_media_video">ویدیو</string>
     <string name="state_follow_requested">تقاضای پیگیری شد</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">در %d سال</string>
-    <string name="abbreviated_in_days">در %d روز</string>
-    <string name="abbreviated_in_hours">در %d ساعت</string>
-    <string name="abbreviated_in_minutes">در %d دقیقه</string>
-    <string name="abbreviated_in_seconds">در %d ثانیه</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">در %d سال</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">در %d روز</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">در %d ساعت</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">در %d دقیقه</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">در %d ثانیه</item>
+    </plurals>
     <string name="follows_you">پیگیرتان است</string>
     <string name="pref_title_alway_show_sensitive_media">نمایش همیشگی محتوای حساس</string>
     <string name="title_media">رسانه</string>
@@ -311,11 +321,21 @@
     <string name="notification_poll_name">نظرسنجی‌ها</string>
     <string name="notification_poll_description">آگاهی‌ها دربارهٔ نظرسنجی‌های پایان‌یافته</string>
     <string name="about_tusky_version">تاسکی %s</string>
-    <string name="abbreviated_years_ago">%d سال</string>
-    <string name="abbreviated_days_ago">%d روز</string>
-    <string name="abbreviated_hours_ago">%d ساعت</string>
-    <string name="abbreviated_minutes_ago">%d دقیقه</string>
-    <string name="abbreviated_seconds_ago">%d ثانیه</string>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d سال</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d روز</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d ساعت</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d دقیقه</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d ثانیه</item>
+    </plurals>
     <string name="pref_title_alway_open_spoiler">گسترش همیشگی فرسته‌های علامت‌خورده با هشدار محتوا</string>
     <string name="pref_title_public_filter_keywords">خط زمانی‌های عمومی</string>
     <string name="pref_title_thread_filter_keywords">گفت‌وگوها</string>
@@ -704,4 +724,4 @@
     <string name="list_reply_policy_label">نمایش پاسخ‌ها به</string>
     <string name="pref_title_show_self_boosts">نمایش خودتقویت‌ها</string>
     <string name="pref_title_show_self_boosts_description">کسی فرستهٔ خودش را تقویت می‌کند</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 78f53874..f4163732 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -248,16 +248,36 @@
     <string name="post_media_video">Vidéo</string>
     <string name="state_follow_requested">Demande d’abonnement effectuée</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">dans %da</string>
-    <string name="abbreviated_in_days">dans %dj</string>
-    <string name="abbreviated_in_hours">dans %dh</string>
-    <string name="abbreviated_in_minutes">dans %dm</string>
-    <string name="abbreviated_in_seconds">dans %ds</string>
-    <string name="abbreviated_years_ago">%d a</string>
-    <string name="abbreviated_days_ago">%dj</string>
-    <string name="abbreviated_hours_ago">%d h</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">dans %da</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">dans %dj</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">dans %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">dans %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">dans %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d a</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dj</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d h</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Vous suit</string>
     <string name="pref_title_alway_show_sensitive_media">Toujours afficher les contenus sensibles</string>
     <string name="title_media">Média</string>
@@ -286,7 +306,7 @@
     <string name="compose_active_account_description">Publier en tant que %1$s</string>
     <plurals name="hint_describe_for_visually_impaired">
         <item quantity="one">Décrire pour les malvoyants (%d caractère maximum)</item>
-        <item quantity="many"/>
+        <item quantity="many" />
         <item quantity="other">Décrire pour les malvoyants (%d caractères maximum)</item>
     </plurals>
     <string name="action_set_caption">Mettre une légende</string>
@@ -691,4 +711,4 @@
     <string name="list_reply_policy_list">Membres de la liste</string>
     <string name="list_reply_policy_label">Afficher les réponses à</string>
     <string name="about_copied">Les informations de la version et de l’appareil ont été copiés</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-fy/strings.xml b/app/src/main/res/values-fy/strings.xml
index e30402b8..8ba4644d 100644
--- a/app/src/main/res/values-fy/strings.xml
+++ b/app/src/main/res/values-fy/strings.xml
@@ -34,11 +34,21 @@
     <string name="title_media">Media</string>
     <string name="pref_title_alway_show_sensitive_media">Altyd gefoeliche ynhâld sjen litte</string>
     <string name="follows_you">Folget jo</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_in_seconds">oer %ds</string>
-    <string name="abbreviated_in_minutes">oer %dm</string>
-    <string name="abbreviated_in_hours">oer %dh</string>
-    <string name="abbreviated_in_days">oer %dd</string>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">oer %ds</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">oer %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">oer %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">oer %dd</item>
+    </plurals>
     <string name="post_media_attachments">Taheaksels</string>
     <string name="post_media_audio">Lûd</string>
     <string name="post_media_video">Fideo</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index a9429409..d35a1737 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -462,16 +462,36 @@
     <string name="action_unmute_conversation">Comhrá unmute</string>
     <string name="dialog_mute_warning">Tost @%s\?</string>
     <string name="pref_title_post_tabs">Cluaisíní</string>
-    <string name="abbreviated_in_years">in %dy</string>
-    <string name="abbreviated_in_days">in %dd</string>
-    <string name="abbreviated_in_hours">in %dh</string>
-    <string name="abbreviated_in_minutes">in %dm</string>
-    <string name="abbreviated_in_seconds">in %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">in %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">in %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">in %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">in %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">in %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="unreblog_private">Bain athchraoladh</string>
     <string name="license_cc_by_4">CC-BY 4.0</string>
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
@@ -500,4 +520,4 @@
     <string name="action_dismiss">Dún</string>
     <string name="action_details">Sonraí</string>
     <string name="dialog_delete_conversation_warning">Scrios an comhrá seo\?</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml
index d0ef5f98..5071b500 100644
--- a/app/src/main/res/values-gd/strings.xml
+++ b/app/src/main/res/values-gd/strings.xml
@@ -302,16 +302,36 @@
     <string name="title_media">Meadhanan</string>
     <string name="pref_title_alway_show_sensitive_media">Seall susbaint fhrionasach an-còmhnaidh</string>
     <string name="follows_you">’Gad leantainn</string>
-    <string name="abbreviated_seconds_ago">%dd</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_hours_ago">%du</string>
-    <string name="abbreviated_days_ago">%dl</string>
-    <string name="abbreviated_years_ago">%db</string>
-    <string name="abbreviated_in_seconds">an ceann %dd</string>
-    <string name="abbreviated_in_minutes">an ceann %dm</string>
-    <string name="abbreviated_in_hours">an ceann %du</string>
-    <string name="abbreviated_in_days">an ceann %dl</string>
-    <string name="abbreviated_in_years">an ceann %db</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%du</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dl</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%db</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">an ceann %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">an ceann %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">an ceann %du</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">an ceann %dl</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">an ceann %db</item>
+    </plurals>
     <string name="state_follow_requested">Iarrtas leantainn air</string>
     <string name="post_media_video">Videothan</string>
     <string name="post_media_images">Dealbhan</string>
@@ -689,4 +709,4 @@
     <string name="about_copied">Chaidh lethbhreac de thionndadh is fiosrachadh an uidheim a dhèanamh</string>
     <string name="list_exclusive_label">Falaich o loidhne-ama na dachaigh</string>
     <string name="error_media_upload_sending_fmt">Dh’fhàillig leis an luchdadh suas: %s</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 14fb3ece..1dd893ad 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -282,16 +282,36 @@
     <string name="pref_title_alway_open_spoiler">Despregar sempre publicacións marcadas con avisos sobre o contido</string>
     <string name="pref_title_alway_show_sensitive_media">Mostrar sempre contido sensible</string>
     <string name="follows_you">Séguete</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_in_seconds">fai %ds</string>
-    <string name="abbreviated_in_hours">fai %dh</string>
-    <string name="abbreviated_in_minutes">fai %dm</string>
-    <string name="abbreviated_in_days">en %dd</string>
-    <string name="abbreviated_in_years">en %dy</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">fai %ds</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">fai %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">fai %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">en %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">en %dy</item>
+    </plurals>
     <string name="state_follow_requested">Seguimento solicitado</string>
     <string name="post_media_attachments">Anexos</string>
     <string name="post_media_audio">Audio</string>
@@ -697,4 +717,4 @@
     <string name="list_reply_policy_label">Mostrar respostas a</string>
     <string name="pref_title_show_self_boosts_description">Alguén que promove as súas propias publicacións</string>
     <string name="pref_title_show_self_boosts">Mostrar auto-promocións</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 0616a53c..446674b1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -291,15 +291,33 @@
     <string name="notification_poll_name">Szavazások</string>
     <string name="notification_poll_description">Értesítés befejezett szavazásokról</string>
     <string name="about_tusky_license">Tusky ingyenes és nyílt forráskódú szoftver. A GNU General Public License Version 3 érvényes rá, amit itt tekinthetsz meg: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
-    <string name="abbreviated_in_years">%dé múlva</string>
-    <string name="abbreviated_in_days">%dn múlva</string>
-    <string name="abbreviated_in_hours">%dó múlva</string>
-    <string name="abbreviated_in_minutes">%dp múlva</string>
-    <string name="abbreviated_years_ago">%dé</string>
-    <string name="abbreviated_days_ago">%dn</string>
-    <string name="abbreviated_hours_ago">%dó</string>
-    <string name="abbreviated_minutes_ago">%dp</string>
-    <string name="abbreviated_seconds_ago">%dmp</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">%dé múlva</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">%dn múlva</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">%dó múlva</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%dp múlva</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dé</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dn</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dó</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dp</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dmp</item>
+    </plurals>
     <string name="replying_to">Válasz @%s részére</string>
     <string name="pref_title_public_filter_keywords">Nyilvános idővonalak</string>
     <string name="pref_title_thread_filter_keywords">Beszélgetések</string>
@@ -326,7 +344,9 @@
     <string name="pref_title_app_theme">Alkalmazástéma</string>
     <string name="pref_title_bot_overlay">Bot jelölő mutatása</string>
     <string name="pref_title_animate_gif_avatars">GIF profilképek animálása</string>
-    <string name="abbreviated_in_seconds">%dmp múlva</string>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%dmp múlva</item>
+    </plurals>
     <string name="filter_dialog_whole_word">Teljes szó</string>
     <string name="filter_dialog_whole_word_description">Ha a kulcsszó csak alfanumerikus karakterekből áll, csak teljes szóra fog illeszkedni</string>
     <string name="hint_search_people_list">Általad követettek keresése</string>
@@ -665,4 +685,4 @@
     <string name="error_missing_edits">A kiszolgálód tudja, hogy ezt a bejegyzést szerkesztették, de erről nincs másolata, így ezt nem tudjuk neked megmutatni.
 \n
 \nEz egy <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon hiba #25398</a>.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 474f373c..4b2df34f 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -258,16 +258,36 @@
     <string name="post_media_images">Myndir</string>
     <string name="post_media_video">Myndskeið</string>
     <string name="state_follow_requested">Beðið um að fylgja</string>
-    <string name="abbreviated_in_years">eftir %dár</string>
-    <string name="abbreviated_in_days">eftir %dd</string>
-    <string name="abbreviated_in_hours">eftir %dklst</string>
-    <string name="abbreviated_in_minutes">eftir %dm</string>
-    <string name="abbreviated_in_seconds">eftir %ds</string>
-    <string name="abbreviated_years_ago">%dár</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dklst</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">eftir %dár</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">eftir %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">eftir %dklst</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">eftir %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">eftir %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dár</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dklst</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Fylgir þér</string>
     <string name="pref_title_alway_show_sensitive_media">Alltaf birta myndefni sem merkt er viðkvæmt</string>
     <string name="pref_title_alway_open_spoiler">Alltaf fletta út færslum sem eru með aðvörun vegna efnis</string>
@@ -697,4 +717,4 @@
     <string name="list_reply_policy_followed">Hvers þess sem fylgst er með</string>
     <string name="pref_title_show_self_boosts">Sýna sjálfs-endurbirtingar</string>
     <string name="pref_title_show_self_boosts_description">Einhver endurbirtir sína eigin færslu</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 54279e62..0900d362 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -241,16 +241,36 @@
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Richiesta inviata</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">in %d a</string>
-    <string name="abbreviated_in_days">in %dg</string>
-    <string name="abbreviated_in_hours">in %do</string>
-    <string name="abbreviated_in_minutes">in %d min</string>
-    <string name="abbreviated_in_seconds">in %ds</string>
-    <string name="abbreviated_years_ago">%da</string>
-    <string name="abbreviated_days_ago">%dg</string>
-    <string name="abbreviated_hours_ago">%do</string>
-    <string name="abbreviated_minutes_ago">%dmin</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">in %d a</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">in %dg</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">in %do</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">in %d min</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">in %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%da</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dg</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%do</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dmin</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Ti segue</string>
     <string name="pref_title_alway_show_sensitive_media">Mostra sempre i contenuti sensibili</string>
     <string name="title_media">Media</string>
@@ -719,4 +739,4 @@
     <string name="list_reply_policy_followed">Qualsiasi utente seguito</string>
     <string name="list_reply_policy_label">Mostra risposte a</string>
     <string name="pref_title_show_self_boosts_description">Qualcuno boosta il proprio post</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 446b4e2f..b4d05cc4 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -229,16 +229,36 @@
     <string name="state_follow_requested">フォローリクエスト中</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
     <string name="status_created_at_now">現在</string>
-    <string name="abbreviated_in_years">%d年後</string>
-    <string name="abbreviated_in_days">%d日後</string>
-    <string name="abbreviated_in_hours">%d時間後</string>
-    <string name="abbreviated_in_minutes">%d分後</string>
-    <string name="abbreviated_in_seconds">%d秒後</string>
-    <string name="abbreviated_years_ago">%d年前</string>
-    <string name="abbreviated_days_ago">%d日前</string>
-    <string name="abbreviated_hours_ago">%d時間前</string>
-    <string name="abbreviated_minutes_ago">%d分前</string>
-    <string name="abbreviated_seconds_ago">%d秒前</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">%d年後</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">%d日後</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d時間後</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d分後</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d秒後</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d年前</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d日前</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d時間前</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d分前</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d秒前</item>
+    </plurals>
     <string name="follows_you">あなたをフォロー中</string>
     <string name="pref_title_alway_show_sensitive_media">閲覧注意のメディアを常に表示</string>
     <string name="title_media">メディア</string>
@@ -675,4 +695,4 @@
     <string name="list_reply_policy_list">リストのメンバー</string>
     <string name="pref_title_show_self_boosts">自己ブーストを表示</string>
     <string name="pref_title_show_self_boosts_description">自分自身の投稿をブーストしている誰か</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index d28739f4..6bc73abc 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -153,8 +153,12 @@
     <string name="notification_poll_name">Adɣaren</string>
     <string name="notification_mention_format">Yuder-ik-id %s</string>
     <string name="description_account_locked">Yettwargel umiḍan</string>
-    <string name="abbreviated_years_ago">%dis aya</string>
-    <string name="abbreviated_days_ago">%dus aya</string>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dis aya</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dus aya</item>
+    </plurals>
     <string name="replying_to">Tettaraḍ-as i @%s</string>
     <string name="load_more_placeholder_text">awid ugar</string>
     <string name="pref_title_thread_filter_keywords">Idewenniyen</string>
@@ -168,7 +172,8 @@
     <string name="conversation_2_recipients">%1$s akked %2$s</string>
     <string name="conversation_more_recipients">%1$s, %2$s akked %3$d nniḍen</string>
     <string name="compose_shortcut_long_label">Aru izen</string>
-    <string name="poll_info_format"> <!-- 15 n wadɣaren • 1 n wesrag id yeqqimen --> %1$s • %2$s</string>
+    <string name="poll_info_format"> <!-- 15 n wadɣaren • 1 n wesrag id yeqqimen -->
+        %1$s • %2$s</string>
     <plurals name="poll_info_votes">
         <item quantity="one">%s n wedɣar</item>
         <item quantity="other">%s n yedɣaren</item>
@@ -219,16 +224,28 @@
     <string name="about_powered_by_tusky">Yettwamdemmar s Tusky</string>
     <string name="about_project_site">Asmel Web n usenfaṛ:
 \n https://tusky.app</string>
-    <string name="abbreviated_hours_ago">%dsr</string>
-    <string name="abbreviated_minutes_ago">%dtsd</string>
-    <string name="abbreviated_seconds_ago">%dtsn</string>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dsr</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dtsd</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dtsn</item>
+    </plurals>
     <string name="compose_save_draft">Sekles amzun d arewway\?</string>
     <string name="later">Ticki</string>
     <string name="profile_badge_bot_text">Aṛubut</string>
     <string name="description_post_bookmarked">Yettwarna ɣer ticṛad</string>
-    <string name="abbreviated_in_hours">deg %dsr</string>
-    <string name="abbreviated_in_minutes">deg %dtsd</string>
-    <string name="abbreviated_in_seconds">deg %dtsn</string>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">deg %dsr</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">deg %dtsd</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">deg %dtsn</item>
+    </plurals>
     <plurals name="poll_timespan_seconds">
         <item quantity="one">%d n tasint id yugran</item>
         <item quantity="other">%d n tasinin id yugran</item>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 473af585..e51edafb 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -252,16 +252,36 @@
     <string name="post_media_video">비디오</string>
     <string name="state_follow_requested">팔로우 요청함</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%d년 후</string>
-    <string name="abbreviated_in_days">%d일 후</string>
-    <string name="abbreviated_in_hours">%d시간 후</string>
-    <string name="abbreviated_in_minutes">%d분 후</string>
-    <string name="abbreviated_in_seconds">%d초 후</string>
-    <string name="abbreviated_years_ago">%d년</string>
-    <string name="abbreviated_days_ago">%d일</string>
-    <string name="abbreviated_hours_ago">%d시간</string>
-    <string name="abbreviated_minutes_ago">%d분</string>
-    <string name="abbreviated_seconds_ago">%d초</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">%d년 후</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">%d일 후</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d시간 후</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d분 후</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d초 후</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d년</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d일</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d시간</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d분</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d초</item>
+    </plurals>
     <string name="follows_you">당신을 팔로우합니다</string>
     <string name="pref_title_alway_show_sensitive_media">민감한 컨텐츠 항상 보이기</string>
     <string name="title_media">미디어</string>
@@ -419,4 +439,4 @@
     <string name="action_edit">수정</string>
     <string name="hashtags">해시태그</string>
     <string name="notification_follow_request_name">팔로우 요청</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 4f0a5211..363ea255 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -297,9 +297,15 @@
     <string name="notification_mention_name">Jauni pieminējumi</string>
     <string name="notification_follow_name">Jauni sekotāji</string>
     <string name="notification_boost_name">Pastiprinājumi</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_years_ago">%dg</string>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dg</item>
+    </plurals>
     <string name="filter_dialog_whole_word">Viss vārds</string>
     <string name="unreblog_private">Atcelt pastiprināšanu</string>
     <string name="unpin_action">Atspraust</string>
@@ -314,8 +320,12 @@
     <string name="notification_update_name">Ierakstu labojumi</string>
     <string name="send_media_to">Dalīties ar failu…</string>
     <string name="description_account_locked">Privāts konts</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
     <string name="lock_account_label">Padarīt kontu privātu</string>
     <string name="review_notifications">Pārskatīt paziņojumus</string>
     <string name="account_date_joined">Pievienojās %1$s</string>
@@ -543,11 +553,21 @@
     <string name="pref_title_confirm_favourites">Pirms pievienošanas izlasei rādīt apstiprināšanas dialogu</string>
     <string name="action_view_favourites">Izlases</string>
     <string name="pref_title_notification_filter_favourites">mani ieraksti tiek pievienoti izlasei</string>
-    <string name="abbreviated_in_days">pēc %dd</string>
-    <string name="abbreviated_in_hours">pēc %dh</string>
-    <string name="abbreviated_in_minutes">pēc %dm</string>
-    <string name="abbreviated_in_years">pēc %dg</string>
-    <string name="abbreviated_in_seconds">pēc %ds</string>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">pēc %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">pēc %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">pēc %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">pēc %dg</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">pēc %ds</item>
+    </plurals>
     <string name="pref_title_alway_open_spoiler">Vienmēr izvērst ziņas, kas atzīmētas ar satura brīdinājumu</string>
     <string name="action_post_failed_detail">Neizdevās augšupielādēt tavu ierakstu un tas tika saglabāts melnrakstos.
 \n
@@ -600,4 +620,4 @@
     <string name="filter_description_warn">Paslēpt ar brīdinājumu</string>
     <string name="filter_edit_keyword_title">Labot atslēgvārdu</string>
     <string name="filter_keyword_addition_title">Pievienot atslēgvārdu</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index f57087ba..11107b38 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -215,15 +215,33 @@
     <string name="post_media_images">Bilder</string>
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Forespørsel sendt</string>
-    <string name="abbreviated_in_days">om %dd</string>
-    <string name="abbreviated_in_hours">om %dh</string>
-    <string name="abbreviated_in_minutes">om %dm</string>
-    <string name="abbreviated_in_seconds">om %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">om %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">om %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">om %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">om %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Følger deg</string>
     <string name="pref_title_alway_show_sensitive_media">Vis alltid sensitivt innhold</string>
     <string name="title_media">Media</string>
@@ -255,7 +273,9 @@
     <string name="about_tusky_license">Tusky er fri og åpen kildekode. Applikasjonen er lisensiert under GNU General Public License versjon 3. Du kan se lisensen her: https://www.gnu.org/licenses/gpl-3.0.en.html</string>
     <string name="about_project_site">Hjemmeside:
 \n https://tusky.app</string>
-    <string name="abbreviated_in_years">om %dy</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">om %dy</item>
+    </plurals>
     <string name="compose_active_account_description">Poster som %1$s</string>
     <plurals name="hint_describe_for_visually_impaired">
         <item quantity="one">Beskriv innhold for de med nedsatt synsevne
@@ -659,4 +679,4 @@
     <string name="error_missing_edits">Serveren din vet at denne posten ble endret, men har ingen kopi av entringene så de kann ikke vises.
 \n
 \nDette er <a href="https://github.com/mastodon/mastodon/issues/25398">Mastodon issue #25398</a>.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index b35d7d43..21b97381 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -238,16 +238,36 @@
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Volgverzoek verzonden</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">over %dj</string>
-    <string name="abbreviated_in_days">over %dd</string>
-    <string name="abbreviated_in_hours">over %du</string>
-    <string name="abbreviated_in_minutes">over %dm</string>
-    <string name="abbreviated_in_seconds">over %ds</string>
-    <string name="abbreviated_years_ago">%dj</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%du</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">over %dj</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">over %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">over %du</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">over %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">over %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dj</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%du</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Volgt jou</string>
     <string name="pref_title_alway_show_sensitive_media">Altijd gevoelige inhoud (nsfw) tonen</string>
     <string name="title_media">Media</string>
@@ -659,4 +679,4 @@
     <string name="notification_prune_cache">Cache onderhoud…</string>
     <string name="about_device_info_title">Je apparaat</string>
     <string name="dialog_save_profile_changes_message">Wil je de wijzigingen aan je profiel bewaren\?</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml
index 868b8e5e..b9123af1 100644
--- a/app/src/main/res/values-oc/strings.xml
+++ b/app/src/main/res/values-oc/strings.xml
@@ -208,12 +208,24 @@
     <string name="post_media_video">Vidèo</string>
     <string name="state_follow_requested">Demanda d’abonament</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">en %d ans</string>
-    <string name="abbreviated_in_days">en %dd</string>
-    <string name="abbreviated_in_hours">en %dh</string>
-    <string name="abbreviated_in_minutes">en %dm</string>
-    <string name="abbreviated_in_seconds">en %ds</string>
-    <string name="abbreviated_years_ago">%d ans</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">en %d ans</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">en %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">en %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">en %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">en %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d ans</item>
+    </plurals>
     <string name="follows_you">Vos sèc</string>
     <string name="pref_title_alway_show_sensitive_media">Mostrar lo contengut sensible (NSFW)</string>
     <string name="title_media">Mèdia</string>
@@ -297,10 +309,18 @@
     <string name="pref_default_media_sensitivity">Totjorn marcar los mèdias coma sensibles</string>
     <string name="pref_failed_to_sync">Fracàs de la sincronizacion de las preferéncias</string>
     <string name="about_tusky_version">Tusky %s</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="pref_title_public_filter_keywords">Flux publics</string>
     <string name="pref_title_thread_filter_keywords">Discutidas</string>
     <string name="filter_addition_title">Ajustar un filtre</string>
@@ -691,4 +711,4 @@
     <string name="error_unblocking_domain">Impossible de tornar mostrar %1$s : %2$s</string>
     <string name="pref_title_show_self_boosts">Mostrar los pròpris partatges</string>
     <string name="pref_title_show_self_boosts_description">Qualqu’un parteja son pròpri messatge</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b4ca6a67..06db76c9 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -209,16 +209,36 @@
     <string name="post_media_video">Wideo</string>
     <string name="state_follow_requested">Wysłano prośbę o obserwację</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">w %d lata</string>
-    <string name="abbreviated_in_days">w %d dni</string>
-    <string name="abbreviated_in_hours">w %d godz.</string>
-    <string name="abbreviated_in_minutes">w %d min.</string>
-    <string name="abbreviated_in_seconds">w %ds</string>
-    <string name="abbreviated_years_ago">%d lat temu</string>
-    <string name="abbreviated_days_ago">%d dni temu</string>
-    <string name="abbreviated_hours_ago">%d godz. temu</string>
-    <string name="abbreviated_minutes_ago">%d min. temu</string>
-    <string name="abbreviated_seconds_ago">%ds temu</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">w %d lata</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">w %d dni</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">w %d godz.</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">w %d min.</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">w %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d lat temu</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d dni temu</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d godz. temu</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d min. temu</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds temu</item>
+    </plurals>
     <string name="follows_you">Obserwuje Cię</string>
     <string name="pref_title_alway_show_sensitive_media">Zawsze wyświetlaj wrażliwą zawartość</string>
     <string name="title_media">Zawartość multimedialna</string>
@@ -639,4 +659,4 @@
     <string name="action_discard">Odrzuć zmiany</string>
     <string name="action_share_account_username">Udostępnij nazwę użytkownika</string>
     <string name="action_share_account_link">Udostępnij link do konta</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3158a2d6..01ff8286 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -225,16 +225,36 @@
     <string name="post_media_video">Vídeo</string>
     <string name="state_follow_requested">Solicitação enviada</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">em %dy</string>
-    <string name="abbreviated_in_days">em %dd</string>
-    <string name="abbreviated_in_hours">em %dh</string>
-    <string name="abbreviated_in_minutes">em %dm</string>
-    <string name="abbreviated_in_seconds">em %ds</string>
-    <string name="abbreviated_years_ago">%da</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">em %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">em %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">em %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">em %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">em %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%da</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">te segue</string>
     <string name="pref_title_alway_show_sensitive_media">Sempre mostrar mídia sensível</string>
     <string name="title_media">Mídia</string>
@@ -626,4 +646,4 @@
     <string name="about_copy">Copiar a versão e as informações do dispositivo</string>
     <string name="load_newest_notifications">Carregar notificações mais recentes</string>
     <string name="compose_delete_draft">Excluir rascunho\?</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 769b9ac6..c6db123c 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -291,16 +291,36 @@
     <string name="post_media_audio">Áudio</string>
     <string name="post_media_attachments">Anexos</string>
     <string name="state_follow_requested">Pedido para seguir enviado</string>
-    <string name="abbreviated_in_years">em %dy</string>
-    <string name="abbreviated_in_days">em %dd</string>
-    <string name="abbreviated_in_hours">em %dh</string>
-    <string name="abbreviated_in_minutes">em %dm</string>
-    <string name="abbreviated_in_seconds">em %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">em %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">em %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">em %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">em %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">em %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
     <string name="follows_you">Segue-te</string>
     <string name="pref_title_alway_show_sensitive_media">Mostrar sempre conteúdo multimédia sensível</string>
     <string name="pref_title_alway_open_spoiler">Expandir sempre toots com Aviso de Conteúdo</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b689992a..d8cac415 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -241,16 +241,36 @@
     <string name="post_media_video">Видео</string>
     <string name="state_follow_requested">Запрос на подписку отправлено</string>
     <!--Отметки времени у постов: "16s" or "2d"-->
-    <string name="abbreviated_in_years">через %dг</string>
-    <string name="abbreviated_in_days">через %dд</string>
-    <string name="abbreviated_in_hours">через %dч</string>
-    <string name="abbreviated_in_minutes">через %dм</string>
-    <string name="abbreviated_in_seconds">через %dс</string>
-    <string name="abbreviated_years_ago">%dг</string>
-    <string name="abbreviated_days_ago">%dд</string>
-    <string name="abbreviated_hours_ago">%dч</string>
-    <string name="abbreviated_minutes_ago">%dм</string>
-    <string name="abbreviated_seconds_ago">%dс</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">через %dг</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">через %dд</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">через %dч</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">через %dм</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">через %dс</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dг</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dд</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dч</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dм</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dс</item>
+    </plurals>
     <!--Оставшееся время в опросах -->
     <plurals name="poll_timespan_days">
         <item quantity="one">остался %d день</item>
@@ -723,4 +743,4 @@
     <string name="dialog_save_profile_changes_message">Хотите сохранить изменения профиля\?</string>
     <string name="action_edit_image">Редактировать изображение</string>
     <string name="pref_title_per_timeline_preferences">Временные предпочтения</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sa/strings.xml b/app/src/main/res/values-sa/strings.xml
index 43f7dbfd..2266fecd 100644
--- a/app/src/main/res/values-sa/strings.xml
+++ b/app/src/main/res/values-sa/strings.xml
@@ -215,16 +215,36 @@
     <string name="pref_title_alway_open_spoiler">सर्वदा विषयसतर्कतयाऽङ्कितं दौत्यं विस्तार्यताम्</string>
     <string name="pref_title_alway_show_sensitive_media">सर्वदा संवेदनशीलविषयो दृश्यताम्</string>
     <string name="follows_you">त्वामनुसरति</string>
-    <string name="abbreviated_seconds_ago">%ds क्ष</string>
-    <string name="abbreviated_minutes_ago">%dm नि</string>
-    <string name="abbreviated_hours_ago">%dh घ</string>
-    <string name="abbreviated_years_ago">%dy वर्ष</string>
-    <string name="abbreviated_days_ago">%dd दि</string>
-    <string name="abbreviated_in_seconds">%ds क्ष</string>
-    <string name="abbreviated_in_minutes">%dm नि</string>
-    <string name="abbreviated_in_hours">%dh घ</string>
-    <string name="abbreviated_in_days">%dd दि</string>
-    <string name="abbreviated_in_years">%dy वर्ष</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds क्ष</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm नि</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh घ</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy वर्ष</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd दि</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%ds क्ष</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%dm नि</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">%dh घ</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">%dd दि</item>
+    </plurals>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">%dy वर्ष</item>
+    </plurals>
     <string name="state_follow_requested">अनुसरणं निवेदितम्</string>
     <string name="post_media_video">चलचित्राणि</string>
     <string name="post_media_images">चित्राणि</string>
@@ -561,4 +581,4 @@
     <string name="send_account_username_to">लेखायाः उपभोक्तृनाम्नः संविभागं कुरुताम् अस्मै…</string>
     <string name="confirmation_hashtag_unfollowed">#%s अनुसरणम् अपाकृतम्</string>
     <string name="send_account_link_to">लेखायाः निरपेक्ष-सार्वत्रिक-वस्तुसङ्केतस्य संविभागं कुरुताम् अस्मै…</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml
index 4b3932ba..e17d5804 100644
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@@ -38,7 +38,9 @@
     <string name="confirmation_reported">යැවිණි!</string>
     <string name="action_reset_schedule">යළි සකසන්න</string>
     <string name="post_content_warning_show_less">අඩුවෙන් පෙන්වන්න</string>
-    <string name="abbreviated_in_seconds">තත්. %d කින්</string>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">තත්. %d කින්</item>
+    </plurals>
     <string name="action_view_mutes">නිහඬ කළ පරිශීලකයින්</string>
     <string name="action_share">බෙදාගන්න</string>
     <string name="account_moved_description">%1$s ගෙන ගොස් ඇත:</string>
@@ -48,7 +50,9 @@
     <string name="hint_display_name">දර්ශන නාමය</string>
     <string name="post_text_size_medium">මධ්‍යම</string>
     <string name="post_media_audio">ශ්‍රව්‍ය</string>
-    <string name="abbreviated_days_ago">දව. %d</string>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">දව. %d</item>
+    </plurals>
     <string name="action_logout">නික්මෙන්න</string>
     <string name="filter_edit_title">පෙරහන සංස්කරණය</string>
     <string name="notification_summary_medium">%1$s, %2$s, සහ %3$s</string>
@@ -80,10 +84,14 @@
     <string name="caption_notoemoji">ගූගල් හි වත්මන් ඉමෝජි කට්ටලය</string>
     <string name="app_theme_auto">ස්වයංක්‍රීව ඉර බැසීමේදී</string>
     <string name="failed_report">වාර්තා කිරීමට අසමත් විය</string>
-    <string name="abbreviated_years_ago">අවු. %d</string>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">අවු. %d</item>
+    </plurals>
     <string name="action_open_as">%s ලෙස විවෘත කරන්න</string>
     <string name="action_open_faved_by">ප්‍රියතමයන් පෙන්වන්න</string>
-    <string name="abbreviated_in_minutes">වි. %d කින්</string>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">වි. %d කින්</item>
+    </plurals>
     <plurals name="poll_info_votes">
         <item quantity="one">ජන්ද %s</item>
         <item quantity="other">ජන්ද %s</item>
@@ -146,7 +154,9 @@
     <string name="restart_required">යෙදුම යළි ඇරඹීම ඇවැසිය</string>
     <string name="restart">යළි අරඹන්න</string>
     <string name="app_theme_black">කළු</string>
-    <string name="abbreviated_in_years">වර්. %d කින්</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">වර්. %d කින්</item>
+    </plurals>
     <string name="restart_emoji">මෙම වෙනස්කම් යෙදීමට ඔබ ටුස්කි නැවත ඇරඹිය යුතුය</string>
     <string name="action_edit">සංස්කරණය</string>
     <string name="button_continue">ඉදිරියට</string>
@@ -168,15 +178,21 @@
     <string name="about_project_site">වියමන අඩවිය:
 \n https://tusky.app</string>
     <string name="action_accept">පිළිගන්න</string>
-    <string name="abbreviated_in_hours">පැ. %d කින්</string>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">පැ. %d කින්</item>
+    </plurals>
     <string name="create_poll_title">මතවිමසුම</string>
     <string name="action_remove">ඉවත් කරන්න</string>
     <string name="action_add_media">මාධ්‍ය එකතු කරන්න</string>
-    <string name="abbreviated_in_days">ද. %d කින්</string>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">ද. %d කින්</item>
+    </plurals>
     <string name="notification_summary_large">%1$s, %2$s, %3$s සහ වෙනත් %4$d</string>
     <string name="action_open_post">ටූට් විවෘත කරන්න</string>
     <string name="title_domain_mutes">සැඟවුනු වසම්</string>
-    <string name="abbreviated_hours_ago">පැය %d</string>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">පැය %d</item>
+    </plurals>
     <string name="pref_failed_to_sync">සැකසුම් සමමුහූර්ත වීමට අසමත් විය</string>
     <string name="pref_title_show_replies">පිළිතුරු පෙන්වන්න</string>
     <string name="action_view_profile">පැතිකඩ</string>
@@ -185,7 +201,9 @@
     <string name="action_search">සොයන්න</string>
     <string name="action_share_as">ලෙස බෙදාගන්න …</string>
     <string name="title_home">මුල</string>
-    <string name="abbreviated_minutes_ago">වි. %d</string>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">වි. %d</item>
+    </plurals>
     <string name="failed_search">සෙවීමට අසමත් විය</string>
     <string name="no_announcements">නිවේදන නැත.</string>
     <string name="license_cc_by_sa_4">CC-BY-SA 4.0</string>
@@ -265,5 +283,7 @@
     <string name="pref_title_show_cards_in_timelines">කාලරේඛාවෙහි සබැඳි පෙරදසුන් පෙන්වන්න</string>
     <string name="action_links">සබැඳි</string>
     <string name="pref_title_browser_settings">අතිරික්සුව</string>
-    <string name="abbreviated_seconds_ago">තත්. %d</string>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">තත්. %d</item>
+    </plurals>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index a2a84ab6..d6b495f0 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -219,16 +219,36 @@
     <string name="post_media_images">Slike</string>
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Prošnja za sledenje</string>
-    <string name="abbreviated_in_years">v %dy</string>
-    <string name="abbreviated_in_days">v %dd</string>
-    <string name="abbreviated_in_hours">v %dh</string>
-    <string name="abbreviated_in_minutes">in %dm</string>
-    <string name="abbreviated_in_seconds">v %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">v %dy</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">v %dd</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">v %dh</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">in %dm</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">v %ds</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>>
     <string name="follows_you">Vam sledi</string>
     <string name="pref_title_alway_show_sensitive_media">Vedno prikaži občutljivo vsebino</string>
     <string name="title_media">Mediji</string>
@@ -448,4 +468,4 @@
     <string name="error_loading_account_details">Nalaganje podatkov o računu ni bilo uspešno</string>
     <string name="error_could_not_load_login_page">Prijavne strani ni bilo mogoče naložiti.</string>
     <string name="error_image_edit_failed">Datoteke ni bilo možno urediti.</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 3bea7680..b8ded3e8 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -239,16 +239,36 @@
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Följarförfrågan</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">om %dy</string>
-    <string name="abbreviated_in_days">om %dd</string>
-    <string name="abbreviated_in_hours">om %dh</string>
-    <string name="abbreviated_in_minutes">om %dm</string>
-    <string name="abbreviated_in_seconds">om %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">om %dy</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">om %dd</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">om %dh</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">om %dm</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">om %ds</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>>
     <string name="follows_you">Följer dig</string>
     <string name="pref_title_alway_show_sensitive_media">Visa alltid allt innehåll (inkl. känsligt)</string>
     <string name="title_media">Media</string>
@@ -711,4 +731,4 @@
     <string name="list_reply_policy_label">Visa svar till</string>
     <string name="pref_title_show_self_boosts">Visa egna-knuffar</string>
     <string name="pref_title_show_self_boosts_description">Någon knuffar sitt egna inlägg</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 3c9e945d..99c029f5 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -196,16 +196,36 @@
     <string name="post_media_video">காணொளி</string>
     <string name="state_follow_requested">கோரிக்கையைப் பின்பற்றவும்</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%dஆ-முன்</string>
-    <string name="abbreviated_in_days">%dநா-முன்</string>
-    <string name="abbreviated_in_hours">%dம.நே-முன்</string>
-    <string name="abbreviated_in_minutes">%dநி-முன்</string>
-    <string name="abbreviated_in_seconds">%dவி-முன்</string>
-    <string name="abbreviated_years_ago">%dஆ</string>
-    <string name="abbreviated_days_ago">%dநா</string>
-    <string name="abbreviated_hours_ago">%dம.நே</string>
-    <string name="abbreviated_minutes_ago">%dநி</string>
-    <string name="abbreviated_seconds_ago">%dவி</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%dஆ-முன்</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%dநா-முன்</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%dம.நே-முன்</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%dநி-முன்</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%dவி-முன்</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dஆ</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dநா</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dம.நே</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dநி</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dவி</item>
+    </plurals>>
     <string name="follows_you">நீங்கள் பின் தொடரபடுகிறீர்கள்</string>
     <string name="pref_title_alway_show_sensitive_media">எல்லா nsfw(உணர்ச்சிகரமான) உள்ளடக்கத்தையும் எப்போதும் காண்பி</string>
     <string name="title_media">ஊடகம்</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index f437b5d7..62724eec 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -155,16 +155,36 @@
     <string name="pref_title_alway_open_spoiler">ขยาย Toot ที่มีเครื่องหมายเนื้อหาอ่อนไหวเสมอ</string>
     <string name="pref_title_alway_show_sensitive_media">แสดงเนื้อหาอ่อนไหวเสมอ</string>
     <string name="follows_you">กำลังติดตามคุณ</string>
-    <string name="abbreviated_seconds_ago">%d วินาทีที่แล้ว</string>
-    <string name="abbreviated_minutes_ago">%d นาทีที่แล้ว</string>
-    <string name="abbreviated_hours_ago">%d ชั่วโมงที่แล้ว</string>
-    <string name="abbreviated_days_ago">%d วันที่แล้ว</string>
-    <string name="abbreviated_years_ago">%d ปีที่แล้ว</string>
-    <string name="abbreviated_in_seconds">ใน %d วินาที</string>
-    <string name="abbreviated_in_minutes">ใน %d นาที</string>
-    <string name="abbreviated_in_hours">ใน %d ชั่วโมง</string>
-    <string name="abbreviated_in_days">ใน %d วัน</string>
-    <string name="abbreviated_in_years">ใน %d ปี</string>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d วินาทีที่แล้ว</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d นาทีที่แล้ว</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d ชั่วโมงที่แล้ว</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d วันที่แล้ว</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d ปีที่แล้ว</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">ใน %d วินาที</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">ใน %d นาที</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">ใน %d ชั่วโมง</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">ใน %d วัน</item>
+    </plurals>>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">ใน %d ปี</item>
+    </plurals>>
     <string name="state_follow_requested">กำลังขอติดตาม</string>
     <string name="post_media_video">วิดีทัศน์</string>
     <string name="post_media_images">ภาพ</string>
@@ -481,4 +501,4 @@
     <string name="notification_subscription_format">%s เพิ่งโพสต์</string>
     <string name="title_announcements">ประกาศ</string>
     <string name="action_delete_conversation">ลบการสนทนา</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 5382f246..e4aed35e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -223,16 +223,36 @@
     <string name="post_media_video">Video</string>
     <string name="state_follow_requested">Takip istenen</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%dy içinde</string>
-    <string name="abbreviated_in_days">%dd içinde</string>
-    <string name="abbreviated_in_hours">%dh içinde</string>
-    <string name="abbreviated_in_minutes">%dm içinde</string>
-    <string name="abbreviated_in_seconds">%ds içinde</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%dy içinde</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%dd içinde</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%dh içinde</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%dm içinde</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%ds içinde</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>>
     <string name="follows_you">Seni takip ediyor</string>
     <string name="pref_title_alway_show_sensitive_media">Her zaman hassas içerikleri göster</string>
     <string name="title_media">Medya</string>
@@ -705,4 +725,4 @@
     <string name="pref_title_show_self_boosts">Kendi beğenmeleri göster</string>
     <string name="pref_title_show_self_boosts_description">Birisi kendi gönderisini yükseltiyor</string>
     <string name="pref_title_per_timeline_preferences">Zaman akışı başına tercihler</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 2ec7523c..405423b0 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -298,16 +298,36 @@
     <string name="pref_title_alway_open_spoiler">Завжди розгортати допис, з попередженнями про вміст</string>
     <string name="follows_you">Підписники</string>
     <string name="pref_title_alway_show_sensitive_media">Завжди показувати делікатний вміст</string>
-    <string name="abbreviated_seconds_ago">%dс</string>
-    <string name="abbreviated_minutes_ago">%dхв</string>
-    <string name="abbreviated_hours_ago">%dгод</string>
-    <string name="abbreviated_days_ago">%dдн</string>
-    <string name="abbreviated_years_ago">%dр.</string>
-    <string name="abbreviated_in_seconds">за %dс</string>
-    <string name="abbreviated_in_minutes">за %dхв</string>
-    <string name="abbreviated_in_hours">за %dгод</string>
-    <string name="abbreviated_in_days">за %dдн</string>
-    <string name="abbreviated_in_years">за %dр.</string>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%dс</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dхв</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dгод</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dдн</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dр.</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">за %dс</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">за %dхв</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">за %dгод</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">за %dдн</item>
+    </plurals>>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">за %dр.</item>
+    </plurals>>
     <string name="state_follow_requested">Запит на підписку надіслано</string>
     <string name="post_media_attachments">Вкладення</string>
     <string name="post_media_audio">Звуки</string>
@@ -719,4 +739,4 @@
     <string name="list_reply_policy_list">Учасники списку</string>
     <string name="list_reply_policy_followed">Будь-який користувач, за яким ви стежите</string>
     <string name="list_reply_policy_label">Показати відповіді на</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index ee0e31fb..db7eb615 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -290,16 +290,36 @@
     <string name="pref_title_alway_open_spoiler">Hiện nội dung ẩn</string>
     <string name="pref_title_alway_show_sensitive_media">Hiện nội dung nhạy cảm</string>
     <string name="follows_you">Đang theo dõi bạn</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
-    <string name="abbreviated_minutes_ago">%d phút</string>
-    <string name="abbreviated_hours_ago">%d giờ</string>
-    <string name="abbreviated_days_ago">%d ngày</string>
-    <string name="abbreviated_years_ago">%d năm</string>
-    <string name="abbreviated_in_seconds">%ds</string>
-    <string name="abbreviated_in_minutes">%d phút</string>
-    <string name="abbreviated_in_hours">%d giờ</string>
-    <string name="abbreviated_in_days">%d ngày</string>
-    <string name="abbreviated_in_years">%d năm</string>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d phút</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d giờ</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d ngày</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d năm</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%ds</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d phút</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d giờ</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%d ngày</item>
+    </plurals>>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%d năm</item>
+    </plurals>>
     <string name="state_follow_requested">Yêu cầu theo dõi</string>
     <string name="post_media_video">Video</string>
     <string name="post_media_images">Hình ảnh</string>
@@ -688,4 +708,4 @@
     <string name="pref_title_show_self_boosts">Hiện lượt tự đăng lại</string>
     <string name="pref_title_show_self_boosts_description">Ai đó đăng lại tút của chính họ</string>
     <string name="pref_title_per_timeline_preferences">Thiết lập từng bảng tin</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e79facad..a4f1256b 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -244,16 +244,36 @@
     <string name="post_media_video">视频</string>
     <string name="state_follow_requested">已发送关注请求</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%d 年内</string>
-    <string name="abbreviated_in_days">%d 天内</string>
-    <string name="abbreviated_in_hours">%d 小时内</string>
-    <string name="abbreviated_in_minutes">%d 分钟内</string>
-    <string name="abbreviated_in_seconds">%d 秒内</string>
-    <string name="abbreviated_years_ago">%d 年前</string>
-    <string name="abbreviated_days_ago">%d 天前</string>
-    <string name="abbreviated_hours_ago">%d 小时前</string>
-    <string name="abbreviated_minutes_ago">%d 分钟前</string>
-    <string name="abbreviated_seconds_ago">%d 秒前</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%d 年内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%d 天内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d 小时内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d 分钟内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d 秒内</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d 年前</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d 天前</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d 小时前</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d 分钟前</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d 秒前</item>
+    </plurals>>
     <string name="follows_you">关注了你</string>
     <string name="pref_title_alway_show_sensitive_media">总是显示所有敏感媒体内容</string>
     <string name="title_media">媒体</string>
@@ -701,4 +721,4 @@
     <string name="list_reply_policy_label">显示哪些回复</string>
     <string name="pref_title_show_self_boosts_description">某人转发自己的嘟文</string>
     <string name="pref_title_show_self_boosts">显示自转发嘟文</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index fb8ce54a..39d08f5a 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -248,16 +248,36 @@
     <string name="post_media_video">影片</string>
     <string name="state_follow_requested">已請求關注</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%d 年內</string>
-    <string name="abbreviated_in_days">%d 天內</string>
-    <string name="abbreviated_in_hours">%d 小時內</string>
-    <string name="abbreviated_in_minutes">%d 分鐘內</string>
-    <string name="abbreviated_in_seconds">%d 秒內</string>
-    <string name="abbreviated_years_ago">%d 年前</string>
-    <string name="abbreviated_days_ago">%d 天前</string>
-    <string name="abbreviated_hours_ago">%d 小時前</string>
-    <string name="abbreviated_minutes_ago">%d 分鐘前</string>
-    <string name="abbreviated_seconds_ago">%d 秒前</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%d 年內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%d 天內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d 小時內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d 分鐘內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d 秒內</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d 年前</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d 天前</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d 小時前</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d 分鐘前</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d 秒前</item>
+    </plurals>>
     <string name="follows_you">關注了你</string>
     <string name="pref_title_alway_show_sensitive_media">總是顯示所有敏感媒體內容</string>
     <string name="title_media">媒體</string>
@@ -497,4 +517,4 @@
     <string name="pref_main_nav_position_option_bottom">底端</string>
     <string name="pref_main_nav_position_option_top">頂端</string>
     <string name="pref_main_nav_position">主要導覽列的位置</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
index fca10121..abd9ad12 100644
--- a/app/src/main/res/values-zh-rMO/strings.xml
+++ b/app/src/main/res/values-zh-rMO/strings.xml
@@ -242,16 +242,36 @@
     <string name="post_media_video">影片</string>
     <string name="state_follow_requested">已請求關注</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%d 年內</string>
-    <string name="abbreviated_in_days">%d 天內</string>
-    <string name="abbreviated_in_hours">%d 小時內</string>
-    <string name="abbreviated_in_minutes">%d 分鐘內</string>
-    <string name="abbreviated_in_seconds">%d 秒內</string>
-    <string name="abbreviated_years_ago">%d 年前</string>
-    <string name="abbreviated_days_ago">%d 天前</string>
-    <string name="abbreviated_hours_ago">%d 小時前</string>
-    <string name="abbreviated_minutes_ago">%d 分鐘前</string>
-    <string name="abbreviated_seconds_ago">%d 秒前</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%d 年內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%d 天內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d 小時內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d 分鐘內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d 秒內</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d 年前</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d 天前</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d 小時前</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d 分鐘前</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d 秒前</item>
+    </plurals>>
     <string name="follows_you">關注了你</string>
     <string name="pref_title_alway_show_sensitive_media">總是顯示所有敏感媒體內容</string>
     <string name="title_media">媒體</string>
@@ -397,4 +417,4 @@
     <string name="hashtags">話題</string>
     <string name="edit_poll">編輯</string>
     <string name="action_edit">編輯</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-zh-rSG/strings.xml b/app/src/main/res/values-zh-rSG/strings.xml
index 381f901a..300be202 100644
--- a/app/src/main/res/values-zh-rSG/strings.xml
+++ b/app/src/main/res/values-zh-rSG/strings.xml
@@ -247,16 +247,36 @@
     <string name="post_media_video">视频</string>
     <string name="state_follow_requested">已发送关注请求</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%d 年内</string>
-    <string name="abbreviated_in_days">%d 天内</string>
-    <string name="abbreviated_in_hours">%d 小时内</string>
-    <string name="abbreviated_in_minutes">%d 分钟内</string>
-    <string name="abbreviated_in_seconds">%d 秒内</string>
-    <string name="abbreviated_years_ago">%d 年前</string>
-    <string name="abbreviated_days_ago">%d 天前</string>
-    <string name="abbreviated_hours_ago">%d 小时前</string>
-    <string name="abbreviated_minutes_ago">%d 分钟前</string>
-    <string name="abbreviated_seconds_ago">%d 秒前</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%d 年内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%d 天内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d 小时内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d 分钟内</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d 秒内</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d 年前</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d 天前</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d 小时前</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d 分钟前</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d 秒前</item>
+    </plurals>>
     <string name="follows_you">关注了你</string>
     <string name="pref_title_alway_show_sensitive_media">总是显示所有敏感媒体内容</string>
     <string name="title_media">媒体</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8a2fb64f..f70a44f5 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -248,16 +248,36 @@
     <string name="post_media_video">影片</string>
     <string name="state_follow_requested">已請求關注</string>
     <!--These are for timestamps on statuses. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">%d 年內</string>
-    <string name="abbreviated_in_days">%d 天內</string>
-    <string name="abbreviated_in_hours">%d 小時內</string>
-    <string name="abbreviated_in_minutes">%d 分鐘內</string>
-    <string name="abbreviated_in_seconds">%d 秒內</string>
-    <string name="abbreviated_years_ago">%d 年前</string>
-    <string name="abbreviated_days_ago">%d 天前</string>
-    <string name="abbreviated_hours_ago">%d 小時前</string>
-    <string name="abbreviated_minutes_ago">%d 分鐘前</string>
-    <string name="abbreviated_seconds_ago">%d 秒前</string>
+        <plurals name="abbreviated_in_years">
+        <item quantity="other">%d 年內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_days">
+        <item quantity="other">%d 天內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_hours">
+        <item quantity="other">%d 小時內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_minutes">
+        <item quantity="other">%d 分鐘內</item>
+    </plurals>>
+        <plurals name="abbreviated_in_seconds">
+        <item quantity="other">%d 秒內</item>
+    </plurals>>
+        <plurals name="abbreviated_years_ago">
+        <item quantity="other">%d 年前</item>
+    </plurals>>
+        <plurals name="abbreviated_days_ago">
+        <item quantity="other">%d 天前</item>
+    </plurals>>
+        <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%d 小時前</item>
+    </plurals>>
+        <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%d 分鐘前</item>
+    </plurals>>
+        <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%d 秒前</item>
+    </plurals>>
     <string name="follows_you">關注了你</string>
     <string name="pref_title_alway_show_sensitive_media">總是顯示所有敏感媒體內容</string>
     <string name="title_media">媒體</string>
@@ -567,4 +587,4 @@
     <string name="notification_sign_up_format">%s 已註冊</string>
     <string name="notification_update_format">%s 編輯了他們的嘟文</string>
     <string name="error_image_edit_failed">這張圖片不能編輯。</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97e71a07..a78ad7ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -431,16 +431,36 @@
     <string name="state_follow_requested">Follow requested</string>
 
     <!--These are for timestamps on posts. For example: "16s" or "2d"-->
-    <string name="abbreviated_in_years">in %dy</string>
-    <string name="abbreviated_in_days">in %dd</string>
-    <string name="abbreviated_in_hours">in %dh</string>
-    <string name="abbreviated_in_minutes">in %dm</string>
-    <string name="abbreviated_in_seconds">in %ds</string>
-    <string name="abbreviated_years_ago">%dy</string>
-    <string name="abbreviated_days_ago">%dd</string>
-    <string name="abbreviated_hours_ago">%dh</string>
-    <string name="abbreviated_minutes_ago">%dm</string>
-    <string name="abbreviated_seconds_ago">%ds</string>
+    <plurals name="abbreviated_in_years">
+        <item quantity="other">in %dy</item>
+    </plurals>
+    <plurals name="abbreviated_in_days">
+        <item quantity="other">in %dd</item>
+    </plurals>
+    <plurals name="abbreviated_in_hours">
+        <item quantity="other">in %dh</item>
+    </plurals>
+    <plurals name="abbreviated_in_minutes">
+        <item quantity="other">in %dm</item>
+    </plurals>
+    <plurals name="abbreviated_in_seconds">
+        <item quantity="other">in %ds</item>
+    </plurals>
+    <plurals name="abbreviated_years_ago">
+        <item quantity="other">%dy</item>
+    </plurals>
+    <plurals name="abbreviated_days_ago">
+        <item quantity="other">%dd</item>
+    </plurals>
+    <plurals name="abbreviated_hours_ago">
+        <item quantity="other">%dh</item>
+    </plurals>
+    <plurals name="abbreviated_minutes_ago">
+        <item quantity="other">%dm</item>
+    </plurals>
+    <plurals name="abbreviated_seconds_ago">
+        <item quantity="other">%ds</item>
+    </plurals>
 
     <string name="follows_you">Follows you</string>
     <string name="pref_title_alway_show_sensitive_media">Always show sensitive content</string>