From 9f526e8e8f649482292ee766d3d3988f4ddb7ebe Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Thu, 24 Jul 2025 07:56:08 +0530
Subject: [PATCH 1/2] Fix short count formatting for Android versions below 7.0

---
 .../org/schabi/newpipe/util/Localization.java  | 18 +++++++++++-------
 app/src/main/res/values-ar-rLY/strings.xml     |  3 ---
 app/src/main/res/values-ar/strings.xml         |  3 ---
 app/src/main/res/values-az/strings.xml         |  3 ---
 app/src/main/res/values-b+ast/strings.xml      |  3 ---
 app/src/main/res/values-b+uz+Latn/strings.xml  |  3 ---
 app/src/main/res/values-be/strings.xml         |  3 ---
 app/src/main/res/values-ber/strings.xml        |  3 ---
 app/src/main/res/values-bg/strings.xml         |  3 ---
 app/src/main/res/values-bn-rBD/strings.xml     |  3 ---
 app/src/main/res/values-bn/strings.xml         |  3 ---
 app/src/main/res/values-ca/strings.xml         |  3 ---
 app/src/main/res/values-ckb/strings.xml        |  3 ---
 app/src/main/res/values-cs/strings.xml         |  3 ---
 app/src/main/res/values-da/strings.xml         |  3 ---
 app/src/main/res/values-de/strings.xml         |  3 ---
 app/src/main/res/values-el/strings.xml         |  3 ---
 app/src/main/res/values-eo/strings.xml         |  3 ---
 app/src/main/res/values-es/strings.xml         |  3 ---
 app/src/main/res/values-et/strings.xml         |  3 ---
 app/src/main/res/values-eu/strings.xml         |  3 ---
 app/src/main/res/values-fa/strings.xml         |  3 ---
 app/src/main/res/values-fi/strings.xml         |  3 ---
 app/src/main/res/values-fr/strings.xml         |  3 ---
 app/src/main/res/values-gl/strings.xml         |  3 ---
 app/src/main/res/values-he/strings.xml         |  3 ---
 app/src/main/res/values-hi/strings.xml         |  3 ---
 app/src/main/res/values-hr/strings.xml         |  3 ---
 app/src/main/res/values-hu/strings.xml         |  3 ---
 app/src/main/res/values-in/strings.xml         |  3 ---
 app/src/main/res/values-is/strings.xml         |  3 ---
 app/src/main/res/values-it/strings.xml         |  3 ---
 app/src/main/res/values-ja/strings.xml         |  3 ---
 app/src/main/res/values-ka/strings.xml         |  3 ---
 app/src/main/res/values-kab/strings.xml        |  2 --
 app/src/main/res/values-kmr/strings.xml        |  3 ---
 app/src/main/res/values-ko/strings.xml         |  3 ---
 app/src/main/res/values-ku/strings.xml         |  3 ---
 app/src/main/res/values-lt/strings.xml         |  3 ---
 app/src/main/res/values-lv/strings.xml         |  3 ---
 app/src/main/res/values-mk/strings.xml         |  3 ---
 app/src/main/res/values-ml/strings.xml         |  3 ---
 app/src/main/res/values-mr/strings.xml         |  3 ---
 app/src/main/res/values-ms/strings.xml         |  3 ---
 app/src/main/res/values-nb-rNO/strings.xml     |  3 ---
 app/src/main/res/values-ne/strings.xml         |  3 ---
 app/src/main/res/values-nl-rBE/strings.xml     |  3 ---
 app/src/main/res/values-nl/strings.xml         |  3 ---
 app/src/main/res/values-nqo/strings.xml        |  3 ---
 app/src/main/res/values-or/strings.xml         |  3 ---
 app/src/main/res/values-pa/strings.xml         |  3 ---
 app/src/main/res/values-pl/strings.xml         |  5 +----
 app/src/main/res/values-pt-rBR/strings.xml     |  3 ---
 app/src/main/res/values-pt-rPT/strings.xml     |  3 ---
 app/src/main/res/values-pt/strings.xml         |  3 ---
 app/src/main/res/values-ro/strings.xml         |  3 ---
 app/src/main/res/values-ru/strings.xml         |  3 ---
 app/src/main/res/values-ryu/strings.xml        |  3 ---
 app/src/main/res/values-sat/strings.xml        |  3 ---
 app/src/main/res/values-sc/strings.xml         |  3 ---
 app/src/main/res/values-sk/strings.xml         |  3 ---
 app/src/main/res/values-sl/strings.xml         |  3 ---
 app/src/main/res/values-so/strings.xml         |  3 ---
 app/src/main/res/values-sq/strings.xml         |  3 ---
 app/src/main/res/values-sr/strings.xml         |  3 ---
 app/src/main/res/values-sv/strings.xml         |  3 ---
 app/src/main/res/values-ta/strings.xml         |  3 ---
 app/src/main/res/values-te/strings.xml         |  3 ---
 app/src/main/res/values-th/strings.xml         |  3 ---
 app/src/main/res/values-tr/strings.xml         |  3 ---
 app/src/main/res/values-tzm/strings.xml        |  1 -
 app/src/main/res/values-uk/strings.xml         |  3 ---
 app/src/main/res/values-und/strings.xml        |  1 -
 app/src/main/res/values-ur/strings.xml         |  3 ---
 app/src/main/res/values-vi/strings.xml         |  3 ---
 app/src/main/res/values-zh-rCN/strings.xml     |  3 ---
 app/src/main/res/values-zh-rHK/strings.xml     |  3 ---
 app/src/main/res/values-zh-rTW/strings.xml     |  3 ---
 app/src/main/res/values/strings.xml            |  6 +++---
 79 files changed, 15 insertions(+), 237 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index 2bd4664ae..d47cb918e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -191,14 +191,14 @@ public final class Localization {
 
         final double value = (double) count;
         if (count >= 1000000000) {
-            return localizeNumber(round(value / 1000000000))
-                    + context.getString(R.string.short_billion);
+            return context.getString(R.string.short_billion,
+                    localizeNumber(round(value / 1000000000)));
         } else if (count >= 1000000) {
-            return localizeNumber(round(value / 1000000))
-                    + context.getString(R.string.short_million);
+            return context.getString(R.string.short_million,
+                    localizeNumber(round(value / 1000000)));
         } else if (count >= 1000) {
-            return localizeNumber(round(value / 1000))
-                    + context.getString(R.string.short_thousand);
+            return context.getString(R.string.short_thousand,
+                    localizeNumber(round(value / 1000, 0)));
         } else {
             return localizeNumber(value);
         }
@@ -417,7 +417,11 @@ public final class Localization {
     }
 
     private static double round(final double value) {
-        return new BigDecimal(value).setScale(1, RoundingMode.HALF_UP).doubleValue();
+        return round(value, 1);
+    }
+
+    private static double round(final double value, final int scale) {
+        return new BigDecimal(value).setScale(scale, RoundingMode.HALF_UP).doubleValue();
     }
 
     private static String getQuantity(@NonNull final Context context,
diff --git a/app/src/main/res/values-ar-rLY/strings.xml b/app/src/main/res/values-ar-rLY/strings.xml
index 0ab5fe741..7f881a9c2 100644
--- a/app/src/main/res/values-ar-rLY/strings.xml
+++ b/app/src/main/res/values-ar-rLY/strings.xml
@@ -75,13 +75,11 @@
     <string name="downloads_title">الملفات المحملة</string>
     <string name="invalid_source">لا يوجد مثل هذا الملف/مصدر المحتوى</string>
     <string name="most_liked">الأكثر إعجابًا</string>
-    <string name="short_billion">بليون</string>
     <string name="feed_load_error_account_info">تعذر تحميل موجز \'%s\'.</string>
     <string name="question_mark">؟</string>
     <string name="check_for_updates">التحقق من وجود تحديثات</string>
     <string name="peertube_instance_url_title">مثيلات خوادم پيرتيوب</string>
     <string name="more_than_100_videos">+100 فيديو</string>
-    <string name="short_thousand">ألف</string>
     <string name="peertube_instance_add_exists">مثيل الخادم موجود بالفعل</string>
     <string name="clear_queue_confirmation_title">طلب تأكيد قبل مسح قائمة الانتظار</string>
     <string name="metadata_subscribers">المشتركون</string>
@@ -649,7 +647,6 @@
     <string name="seek_duration_title">تسريع إلى الأمام/-ترجيع وقت البحث</string>
     <string name="permission_denied">تم رفضها من قبل النظام</string>
     <string name="no_comments">ليس هناك تعليقات</string>
-    <string name="short_million">مليون</string>
     <string name="checking_updates_toast">جاري التحقق من وجود تحديثات…</string>
     <string name="content">المحتوى</string>
     <string name="downloads_storage_ask_title">اسأل عن مكان التنزيل</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fff1dd3a9..9b6c1a414 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -116,9 +116,6 @@
     <string name="empty_list_subtitle">لا شيء هنا سوى الصراصير</string>
     <string name="audio">الصوت</string>
     <string name="retry">إعادة المحاولة</string>
-    <string name="short_thousand">ألف</string>
-    <string name="short_million">مليون</string>
-    <string name="short_billion">بليون</string>
     <string name="no_subscribers">ليس هناك مشترِكون</string>
     <plurals name="subscribers">
         <item quantity="zero">%s مشارك</item>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 682dda98f..78cb6c013 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -297,9 +297,6 @@
     <string name="detail_likes_img_view_description">Bəyən</string>
     <string name="detail_dislikes_img_view_description">Bəyənmə</string>
     <string name="detail_drag_description">Yenidən sıralamaq üçün sürüklə</string>
-    <string name="short_thousand">min</string>
-    <string name="short_million">Mln</string>
-    <string name="short_billion">Mlrd</string>
     <string name="drawer_header_description">Xidməti dəyiş, hazırda seçilmiş:</string>
     <string name="no_subscribers">Abunəçi yoxdur</string>
     <string name="no_views">Baxış yoxdur</string>
diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml
index 51b4fdec0..81b212f80 100644
--- a/app/src/main/res/values-b+ast/strings.xml
+++ b/app/src/main/res/values-b+ast/strings.xml
@@ -43,9 +43,6 @@
     <string name="detail_dislikes_img_view_description">Tarrezmes</string>
     <string name="default_video_format_title">Formatu de videu predetermináu</string>
     <string name="black_theme_title">Prietu</string>
-    <string name="short_thousand">mil</string>
-    <string name="short_million">mill.</string>
-    <string name="short_billion">mil mill.</string>
     <string name="msg_popup_permission">Precísase esti permisu p\'abrir
 \nnel mou ventanu</string>
     <string name="title_activity_recaptcha">Retu de reCAPTCHA</string>
diff --git a/app/src/main/res/values-b+uz+Latn/strings.xml b/app/src/main/res/values-b+uz+Latn/strings.xml
index b556da756..2be37ea7c 100644
--- a/app/src/main/res/values-b+uz+Latn/strings.xml
+++ b/app/src/main/res/values-b+uz+Latn/strings.xml
@@ -267,9 +267,6 @@
     </plurals>
     <string name="no_subscribers">Obunachilar yo\'q</string>
     <string name="drawer_header_description">Hozirda tanlangan xizmatni yoqish:</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">k</string>
     <string name="retry">Qayta</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 22f963def..968aafaba 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -159,9 +159,6 @@
     <string name="video">Відэа</string>
     <string name="audio">Аўдыя</string>
     <string name="retry">Паспрабаваць зноў</string>
-    <string name="short_thousand">тыс.</string>
-    <string name="short_million">млн</string>
-    <string name="short_billion">млрд</string>
     <string name="no_subscribers">Няма падпісчыкаў</string>
     <plurals name="subscribers">
         <item quantity="one">%s падпісчык</item>
diff --git a/app/src/main/res/values-ber/strings.xml b/app/src/main/res/values-ber/strings.xml
index 3912381fc..39247f49b 100644
--- a/app/src/main/res/values-ber/strings.xml
+++ b/app/src/main/res/values-ber/strings.xml
@@ -45,9 +45,6 @@
     </plurals>
     <string name="infinite_videos">∞ ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
     <string name="more_than_100_videos">100+ ⵉⴼⵉⴷⵢⵓⵜⵏ</string>
-    <string name="short_billion">ⴱ</string>
-    <string name="short_million">ⵎ</string>
-    <string name="short_thousand">ⴽ</string>
     <string name="audio">ⴰⵎⵙⵍⴰⵢ</string>
     <string name="video">ⴰⴼⵉⴷⵢⵓ</string>
     <string name="detail_likes_img_view_description">ⵉⵔⵉⵜⵏ</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index c6d4d76ce..e57413b9d 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -183,9 +183,6 @@
     <string name="file_name_empty_error">Името на файла не може да бъде празно</string>
     <string name="error_occurred_detail">Възникна грешка: %1$s</string>
     <string name="no_streams_available_download">Не са налични източници за изтегляне</string>
-    <string name="short_thousand">хил.</string>
-    <string name="short_million">млн.</string>
-    <string name="short_billion">млрд.</string>
     <string name="no_subscribers">Няма абонати</string>
     <string name="create">Създай</string>
     <string name="dismiss">Откажи</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index ddc32e418..2b0ffe918 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -82,9 +82,6 @@
     <string name="video">ভিডিও</string>
     <string name="audio">অডিও</string>
     <string name="retry">পুনরায় চেষ্টা করো</string>
-    <string name="short_thousand">হা</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">বি</string>
     <!-- Missions -->
     <string name="start">শুরু</string>
     <string name="pause">বিরতি</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 715c9146e..5721f12ee 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -104,9 +104,6 @@
     <string name="no_videos">কোন ভিডিও নেই</string>
     <string name="no_views">কোন ভিউ নেই</string>
     <string name="no_subscribers">কোন সাবস্ক্রাইবার নেই</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">K</string>
     <string name="retry">পুনরায় চেষ্টা করো</string>
     <string name="audio">অডিও</string>
     <string name="video">ভিডিও</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 123a5ef67..819c9ff0b 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -231,9 +231,6 @@
     <string name="player_recoverable_failure">S\'està recuperant el reproductor després de l\'error</string>
     <string name="sorry_string">Bé, és lamentable.</string>
     <string name="detail_drag_description">Arrossegueu per reordenar la llista</string>
-    <string name="short_thousand">mil</string>
-    <string name="short_million">milions</string>
-    <string name="short_billion">mil milions</string>
     <string name="start">Inicia</string>
     <string name="msg_running_detail">Feu un toc aquí per a més detalls</string>
     <string name="no_available_dir">Defineix una carpeta de baixades més endavant als paràmetres</string>
diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml
index 649e6e73c..7c23d1d1d 100644
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@@ -25,7 +25,6 @@
     <string name="subscribers_count_not_available">ژمارەی بەژداری نادیارە</string>
     <string name="overwrite_failed">ناتوانرێت لەسەر ئەو فایله‌وه‌ جێگیر بکرێت</string>
     <string name="tab_choose">په‌ڕه‌ هەڵبژێرە</string>
-    <string name="short_million">ملیۆن</string>
     <string name="more_than_100_videos">+١٠٠ ڤیدیۆیان</string>
     <string name="settings_category_player_title">لێده‌ر</string>
     <string name="import_title">هاوردە</string>
@@ -46,7 +45,6 @@
     <string name="override_current_data">ئەمە لەسەر ڕێکخستنەکانی ئێستات جێگیر دەبێت.</string>
     <string name="notification_channel_name">پەیامەکانی نیوپایپ</string>
     <string name="donation_encouragement">نیوپایپ لەلایەن چەند خۆبەخشێکەوە دروستکراوە کە کاته‌كانی خۆیان پێ بەخشیووە تاکو باشترین خزمەتگوزاریت پێشکەش بکەن. هیچ نەبێت بە کڕینی کوپێک قاوە یارمەتی گەشەپێدەرەکانمان بدە بۆ ئەوەی کاتی زیاتر تەرخان بکەین بۆ بەرەوپێشبردنی نیوپایپ.</string>
-    <string name="short_billion">ملیار</string>
     <string name="show_search_suggestions_title">گەڕانی پێشنیارکراوەکان</string>
     <string name="playback_tempo">خێرا</string>
     <string name="file_deleted">فایل سڕایەوە</string>
@@ -373,7 +371,6 @@
     <string name="download_failed">ناتوانرێت داببه‌زێنرێت</string>
     <string name="error_connect_host">ناتوانرێت بە ڕاژەكه‌وە پەیوەست ببیت</string>
     <string name="detail_thumbnail_view_description">لێدانی ڤیدیۆ، مه‌ودا:</string>
-    <string name="short_thousand">هەزار</string>
     <string name="most_liked">زۆرترین بەدڵ</string>
     <string name="delete">سڕینەوە</string>
     <string name="default_video_format_title">جۆری بنەڕەتی ڤیدیۆ</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index ea531408f..6ff8296e6 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -83,9 +83,7 @@
     <string name="no_available_dir">Určete prosím složku pro stahování později v nastavení</string>
     <string name="info_labels">Co:\\nŽádost:\\nJazyk obsahu:\\nZemě obsahu:\\nJazyk aplikace:\\nSlužba:\\nČas GMT:\\nBalíček:\\nVerze:\\nVerze OS:</string>
     <string name="all">Vše</string>
-    <string name="short_thousand">tis.</string>
     <string name="open_in_popup_mode">Otevřít ve vyskakovacím okně</string>
-    <string name="short_million">mil.</string>
     <string name="msg_popup_permission">Toto oprávnění je vyžadováno
 \npro otevření ve vyskakovacím okně</string>
     <string name="use_external_video_player_summary">Odstraňuje zvuk v některých rozlišeních</string>
@@ -124,7 +122,6 @@
     <string name="notification_channel_description">Oznámení pro NewPipe přehrávač</string>
     <string name="search_no_results">Žádné výsledky</string>
     <string name="empty_list_subtitle">Je tu sranda jak v márnici</string>
-    <string name="short_billion">mld.</string>
     <string name="no_subscribers">Žádní odběratelé</string>
     <plurals name="subscribers">
         <item quantity="one">%s odběratel</item>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index cecdcc4fe..db464ca61 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -305,9 +305,6 @@
     <string name="stop">Stop</string>
     <string name="events">Hændelser</string>
     <string name="empty_list_subtitle">Ikke andet end fårekyllinger her</string>
-    <string name="short_thousand">t</string>
-    <string name="short_million">mio.</string>
-    <string name="short_billion">mia.</string>
     <plurals name="subscribers">
         <item quantity="one">%s abonnent</item>
         <item quantity="other">%s abonnenter</item>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 309709f47..a741d743a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -69,9 +69,6 @@
     <string name="error_report_title">Fehlerbericht</string>
     <string name="delete">Löschen</string>
     <string name="checksum">Prüfsumme</string>
-    <string name="short_thousand">Tsd.</string>
-    <string name="short_million">Mio.</string>
-    <string name="short_billion">Mrd.</string>
     <string name="msg_name">Dateiname</string>
     <string name="msg_error">Fehler</string>
     <string name="msg_wait">Bitte warten …</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 67a24bd4f..f66f24d46 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -41,7 +41,6 @@
     <string name="detail_uploader_thumbnail_view_description">Μικρογραφία εικόνας προφίλ του χρήστη</string>
     <string name="detail_likes_img_view_description">Like</string>
     <string name="detail_dislikes_img_view_description">Dislike</string>
-    <string name="short_billion">δισ/ρια</string>
     <string name="open_in_popup_mode">Άνοιγμα σε αναδυόμενο παράθυρο</string>
     <string name="subscribe_button_title">Εγγραφή</string>
     <string name="subscribed_button_title">Εγγεγραμμένος</string>
@@ -169,8 +168,6 @@
     <string name="empty_list_subtitle">Δεν υπάρχει τίποτα εδώ</string>
     <string name="detail_drag_description">Σύρετε για ταξινόμηση</string>
     <string name="retry">Προσπάθεια εκ νέου</string>
-    <string name="short_thousand">χιλ.</string>
-    <string name="short_million">εκ/ρια</string>
     <string name="no_subscribers">Κανένας συνδρομητής</string>
     <plurals name="subscribers">
         <item quantity="one">%s συνδρομητής</item>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index 1da4d536c..408035e00 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -261,9 +261,6 @@
         <item quantity="one">%s spekto</item>
         <item quantity="other">%s spektoj</item>
     </plurals>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">Mrd</string>
     <string name="title_activity_about">Pri NewPipe</string>
     <string name="title_licenses">Eksteraj permesiloj</string>
     <string name="copyright" formatted="true">© %1$s de %2$s sub %3$s</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 610d900ec..a1ee4f092 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -81,9 +81,6 @@
     <string name="info_labels">Qué:\\nSolicitud:\\nIdioma del contenido:\\nPaís del contenido:\\nIdioma de la aplicación:\\nServicio:\\nMarca de tiempo:\\nPaquete:\\nVersión:\\nVersión del SO:</string>
     <string name="black_theme_title">Negro</string>
     <string name="all">Todo</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">MM</string>
     <string name="open_in_popup_mode">Abrir en modo emergente</string>
     <string name="msg_popup_permission">Se necesita este permiso
 \npara abrir en modo emergente</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index 9f9c7207c..170c54060 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -154,9 +154,6 @@
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Proovi uuesti</string>
-    <string name="short_thousand">tuh</string>
-    <string name="short_million">mln</string>
-    <string name="short_billion">mld</string>
     <string name="no_subscribers">Tellijaid pole</string>
     <plurals name="subscribers">
         <item quantity="one">%s tellija</item>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 16054d9ae..20a7148eb 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -84,9 +84,6 @@
     <string name="video">Bideoa</string>
     <string name="audio">Audioa</string>
     <string name="retry">Saiatu berriro</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">MM</string>
     <string name="start">Hasi</string>
     <string name="pause">Pausatu</string>
     <string name="delete">Ezabatu</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 3bba8efb8..8b8fdd281 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -148,9 +148,6 @@
     <string name="error_occurred_detail">خطایی رخ داد: %1$s</string>
     <string name="no_streams_available_download">جریانی برای بارگیری در دسترس نیست</string>
     <string name="search_no_results">بدون نتیجه</string>
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <plurals name="subscribers">
         <item quantity="one">%s مشترک</item>
         <item quantity="other">%s مشترک</item>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 20734dd26..0c092284c 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -102,9 +102,6 @@
     <string name="video">Video</string>
     <string name="audio">Ääni</string>
     <string name="retry">Toista uudelleen</string>
-    <string name="short_thousand">t.</string>
-    <string name="short_million">milj.</string>
-    <string name="short_billion">bilj.</string>
     <string name="no_subscribers">Ei tilaajia</string>
     <plurals name="subscribers">
         <item quantity="one">%s tilaaja</item>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index c3fe5cf58..934a5a877 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -87,8 +87,6 @@
     <string name="popup_playing_toast">Lecture en mode flottant</string>
     <string name="disabled">Désactivés</string>
     <string name="info_labels">Quoi :\\nRequest :\\nContent Language :\\nContent Country :\\nApp Language :\\nService :\\nGMT Time :\\nPackage :\\nVersion :\\nOS version :</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
     <string name="msg_popup_permission">Cette autorisation est nécessaire pour
 \nutiliser le mode flottant</string>
     <string name="controls_background_title">Arrière-plan</string>
@@ -100,7 +98,6 @@
     <string name="popup_remember_size_pos_title">Mémoriser les propriétés de la fenêtre flottante</string>
     <string name="popup_remember_size_pos_summary">Mémoriser les dernières taille et position de la fenêtre flottante</string>
     <string name="clear">Effacer</string>
-    <string name="short_billion">G</string>
     <string name="use_external_video_player_summary">Le son peut être absent à certaines définitions</string>
     <string name="show_search_suggestions_title">Suggestions de recherche</string>
     <string name="show_search_suggestions_summary">Sélectionner les suggestions à afficher lors d’une recherche</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index d345b9385..3d98682be 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -158,9 +158,6 @@
     <string name="video">Vídeo</string>
     <string name="audio">Audio</string>
     <string name="retry">Tentar de novo</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <string name="no_subscribers">Ningún subscrito</string>
     <plurals name="subscribers">
         <item quantity="one">%s subscrito</item>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index bd560f07b..f17abc60d 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -112,9 +112,6 @@
     <string name="video">סרטון</string>
     <string name="audio">שמע</string>
     <string name="retry">ניסיון חוזר</string>
-    <string name="short_thousand">אלפ.</string>
-    <string name="short_million">מיל.</string>
-    <string name="short_billion">מיליארד</string>
     <string name="no_subscribers">אין מנויים</string>
     <plurals name="subscribers">
         <item quantity="one">מנוי אחד</item>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 37282a0da..7fff20f52 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -126,9 +126,6 @@
     <string name="video">वीडियो</string>
     <string name="audio">ऑडियो</string>
     <string name="retry">फिर से कोशिश करें</string>
-    <string name="short_thousand">हज़ार</string>
-    <string name="short_million">मिलियन</string>
-    <string name="short_billion">अरब</string>
     <string name="no_subscribers">कोई सब्सक्राइबर नहीं</string>
     <plurals name="subscribers">
         <item quantity="one">%s सब्सक्राइबर</item>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index c4cd60c0b..414fdf185 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -97,9 +97,6 @@
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Pokušaj ponovo</string>
-    <string name="short_thousand">tis.</string>
-    <string name="short_million">mil</string>
-    <string name="short_billion">mlrd.</string>
     <string name="start">Počni</string>
     <string name="pause">Pauziraj</string>
     <string name="delete">Izbriši</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 14c55b772..d2b84fd2f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -166,9 +166,6 @@
     <string name="no_streams_available_download">Nincs letölthető adatfolyam</string>
     <string name="empty_list_subtitle">Nincs itt semmi pár tücskön kívül</string>
     <string name="detail_drag_description">Húzza az átrendezéshez</string>
-    <string name="short_thousand">e</string>
-    <string name="short_million">m</string>
-    <string name="short_billion">M</string>
     <string name="no_subscribers">Nincs feliratkozó</string>
     <plurals name="subscribers">
         <item quantity="one">%s feliratkozó</item>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 19f867d7c..dba4b2daf 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -82,9 +82,6 @@
     <string name="recaptcha_request_toast">Meminta kode reCAPTCHA</string>
     <string name="black_theme_title">Hitam</string>
     <string name="all">Semua</string>
-    <string name="short_thousand">r</string>
-    <string name="short_million">J</string>
-    <string name="short_billion">T</string>
     <string name="open_in_popup_mode">Buka pada mode sembulan</string>
     <string name="msg_popup_permission">Izin ini dibutuhkan untuk
 \nmembuka di mode sembul</string>
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index e7ce69e41..5a97af1ac 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -97,7 +97,6 @@
     <string name="play_queue_audio_settings">Hljóðstillingar</string>
     <string name="start_here_on_background">Spila í bakgrunni</string>
     <string name="preferred_open_action_settings_summary">Þegar hlekkur er opnaður — %s</string>
-    <string name="short_thousand">þús.</string>
     <string name="detail_dislikes_img_view_description">Líkar ekki við</string>
     <string name="retry">Reyna aftur</string>
     <string name="description_tab_description">Lýsing</string>
@@ -217,7 +216,6 @@
     <string name="your_comment">Athugasemd þín (á ensku):</string>
     <string name="search_no_results">Engar niðurstöður</string>
     <string name="video">Myndskeið</string>
-    <string name="short_billion">ma.</string>
     <string name="no_views">Engin áhorf</string>
     <plurals name="views">
         <item quantity="one">%s áhorf</item>
@@ -352,7 +350,6 @@
     <string name="metadata_category">Flokkur</string>
     <string name="metadata_tags">Merki</string>
     <string name="donation_encouragement">NewPipe er þróað af sjálfboðaliðum sem eyða frítíma sínum í að færa þér bestu notendaupplifunina. Gefðu til baka til að hjálpa forriturum að gera NewPipe enn betri á meðan þeir njóta kaffibolla.</string>
-    <string name="short_million">millj.</string>
     <string name="show_description_summary">Slökktu á til að fela lýsingu og viðbótarupplýsingar myndskeiðs</string>
     <string name="error_occurred_detail">Villa kom upp: %1$s</string>
     <string name="title_activity_recaptcha">Þraut reCAPTCHA</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4c087f4de..383017ba9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -82,9 +82,6 @@
     <string name="title_activity_recaptcha">Risoluzione reCAPTCHA</string>
     <string name="black_theme_title">Nero</string>
     <string name="all">Tutto</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">Mrd</string>
     <string name="recaptcha_request_toast">È richiesta la risoluzione del reCAPTCHA</string>
     <string name="open_in_popup_mode">Apri in modalità popup</string>
     <string name="popup_playing_toast">Riproduzione in modalità popup</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 25c1d9fe9..9e8ec1c88 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -83,9 +83,6 @@
     <string name="recaptcha_request_toast">reCAPTCHA を要求しました</string>
     <string name="black_theme_title">ブラック</string>
     <string name="all">すべて</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <string name="open_in_popup_mode">ポップアップモードで開く</string>
     <string name="msg_popup_permission">ポップアップモードで開くには
 \n権限の許可が必要です</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 4fc00c0b3..45804fcfa 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -237,9 +237,6 @@
     <string name="video">ვიდეო</string>
     <string name="audio">აუდიო</string>
     <string name="retry">ხელახლა სცადეთ</string>
-    <string name="short_thousand">ათასი</string>
-    <string name="short_million">მლნ</string>
-    <string name="short_billion">ბლნ</string>
     <string name="drawer_header_description">სერვისის გადართვა, ამჟამად არჩეულია:</string>
     <string name="no_subscribers">გამოწერები არ არის</string>
     <plurals name="subscribers">
diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml
index 97476fc46..0ded7974c 100644
--- a/app/src/main/res/values-kab/strings.xml
+++ b/app/src/main/res/values-kab/strings.xml
@@ -82,7 +82,6 @@
     <string name="download_dialog_title">Sider</string>
     <string name="controls_popup_title">Asfaylu udhim</string>
     <string name="dismiss">Ttu</string>
-    <string name="short_million">A</string>
     <string name="import_title">Kter</string>
     <string name="ok">Ih</string>
     <string name="action_history">Amazray</string>
@@ -128,7 +127,6 @@
     <string name="rename">Snifel isem</string>
     <string name="download_failed">Asider ur yeddi ara</string>
     <string name="video">Tamwalit</string>
-    <string name="short_billion">o</string>
     <string name="controls_background_title">Aɣawas n deffir</string>
     <string name="title_activity_history">Amazray</string>
     <string name="paused">yesteɛfay</string>
diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml
index b5e5235d5..24bc5574e 100644
--- a/app/src/main/res/values-kmr/strings.xml
+++ b/app/src/main/res/values-kmr/strings.xml
@@ -49,9 +49,6 @@
     </plurals>
     <string name="no_subscribers">Ne abone</string>
     <string name="drawer_header_description">Karûbarê veguheztinê, niha hatî hilbijartin:</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">k</string>
     <string name="retry">Dîsa biceribîne</string>
     <string name="audio">Deng</string>
     <string name="video">Vîdyo</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index cfc328a20..016be8743 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -116,9 +116,6 @@
     <string name="info_labels">무엇:\\n요청:\\n콘텐츠 언어:\\n콘텐츠 국가:\\n앱 언어:\\n서비스:\\nGMT 시간:\\n패키지:\\n버전:\\nOS 버전:</string>
     <string name="search_no_results">결과 없음</string>
     <string name="empty_list_subtitle">구독할 항목을 추가하세요</string>
-    <string name="short_thousand">천</string>
-    <string name="short_million">백만</string>
-    <string name="short_billion">십억</string>
     <string name="no_subscribers">구독자 없음</string>
     <plurals name="subscribers">
         <item quantity="other">구독자 %s명</item>
diff --git a/app/src/main/res/values-ku/strings.xml b/app/src/main/res/values-ku/strings.xml
index 2f3934fff..3dc51fcc8 100644
--- a/app/src/main/res/values-ku/strings.xml
+++ b/app/src/main/res/values-ku/strings.xml
@@ -133,9 +133,6 @@
     <string name="video">ڤیدیۆ</string>
     <string name="audio">دەنگ</string>
     <string name="retry">هەوڵدانەوە</string>
-    <string name="short_thousand">هەزار</string>
-    <string name="short_million">ملیۆن</string>
-    <string name="short_billion">بلیۆن</string>
     <string name="no_subscribers">هیچ بەشداربوویەک نییە</string>
     <plurals name="subscribers">
         <item quantity="one">%s بەشداربوو</item>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index feb11a01c..3324b423c 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -139,9 +139,6 @@
     <string name="player_recoverable_failure">Atstatoma po grotuvo klaidos</string>
     <string name="search_no_results">Nėra rezultatų</string>
     <string name="empty_list_subtitle">Čia nieko nėra išskyrus svirplius</string>
-    <string name="short_thousand">Tūkst.</string>
-    <string name="short_million">Mln.</string>
-    <string name="short_billion">Mlrd.</string>
     <string name="no_subscribers">Nėra prenumeratorių</string>
     <string name="no_views">Nėra peržiūrų</string>
     <plurals name="views">
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 2d1c60256..13e163f72 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -136,9 +136,6 @@
     </plurals>
     <string name="no_subscribers">Nav abonamentu</string>
     <string name="drawer_header_description">Izvēlaties pakalpojumu, šobrīd izvēlēts:</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">k</string>
     <string name="retry">Atkārtot</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 1d3183b10..c131e1fd7 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -146,9 +146,6 @@
     <string name="video">Видео</string>
     <string name="audio">Звук</string>
     <string name="retry">Пробај повторно</string>
-    <string name="short_thousand">илјади</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">милијарди</string>
     <string name="no_subscribers">Нема зачленети</string>
     <plurals name="subscribers">
         <item quantity="one">%s зачленет</item>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 39ce5e57f..adba80891 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -183,9 +183,6 @@
     </plurals>
     <string name="no_subscribers">സബ്ക്രൈബേഴ്സ് ഇല്ല</string>
     <string name="drawer_header_description">സേവനം മാറ്റുക, ഇപ്പോൾ തിരഞ്ഞെടുത്തത്:</string>
-    <string name="short_billion">B</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
     <string name="retry">വീണ്ടും ശ്രമിക്കുക</string>
     <string name="audio">ഓഡിയോ</string>
     <string name="video">വീഡിയോ</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 304858d84..7a6b2eda4 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -138,11 +138,8 @@
     <string name="settings_category_debug_title">डेबग</string>
     <string name="settings_category_updates_title">अपडेट</string>
     <string name="duration_live">थेट</string>
-    <string name="short_billion">ब</string>
     <string name="playlists">प्लेलिस्ट</string>
-    <string name="short_million">म</string>
     <string name="file">फाईल</string>
-    <string name="short_thousand">के</string>
     <string name="tab_licenses">परवाना</string>
     <string name="checksum">चेकसम</string>
     <string name="action_history">इतिहास</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index bb0527655..e70e61a74 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -171,9 +171,6 @@
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Cuba semula</string>
-    <string name="short_thousand">K</string>
-    <string name="short_million">J</string>
-    <string name="short_billion">B</string>
     <string name="no_subscribers">Tiada pelanggan</string>
     <plurals name="subscribers">
         <item quantity="other">%s pelanggan</item>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c2311585a..027e6fe39 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -89,9 +89,6 @@
     <string name="popup_playing_toast">Spiller av i oppsprettsmodus</string>
     <string name="all">Alle</string>
     <string name="disabled">Avskrudd</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">Mrd.</string>
     <string name="msg_popup_permission">Denne tilgangen trengs for
 \nåpning i oppsprettsmodus</string>
     <string name="recaptcha_request_toast">reCAPTCHA-oppgave forespurt</string>
diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml
index dd570b82e..b40145aa6 100644
--- a/app/src/main/res/values-ne/strings.xml
+++ b/app/src/main/res/values-ne/strings.xml
@@ -176,9 +176,6 @@
     <string name="video">भिडियो</string>
     <string name="audio">अडियो</string>
     <string name="retry">पुन: प्रयास</string>
-    <string name="short_thousand">हजार</string>
-    <string name="short_million">करोड</string>
-    <string name="short_billion">अर्ब</string>
     <string name="no_subscribers">कुनै सदस्यहरू छैनन्</string>
     <plurals name="subscribers">
         <item quantity="one">%s सदस्य</item>
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index a78b96585..3b3277307 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -147,9 +147,6 @@
     <string name="video">Video</string>
     <string name="audio">Geluid</string>
     <string name="retry">Opnieuw proberen</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">mld.</string>
     <string name="no_subscribers">Geen abonnees</string>
     <plurals name="subscribers">
         <item quantity="one">%s abonnee</item>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 0c16a5c9b..75822036b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -84,9 +84,6 @@
     <string name="recaptcha_request_toast">reCAPTCHA-uitdaging gevraagd</string>
     <string name="open_in_popup_mode">Openen in pop-upmodus</string>
     <string name="all">Alles</string>
-    <string name="short_thousand">dznd.</string>
-    <string name="short_million">mln.</string>
-    <string name="short_billion">mld.</string>
     <string name="msg_popup_permission">Deze machtiging is vereist om te
 \nopenen in pop-upmodus</string>
     <string name="popup_playing_toast">Speelt af in pop-upmodus</string>
diff --git a/app/src/main/res/values-nqo/strings.xml b/app/src/main/res/values-nqo/strings.xml
index 016ce1ba2..739193302 100644
--- a/app/src/main/res/values-nqo/strings.xml
+++ b/app/src/main/res/values-nqo/strings.xml
@@ -178,9 +178,6 @@
     <string name="search_no_results">ߞߐߝߟߌ߫ ߕߍ߫ ߦߋ߲߬</string>
     <string name="audio">ߡߍ߲ߕߊ</string>
     <string name="retry">ߞߵߊ߬ ߡߊߛߊ߬ߦߌ߬</string>
-    <string name="short_thousand">ߥߊ߯</string>
-    <string name="short_million">ߞߋ߲߬</string>
-    <string name="short_billion">ߥߟߡ</string>
     <string name="auto_queue_title">ߞߊ߬ ߥߏ߬ߦߏ߫ ߣߊ߬ߕߊ ߝߙߊ߬ ߕߎ߲߰ߠߌ߲ ߠߊ߫ ߞߍ߲ߖߘߍߡߊߓߟߏ ߡߊ߬</string>
     <string name="auto_queue_summary">ߞߊ߬ ߕߎ߲߰ߠߌ߲ ߘߐߞߊ߬ߙߊ߲ ߓߟߏߕߎ߰ (ߞߊߣߊ߬ ߡߊߛߊ߬ߦߌ߬) ߥߏ߬ߦߏ߫ ߢߐ߲߰ߘߐ ߟߎ߫ ߟߊ߫</string>
     <string name="left_gesture_control_summary">ߕߏߟߏ߲ߟߊ߲߫ ߥߊ߲߬ߥߊ߲ ߣߎߡߊ߲߫ ߕߟߊ ߖߍ߰ߙߍ ߛߎߥߊ߲ߘߌ߫</string>
diff --git a/app/src/main/res/values-or/strings.xml b/app/src/main/res/values-or/strings.xml
index cf9ebdb97..519c8aa22 100644
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@@ -438,7 +438,6 @@
     <string name="detail_dislikes_img_view_description">ନାପସନ୍ଦ</string>
     <string name="comments_tab_description">ମନ୍ତବ୍ୟ ଗୁଡିକ</string>
     <string name="description_tab_description">ବର୍ଣ୍ଣନା</string>
-    <string name="short_million">ନିୟୁତ</string>
     <string name="recaptcha_solve">ସମାଧାନ</string>
     <string name="playback_speed_control">ପ୍ଲେବେକ୍ ସ୍ପିଡ୍ ନିୟନ୍ତ୍ରଣ</string>
     <string name="playback_tempo">ଟେମ୍ପୋ</string>
@@ -528,7 +527,6 @@
     <string name="related_items_tab_description">ସମ୍ବନ୍ଧୀୟ ଆଇଟମ୍ ଗୁଡ଼ିକ</string>
     <string name="detail_drag_description">ପୁନଃ ସଯାଇବାକୁ ଡ୍ରାଗ୍ କରନ୍ତୁ</string>
     <string name="pause">ବିରାମ</string>
-    <string name="short_billion">ଵୃନ୍ଦ</string>
     <string name="no_subscribers">କୌଣସି ଗ୍ରାହକ ନାହାଁନ୍ତି</string>
     <string name="create">ସୃଷ୍ଟି କରନ୍ତୁ</string>
     <string name="msg_running_detail">ବିବରଣୀ ପାଇଁ ଟ୍ୟାପ୍ କରନ୍ତୁ</string>
@@ -609,7 +607,6 @@
     <string name="select_quality_external_players">ବହିଃ-ଚାଳକ ପାଇଁ ଗୁଣବତ୍ତା ଚୟନ କରନ୍ତୁ</string>
     <string name="detail_pinned_comment_view_description">ପିନ୍ ହୋଇଥିବା ମନ୍ତବ୍ୟ</string>
     <string name="open_website_license">ୱେବସାଇଟ୍ ଖୋଲନ୍ତୁ</string>
-    <string name="short_thousand">ହଜାର</string>
     <string name="preferred_player_fetcher_notification_title">ସୂଚନା ପାଇବା…</string>
     <plurals name="subscribers">
         <item quantity="one">%s ଗ୍ରାହକ</item>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index ad14e7d05..a1d144cb2 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -153,9 +153,6 @@
     <string name="video">ਵੀਡੀਓ</string>
     <string name="audio">ਆਡੀਓ</string>
     <string name="retry">ਦੋਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ</string>
-    <string name="short_thousand">ਹਜ਼ਾਰ</string>
-    <string name="short_million">ਮਿਲੀਅਨ</string>
-    <string name="short_billion">ਅਰਬ</string>
     <string name="no_subscribers">ਕੋਈ ਸਬਸਕ੍ਰਾਈਬਰ ਨਹੀਂ</string>
     <plurals name="subscribers">
         <item quantity="one">%s ਸਬਸਕ੍ਰਾਈਬਰ</item>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index dc3f88cec..f56ee344d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -96,10 +96,7 @@
     <string name="all">Wszystkie</string>
     <string name="disabled">Wyłączone</string>
     <string name="clear">Wyczyść</string>
-    <string name="short_thousand">tys.</string>
-    <string name="short_million">mln</string>
-    <string name="short_billion">mld</string>
-    <string name="msg_popup_permission">To pozwolenie jest wymagane, aby 
+    <string name="msg_popup_permission">To pozwolenie jest wymagane, aby
 \notworzyć w trybie okienkowym</string>
     <string name="open_in_popup_mode">Otwórz w trybie okienkowym</string>
     <string name="controls_popup_title">Tryb okienkowy</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d13cbcfe3..3c7bc9498 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -90,9 +90,6 @@
     <string name="popup_playing_toast">Reproduzindo em modo Popup</string>
     <string name="all">Todos</string>
     <string name="disabled">Desativado</string>
-    <string name="short_thousand">mil</string>
-    <string name="short_million">mi</string>
-    <string name="short_billion">bi</string>
     <string name="msg_popup_permission">Essa permissão é necessária
 \npara abrir em modo Popup</string>
     <string name="clear">Limpar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 6ceec006e..0d78bd3db 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -229,7 +229,6 @@
     <string name="ok">OK</string>
     <string name="subscription_update_failed">Não foi possível atualizar a subscrição</string>
     <string name="remove_watched_popup_yes_and_partially_watched_videos">Sim e também os vídeos parcialmente vistos</string>
-    <string name="short_million">M</string>
     <string name="no_playlist_bookmarked_yet">Ainda não há listas de reprodução favoritas</string>
     <plurals name="listening">
         <item quantity="one">%s ouvinte</item>
@@ -423,8 +422,6 @@
     <string name="import_complete_toast">Importado</string>
     <string name="auto">Automático</string>
     <string name="import_data_summary">Substitui o seu histórico, subscrições, listas de reprodução e (opcionalmente) definições</string>
-    <string name="short_thousand">k</string>
-    <string name="short_billion">MM</string>
     <string name="unbookmark_playlist">Remover marcador</string>
     <string name="pause_downloads_on_mobile_desc">Útil ao trocar para dados móveis, mas algumas transferências não podem ser suspensas</string>
     <string name="hold_to_append">Toque longo para colocar na fila</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 13a536895..b44cd7a21 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -82,9 +82,6 @@
     <string name="open_in_popup_mode">Abrir no modo popup</string>
     <string name="black_theme_title">Preto</string>
     <string name="all">Tudo</string>
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">MM</string>
     <string name="msg_popup_permission">Esta permissão é necessária
 \npara o modo popup</string>
     <string name="title_activity_recaptcha">Desafio reCAPTCHA</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index eb4e75c28..628e75f16 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -92,9 +92,6 @@
     <string name="disabled">Dezactivat</string>
     <string name="app_ui_crash">Aplicația/UI s-a oprit</string>
     <string name="info_labels">Ce:\\nSolicitare:\\nLimba conținutului:\\nȚara conținutului:\\nLimba aplicației:\\nServiciu:\\nOra GMT:\\nPachet:\\nVersiune:\\nVersiune SO:</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">mil.</string>
-    <string name="short_billion">mld.</string>
     <string name="use_external_video_player_summary">Elimină sunetul audio la anumite rezoluții</string>
     <string name="controls_background_title">Fundal</string>
     <string name="controls_popup_title">Pop-up</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index a512b6fa8..d32375a97 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -94,9 +94,6 @@
     <string name="show_search_suggestions_summary">Выберите отображаемые предложения поиска</string>
     <string name="disabled">Отключено</string>
     <string name="use_external_video_player_summary">Убирает звук в некоторых разрешениях</string>
-    <string name="short_million">млн</string>
-    <string name="short_billion">млрд</string>
-    <string name="short_thousand">тыс.</string>
     <string name="default_popup_resolution_title">Разрешение всплывающего окна</string>
     <string name="popup_remember_size_pos_summary">Помнить последние размер и позицию всплывающего окна</string>
     <string name="show_search_suggestions_title">Предложения поиска</string>
diff --git a/app/src/main/res/values-ryu/strings.xml b/app/src/main/res/values-ryu/strings.xml
index 1bc89420c..9041fc462 100644
--- a/app/src/main/res/values-ryu/strings.xml
+++ b/app/src/main/res/values-ryu/strings.xml
@@ -83,9 +83,6 @@
     <string name="recaptcha_request_toast">reCAPTCHAようきゅうさびたん</string>
     <string name="black_theme_title">ブラック</string>
     <string name="all">まじり</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <string name="open_in_popup_mode">ポップアップモードっしふぃらちゅん</string>
     <string name="msg_popup_permission">ポップアップモードっしふぃらちゅんがー
 \nきんぎんぬきょかがふぃちようでぃす</string>
diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml
index a3ed7c405..6e6615a84 100644
--- a/app/src/main/res/values-sat/strings.xml
+++ b/app/src/main/res/values-sat/strings.xml
@@ -216,8 +216,6 @@
     <string name="search_no_results">ᱡᱟᱦᱟᱱ ᱡᱤᱱᱤᱥ</string>
     <string name="empty_list_subtitle">ᱱᱚᱣᱟ ᱨᱮᱫᱚ ᱡᱟᱹᱥᱛᱤ ᱡᱟᱹᱥᱛᱤ ᱠᱨᱤᱠᱮᱴ ᱢᱮᱱᱟᱜᱼᱟ ᱾</string>
     <string name="video">ᱵᱷᱤᱰᱤᱭᱳ</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
     <string name="subscribers_count_not_available">ᱥᱮᱞᱮᱫᱤᱭᱟᱹ ᱠᱚᱣᱟᱜ ᱞᱮᱠᱷᱟ ᱵᱟᱭ ᱦᱟᱹᱴᱤᱧ ᱟᱠᱟᱱᱟ</string>
     <string name="no_views">ᱵᱟᱱᱩᱜ ᱧᱮᱞ</string>
     <string name="no_videos">ᱵᱷᱤᱰᱤᱭᱳ ᱵᱟᱹᱱᱩᱜᱼᱟ</string>
@@ -478,7 +476,6 @@
     <string name="detail_drag_description">ᱱᱟᱣᱟ ᱟᱹᱨᱡᱤ ᱞᱟᱹᱜᱤᱫ ᱟᱹᱪᱩᱨ ᱢᱮ</string>
     <string name="audio">ᱚᱰᱤᱭᱳ</string>
     <string name="retry">ᱟᱨᱦᱚᱸ ᱯᱟᱲᱦᱟᱣ ᱢᱮ</string>
-    <string name="short_billion">ᱵᱤ</string>
     <string name="drawer_header_description">ᱱᱤᱛᱚᱜ ᱵᱟᱪᱷᱟᱣ ᱟᱠᱟᱱ ᱴᱳᱜᱞ ᱥᱮᱵᱟ:</string>
     <string name="no_subscribers">ᱚᱵᱷᱤᱱᱮᱛᱟᱨ ᱵᱟᱹᱱᱩᱜᱼᱟ</string>
     <string name="no_one_watching">ᱚᱠᱚᱭ ᱦᱚᱸ ᱵᱟᱝ ᱧᱮᱞᱚᱜ ᱠᱟᱱᱟ</string>
diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml
index 0c42f1ef0..cb51c3f4d 100644
--- a/app/src/main/res/values-sc/strings.xml
+++ b/app/src/main/res/values-sc/strings.xml
@@ -165,9 +165,6 @@
     </plurals>
     <string name="no_subscribers">Perunu iscritu</string>
     <string name="drawer_header_description">Allughe/istuda su servìtziu. Ischertadu como:</string>
-    <string name="short_billion">Mrd</string>
-    <string name="short_million">Mlln</string>
-    <string name="short_thousand">mìg</string>
     <string name="retry">Torra a proare</string>
     <string name="audio">Àudio</string>
     <string name="video">Vìdeu</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ad2dacfd6..d4ac57e1e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -82,9 +82,6 @@
     <string name="title_activity_recaptcha">Výzva reCAPTCHA</string>
     <string name="black_theme_title">Čierna</string>
     <string name="all">Všetko</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
     <string name="recaptcha_request_toast">Požiadavka reCAPTCHA</string>
     <string name="open_in_popup_mode">Otvoriť vo vyskakovacom okne</string>
     <string name="msg_popup_permission">Tieto práva sú potrebné pre
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index cd41b43ba..3705554bb 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -83,9 +83,6 @@
     <string name="info_labels">Predmet:\\nZahteva:\\nJezik vsebine:\\nDržava vsebine:\\nJezik aplikacije:\\nStoritev:\\nČas v GMT:\\nPaket:\\nRazličica:\\nRazličica OS:</string>
     <string name="black_theme_title">Črna</string>
     <string name="all">Vse</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">mio</string>
-    <string name="short_billion">mrd</string>
     <string name="open_in_popup_mode">Odpri v pojavnem načinu</string>
     <string name="msg_popup_permission">To dovoljenje je potrebno za odpiranje 
 \nv pojavnem načinu</string>
diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml
index 6b4de7353..772e03b41 100644
--- a/app/src/main/res/values-so/strings.xml
+++ b/app/src/main/res/values-so/strings.xml
@@ -242,9 +242,6 @@
     </plurals>
     <string name="no_subscribers">Dad rukuntay ma jiraan</string>
     <string name="drawer_header_description">Furo adeega, hada waxaa dooran:</string>
-    <string name="short_billion">B</string>
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
     <string name="retry">ku celi</string>
     <string name="audio">Dhagaysi</string>
     <string name="video">Muuqaal</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 162ba5ada..9aac66de7 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -295,9 +295,6 @@
     </plurals>
     <string name="no_subscribers">Nuk ka abonues</string>
     <string name="drawer_header_description">Aktivizoje shërbimin, momentalisht e zgjedhur:</string>
-    <string name="short_billion">B</string>
-    <string name="short_million">M</string>
-    <string name="short_thousand">k</string>
     <string name="retry">Riprovo</string>
     <string name="audio">Audio</string>
     <string name="video">Video</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 99b9e971f..3c82e5612 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -83,9 +83,6 @@
     <string name="recaptcha_request_toast">Решите „reCAPTCHA“ задатак</string>
     <string name="black_theme_title">Црна</string>
     <string name="all">Све</string>
-    <string name="short_thousand">хиљ.</string>
-    <string name="short_million">мил.</string>
-    <string name="short_billion">млрд.</string>
     <string name="open_in_popup_mode">Отвори у искачућем облику</string>
     <string name="msg_popup_permission">Ова дозвола је потребна за
 \nотварање у искачућем режиму</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 3beab4181..8aab4a67f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -112,9 +112,6 @@
     <string name="video">Video</string>
     <string name="audio">Ljud</string>
     <string name="retry">Försök igen</string>
-    <string name="short_thousand">t</string>
-    <string name="short_million">mn</string>
-    <string name="short_billion">md</string>
     <string name="no_subscribers">Inga prenumeranter</string>
     <plurals name="subscribers">
         <item quantity="one">%s prenumerant</item>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 906249376..7221ab74d 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -245,7 +245,6 @@
     <string name="peertube_instance_url_summary">உம் அபிமான பியர்டியூப் நிகழ்வுகளைத் தேர்ந்தெடு</string>
     <string name="content_language_title">உள்ளடக்க இயல்பிருப்பு மொழி</string>
     <string name="resume_on_audio_focus_gain_title">இயக்குதலைத் மறுதொடர்</string>
-    <string name="short_billion">நி</string>
     <string name="peertube_instance_add_exists">நிகழ்வு ஏற்கனவே உள்ளது</string>
     <string name="youtube_restricted_mode_enabled_title">யூடியூபின் \"கட்டுப்பாடு பயன்முறை\"ஐ இயக்கு</string>
     <string name="songs">பாடல்கள்</string>
@@ -260,8 +259,6 @@
     <string name="info_labels">என்ன:\\nகோரிக்கை:\\nஉள்ளடக்க மொழி:\\nஉள்ளடக்க நாடு:\\nசெயலி மொழி:\\nசேவை:\\nGMT நேரம்:\\nசிப்பம்:\\nபதிப்பு:\\nOS பதிப்பு:</string>
     <string name="detail_thumbnail_view_description">காணொளியை இயக்கு, காலவளவு:</string>
     <string name="comments_tab_description">கருத்தளிப்புகள்</string>
-    <string name="short_thousand">ஆ</string>
-    <string name="short_million">ப.ல</string>
     <string name="crash_the_player">இயக்கியைச் சிதை</string>
     <string name="enable_playback_state_lists_summary">பட்டியல்களில் இயக்கக குறியட நிலைகாட்டிகளைக் காட்டு</string>
     <string name="start_main_player_fullscreen_summary">துணையியக்கியில் காணொளிகளை துவக்காதே, ஆனால் தானாக சுழற்றல் பூட்டப்பட்டிருந்தால் நேரடியாக முழுதிரைக்குத் திரும்பு. முழுதிரையை வெளியேறி நீங்கள் இன்னும் துணையியக்கியை அணுகலாம்</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index c537495ba..b95e04c0c 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -77,9 +77,6 @@
     <string name="video">వీడియో</string>
     <string name="audio">ఆడియో</string>
     <string name="retry">మళ్ళీ ప్రయత్నించు</string>
-    <string name="short_thousand">కి</string>
-    <string name="short_million">ఎం</string>
-    <string name="short_billion">బిలియన్</string>
     <string name="no_subscribers">సభ్యులు లేరు</string>
     <plurals name="subscribers">
         <item quantity="one">%s సభ్యుడు</item>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index bcbbca0a4..c2cb4669e 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -165,9 +165,6 @@
     <string name="video">วิดีโอ</string>
     <string name="audio">เสียง</string>
     <string name="retry">ลองอีกครั้ง</string>
-    <string name="short_thousand">พัน</string>
-    <string name="short_million">ล้าน</string>
-    <string name="short_billion">พันล้าน</string>
     <string name="no_subscribers">ไม่มีสมาชิกที่สมัครรับ</string>
     <plurals name="subscribers">
         <item quantity="other">%s บอกรับ</item>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a26016f1a..79bbea486 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -88,9 +88,6 @@
     <string name="disabled">Devre dışı</string>
     <string name="your_comment">Yorumunuz (İngilizce):</string>
     <string name="error_details_headline">Ayrıntılar:</string>
-    <string name="short_thousand">b</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">M</string>
     <string name="msg_popup_permission">Bu izin, açılır pencere kipinde
 \naçmak için gereklidir</string>
     <string name="title_activity_recaptcha">reCAPTCHA formu</string>
diff --git a/app/src/main/res/values-tzm/strings.xml b/app/src/main/res/values-tzm/strings.xml
index 31d89bdd5..b6539d568 100644
--- a/app/src/main/res/values-tzm/strings.xml
+++ b/app/src/main/res/values-tzm/strings.xml
@@ -113,7 +113,6 @@
     <string name="delete">Kkes</string>
     <string name="create">Senulfu</string>
     <string name="start">Senti</string>
-    <string name="short_thousand">ifḍ</string>
     <string name="retry">Als-arem</string>
     <string name="audio">Imesli</string>
     <string name="video">Avidyu</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 32e03bea0..c47d2f1fd 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -65,9 +65,6 @@
     <string name="video">Відео</string>
     <string name="audio">Аудіо</string>
     <string name="retry">Повторити спробу</string>
-    <string name="short_thousand">тис</string>
-    <string name="short_million">млн</string>
-    <string name="short_billion">млрд</string>
     <string name="start">Почати</string>
     <string name="pause">Пауза</string>
     <string name="delete">Видалити</string>
diff --git a/app/src/main/res/values-und/strings.xml b/app/src/main/res/values-und/strings.xml
index 94e4f9dd6..0bd3bf442 100644
--- a/app/src/main/res/values-und/strings.xml
+++ b/app/src/main/res/values-und/strings.xml
@@ -70,7 +70,6 @@
     <string name="video">ویڈیو</string>
     <string name="audio">آڈیو</string>
     <string name="retry">فیر کرو</string>
-    <string name="short_thousand">ہزار</string>
     <string name="create">بݨاؤ</string>
     <string name="tab_about">بارے</string>
     <string name="tab_licenses">لائیسنس</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 1a434ab63..bb95e2811 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -146,9 +146,6 @@
     <string name="video">ویڈیو</string>
     <string name="audio">آڈیو</string>
     <string name="retry">دوبارہ کوشش کریں</string>
-    <string name="short_thousand">ہزار</string>
-    <string name="short_million">دہ لاکھ</string>
-    <string name="short_billion">ارب</string>
     <string name="no_subscribers">کوئی صارفین نہیں</string>
     <plurals name="subscribers">
         <item quantity="one">%s صارف</item>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index e1073e7af..e8f4ec3f9 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -82,9 +82,6 @@
     <string name="video">Video</string>
     <string name="audio">Âm thanh</string>
     <string name="retry">Thử lại</string>
-    <string name="short_thousand">nghìn</string>
-    <string name="short_million">triệu</string>
-    <string name="short_billion">tỉ</string>
     <string name="start">Bắt đầu</string>
     <string name="pause">Dừng</string>
     <string name="delete">Xóa</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3c9c79457..9c6c8a9b9 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -71,8 +71,6 @@
     <plurals name="views">
         <item quantity="other">%s 次观看</item>
     </plurals>
-    <string name="short_thousand">千</string>
-    <string name="short_million">百万</string>
     <string name="start">开始</string>
     <string name="pause">暂停</string>
     <string name="delete">删除</string>
@@ -153,7 +151,6 @@
     <string name="error_details_headline">详细信息：</string>
     <string name="detail_thumbnail_view_description">播放视频，时长：</string>
     <string name="detail_uploader_thumbnail_view_description">视频上传者的头像缩略图</string>
-    <string name="short_billion">十亿</string>
     <string name="msg_running">NewPipe 正在下载</string>
     <string name="no_available_dir">请稍后在设置中设定下载目录</string>
     <string name="msg_popup_permission">使用悬浮窗模式
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 6b5529992..1f258c1db 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -87,8 +87,6 @@
     <string name="all">全部嘢</string>
     <string name="app_ui_crash">App/界面閃退</string>
     <string name="info_labels">經過：\\n請求：\\n內容語言：\\n內容國家：\\nApp 語言：\\n服務：\\nGMT 時間：\\n封裝：\\n版本：\\nOS 版本：</string>
-    <string name="short_thousand">千</string>
-    <string name="short_million">百萬</string>
     <string name="title_activity_recaptcha">reCAPTCHA 考驗</string>
     <string name="msg_popup_permission">以浮面模式開啟
 \n有呢個權限至得</string>
@@ -103,7 +101,6 @@
     <string name="disabled">不適用</string>
     <string name="clear">抹走</string>
     <string name="best_resolution">最佳解像度</string>
-    <string name="short_billion">十億</string>
     <string name="title_activity_about">關於 NewPipe</string>
     <string name="title_licenses">第三方版權協議</string>
     <string name="copyright" formatted="true">© %1$s %2$s 版權所有，根據 %3$s 嘅條款授權</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index b9ca2d3ce..be46b83a1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -82,9 +82,6 @@
     <string name="video">影片</string>
     <string name="audio">音訊</string>
     <string name="retry">重試</string>
-    <string name="short_thousand">千</string>
-    <string name="short_million">百萬</string>
-    <string name="short_billion">十億</string>
     <string name="start">開始</string>
     <string name="pause">暫停</string>
     <string name="delete">刪除</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ab2fc7a5..ff23f1c2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -287,9 +287,9 @@
     <string name="video">Video</string>
     <string name="audio">Audio</string>
     <string name="retry">Retry</string>
-    <string name="short_thousand">k</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
+    <string name="short_thousand">%sK</string>
+    <string name="short_million">%sM</string>
+    <string name="short_billion">%sB</string>
     <string name="drawer_header_description">Toggle service, currently selected:</string>
     <!--Zero don't get selected (in some languages) as it is not a "special case" for android-->
     <string name="no_subscribers">No subscribers</string>

From 9f11db8e06385a726105bc63032320e80954a2fe Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Mon, 28 Jul 2025 09:02:52 +0530
Subject: [PATCH 2/2] Improve scale display

---
 .../org/schabi/newpipe/util/Localization.java    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java
index d47cb918e..da4edeca6 100644
--- a/app/src/main/java/org/schabi/newpipe/util/Localization.java
+++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java
@@ -191,14 +191,20 @@ public final class Localization {
 
         final double value = (double) count;
         if (count >= 1000000000) {
+            final double shortenedValue = value / 1000000000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
             return context.getString(R.string.short_billion,
-                    localizeNumber(round(value / 1000000000)));
+                    localizeNumber(round(shortenedValue, scale)));
         } else if (count >= 1000000) {
+            final double shortenedValue = value / 1000000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
             return context.getString(R.string.short_million,
-                    localizeNumber(round(value / 1000000)));
+                    localizeNumber(round(shortenedValue, scale)));
         } else if (count >= 1000) {
+            final double shortenedValue = value / 1000;
+            final int scale = shortenedValue >= 100 ? 0 : 1;
             return context.getString(R.string.short_thousand,
-                    localizeNumber(round(value / 1000, 0)));
+                    localizeNumber(round(shortenedValue, scale)));
         } else {
             return localizeNumber(value);
         }
@@ -416,10 +422,6 @@ public final class Localization {
         }
     }
 
-    private static double round(final double value) {
-        return round(value, 1);
-    }
-
     private static double round(final double value, final int scale) {
         return new BigDecimal(value).setScale(scale, RoundingMode.HALF_UP).doubleValue();
     }