From 59d513cfac8a56345e6d859439cadba2edd90f70 Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Mon, 25 Jan 2021 11:52:27 +0100
Subject: [PATCH 1/2] Add plurals to strings

---
 .../postCreation/PostCreationActivity.kt      |  2 +-
 .../h/pixeldroid/posts/StatusViewHolder.kt    |  6 ++-
 .../h/pixeldroid/profile/ProfileActivity.kt   | 21 +++++++---
 .../h/pixeldroid/utils/api/objects/Status.kt  | 12 +++++-
 app/src/main/res/values-ar/strings.xml        | 10 +----
 app/src/main/res/values-ca/strings.xml        |  9 ----
 app/src/main/res/values-de/strings.xml        | 10 -----
 app/src/main/res/values-es/strings.xml        |  9 ----
 app/src/main/res/values-eu/strings.xml        |  9 ----
 app/src/main/res/values-fa/strings.xml        | 10 -----
 app/src/main/res/values-fr/strings.xml        | 10 -----
 app/src/main/res/values-gl/strings.xml        |  9 ----
 app/src/main/res/values-it/strings.xml        | 10 -----
 app/src/main/res/values-ja/strings.xml        |  9 ----
 app/src/main/res/values-nl/strings.xml        |  9 ----
 app/src/main/res/values-pl/strings.xml        |  3 --
 app/src/main/res/values-ru/strings.xml        |  9 ----
 app/src/main/res/values-sv/strings.xml        |  9 ----
 app/src/main/res/values-zh-rCN/strings.xml    | 10 -----
 app/src/main/res/values/strings.xml           | 41 +++++++++++++++----
 20 files changed, 65 insertions(+), 152 deletions(-)

diff --git a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt
index 7319bb58..e4c414b7 100644
--- a/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/postCreation/PostCreationActivity.kt
@@ -229,7 +229,7 @@ class PostCreationActivity : BaseActivity() {
             val content = editText?.length() ?: 0
             if (content > counterMaxLength) {
                 // error, too many characters
-                error = getString(R.string.description_max_characters).format(counterMaxLength)
+                error = resources.getQuantityString(R.plurals.description_max_characters, counterMaxLength, counterMaxLength)
                 return false
             }
         }
diff --git a/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt b/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
index bca3cd68..51f897b3 100644
--- a/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
+++ b/app/src/main/java/com/h/pixeldroid/posts/StatusViewHolder.kt
@@ -522,8 +522,10 @@ class StatusViewHolder(val binding: PostFragmentBinding) : RecyclerView.ViewHold
             binding.viewComments.text =  binding.root.context.getString(R.string.NoCommentsToShow)
         } else {
             binding.viewComments.apply {
-                text = binding.root.context.getString(R.string.number_comments)
-                    .format(status?.replies_count)
+                text = resources.getQuantityString(R.plurals.number_comments,
+                                                    status?.replies_count ?: 0,
+                                                    status?.replies_count ?: 0
+                )
                 setOnClickListener {
                     visibility = View.GONE
 
diff --git a/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt b/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
index 505e3831..753cc467 100644
--- a/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/profile/ProfileActivity.kt
@@ -155,14 +155,23 @@ class ProfileActivity : BaseActivity() {
             supportActionBar?.subtitle = "@${account.acct}"
         }
 
-        binding.nbPostsTextView.text = applicationContext.getString(R.string.nb_posts)
-            .format(account.statuses_count.toString())
+        binding.nbPostsTextView.text = resources.getQuantityString(
+                R.plurals.nb_posts,
+                account.statuses_count ?: 0,
+                account.statuses_count ?: 0
+        )
 
-        binding.nbFollowersTextView.text = applicationContext.getString(R.string.nb_followers)
-            .format(account.followers_count.toString())
+        binding.nbFollowersTextView.text = resources.getQuantityString(
+                R.plurals.nb_followers,
+                account.followers_count ?: 0,
+                account.followers_count ?: 0
+        )
 
-        binding.nbFollowingTextView.text = applicationContext.getString(R.string.nb_following)
-            .format(account.following_count.toString())
+        binding.nbFollowingTextView.text = resources.getQuantityString(
+                R.plurals.nb_following,
+                account.following_count ?: 0,
+                account.following_count ?: 0
+        )
     }
 
     /**
diff --git a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt b/app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt
index 23b25f95..08211cce 100644
--- a/app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt
+++ b/app/src/main/java/com/h/pixeldroid/utils/api/objects/Status.kt
@@ -74,11 +74,19 @@ open class Status(
 
 
     fun getNLikes(context: Context) : CharSequence {
-        return context.getString(R.string.likes).format(favourites_count.toString())
+        return context.resources.getQuantityString(
+                R.plurals.likes,
+                favourites_count ?: 0,
+                favourites_count ?: 0
+        )
     }
 
     fun getNShares(context: Context) : CharSequence {
-        return context.getString(R.string.shares).format(reblogs_count.toString())
+        return context.resources.getQuantityString(
+                R.plurals.shares,
+                reblogs_count ?: 0,
+                reblogs_count ?: 0
+        )
     }
 
     fun getStatusDomain(domain: String) : String {
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 9528c3d0..1731932d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -47,19 +47,13 @@
     <string name="light_theme">فاتح</string>
     <string name="save_image_success">تم حفظ الصورة بنجاح</string>
     <string name="default_system">افتراضي (يتبع النظام)</string>
-    <string name="description_max_characters">يجب أن يحتوي الوصف على %1$s حرفًا على الأكثر.</string>
     <string name="upload_post_success">تم تحميل المنشور بنجاح</string>
     <string name="upload_post_failed">فشل في تحميل المنشور</string>
     <string name="upload_picture_failed">خطأ في تحميل الصورة!</string>
     <string name="loading_toast">حدث خلل اثناء التحميل</string>
     <string name="normal_filter">عادي</string>
     <string name="upload_post_error">فشل في تحميل المنشور</string>
-    <string name="nb_following">%1$s
-\nيتابعون</string>
-    <string name="nb_followers">%1$s
-\nمتابع</string>
-    <string name="nb_posts">%1$s
-\nمشاركة</string>
+
     <string name="comment">تعليق</string>
     <string name="comment_posted">التعليق: تم نشر%1$s!</string>
     <string name="comment_error">خطأ في التعليق!</string>
@@ -68,8 +62,6 @@
     <string name="write_permission_download_pic">تحتاج إلى منح إذن الكتابة لتنزيل الصور!</string>
     <string name="empty_comment">لا يجب ان يكون التعليق فارغًا!</string>
     <string name="posted_on">نُشِر في %1$s</string>
-    <string name="shares">%1$s مشاركات</string>
-    <string name="likes">%1$s إعجاب</string>
     <string name="no_description">مِن دون وصف</string>
     <string name="feed_failed">تعذّر جلب التدفق</string>
     <string name="retry">حاول مجدّدًا</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 88c18ada..44c84ba6 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -41,7 +41,6 @@
     <string name="add_account_description">Afegeix un altre compte</string>
     <string name="add_account_name">Afegeix un compte</string>
     <string name="instance_error">No s\'ha pogut obtenir informació sobre la instància</string>
-    <string name="shares">%1$s Accions</string>
     <string name="hashtags">HASHTAGS</string>
     <string name="accounts">COMPTES</string>
     <string name="posts">PUBLICACIONS</string>
@@ -61,12 +60,6 @@
     <string name="follow_error">No s\'ha pogut seguir</string>
     <string name="follow_button_failed">No s\'ha pogut mostrar el botó de seguir</string>
     <string name="follow_status_failed">No s\'ha pogut obtenir l\'estat de seguiment</string>
-    <string name="nb_following">%1$s 
-\nSeguits/des</string>
-    <string name="nb_followers">%1$s 
-\nSeguidors/es</string>
-    <string name="nb_posts">%1$s
-\nPublicacions</string>
     <string name="comment">Comentari</string>
     <string name="comment_posted">Comentari: %1$s publicat!</string>
     <string name="comment_error">Error de comentari!</string>
@@ -75,7 +68,6 @@
     <string name="write_permission_download_pic">Has de concedir permís d’escriptura per baixar imatges!</string>
     <string name="empty_comment">El comentari no ha de estar buit!</string>
     <string name="posted_on">Publica\'t el %1$s</string>
-    <string name="likes">%1$s M\'agrades</string>
     <string name="no_description">Sense descripció</string>
     <string name="feed_failed">No s\'ha pogut obtenir el fil</string>
     <string name="loading_toast">Alguna cosa no ha funcionat correctament mentre es carregava</string>
@@ -86,7 +78,6 @@
     <string name="request_format_error">Error d\'enviament: format de sol·licitud dolent</string>
     <string name="picture_format_error">Error d\'enviament: format d\'imatge erroni.</string>
     <string name="upload_picture_failed">Error d\'enviament d\'imatges!</string>
-    <string name="description_max_characters">La descripció ha de contenir %1$s caràcters com a mínim.</string>
     <string name="save_image_success">La imatge s\'ha desat correctament</string>
     <string name="save_image_failed">No es pot desar la imatge</string>
     <string name="permission_denied">Permís denegat</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a2ec06c4..a7ba7128 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -43,7 +43,6 @@
     <string name="default_system">Standard (Systemeinstellung)</string>
     <string name="permission_denied">Berechtigung verweigert</string>
     <string name="save_image_failed">Bild kann nicht gespeichert werden</string>
-    <string name="description_max_characters">Die Beschreibung darf höchstens %1$s Zeichen enthalten.</string>
     <string name="normal_filter">Normal</string>
     <string name="save_image_success">Bild erfolgreich gespeichert</string>
     <string name="picture_format_error">Upload-Fehler: falsches Bildformat.</string>
@@ -55,8 +54,6 @@
     <string name="comment">Kommentieren</string>
     <string name="share_image">Bild teilen</string>
     <string name="empty_comment">Der Kommentar darf nicht leer sein!</string>
-    <string name="shares">%1$s Geteilt</string>
-    <string name="likes">%1$s Likes</string>
     <string name="no_description">Keine Beschreibung</string>
     <string name="loading_toast">Beim Laden ist etwas schiefgegangen</string>
     <string name="search">Suchen</string>
@@ -66,12 +63,6 @@
     <string name="upload_post_error">Fehler beim Senden des Beitrags</string>
     <string name="comment_error">Kommentarfehler!</string>
     <string name="comment_posted">Kommentar: %1$s geschrieben!</string>
-    <string name="nb_posts">%1$s
-\nBeiträge</string>
-    <string name="nb_followers">%1$s
-\nFollower</string>
-    <string name="nb_following">%1$s
-\nFolgt</string>
     <string name="follow_button_failed">Konnte Knopf zum Folgen nicht anzeigen</string>
     <string name="follow_error">Konnte nicht folgen</string>
     <string name="no_username">Kein Benutzername</string>
@@ -142,7 +133,6 @@
     <string name="post_is_album">Dieser Beitrag ist ein Album</string>
     <string name="submit_comment">Kommentar senden</string>
     <string name="add_comment">Erstelle einen Kommentar</string>
-    <string name="number_comments">%1$s Kommentare</string>
     <string name="crop_button">Schaltfläche zum ausschneiden oder rotieren des Bildes</string>
     <string name="image_preview">Vorschau des bearbeiteten Bildes</string>
     <string name="filter_thumbnail">Vorschaubild des Filters</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 089f283f..e7659eaf 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -64,12 +64,6 @@
     <string name="follow_error">No pudo seguir</string>
     <string name="follow_button_failed">No se pudo mostrar el botón de seguimiento</string>
     <string name="follow_status_failed">No se pudo obtener el estado de seguidores</string>
-    <string name="nb_following">%1$s
-\nSeguidos</string>
-    <string name="nb_followers">%1$s
-\nSeguidores</string>
-    <string name="nb_posts">%1$s
-\nPublicaciones</string>
     <string name="comment">Comentar</string>
     <string name="comment_posted">¡Comentario: %1$s publicado!</string>
     <string name="comment_error">¡Error al comentar!</string>
@@ -78,8 +72,6 @@
     <string name="write_permission_download_pic">¡Tienes que dar permiso de escritura para descargar fotos!</string>
     <string name="empty_comment">¡Los comentarios no deben estar vacíos!</string>
     <string name="posted_on">Publicado en %1$s</string>
-    <string name="shares">%1$s Comparticiones</string>
-    <string name="likes">%1$s Me gustas</string>
     <string name="no_description">Sin descripción</string>
     <string name="feed_failed">No se pudieron obtener publicaciones</string>
     <string name="loading_toast">Algo salió mal al cargar</string>
@@ -90,7 +82,6 @@
     <string name="request_format_error">Error de carga: formato de petición erróneo</string>
     <string name="picture_format_error">Error de carga: formato de imagen incorrecto.</string>
     <string name="upload_picture_failed">¡Error al subir la foto!</string>
-    <string name="description_max_characters">La descripción debe contener %1$s caracteres como máximo.</string>
     <string name="save_image_success">Imagen guardada correctamente</string>
     <string name="save_image_failed">No se puede guardar la imagen</string>
     <string name="permission_denied">Permiso denegado</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 0e86e2bc..b139ca48 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -49,10 +49,6 @@
 \nJarraitzaile</string>
     <string name="default_nposts">-
 \nArgitalpen</string>
-    <string name="nb_following">%1$s
-\nJarraitzen</string>
-    <string name="nb_followers">%1$s
-\nJarraitzaile</string>
     <string name="share_image">Irudia partekatu</string>
     <string name="upload_picture_failed">Ezin izan da irudia kargatu!</string>
     <string name="save_image_failed">Ezinezkoa irudia gordetzea</string>
@@ -60,14 +56,11 @@
     <string name="light_theme">Argia</string>
     <string name="default_system">Lehenetsia (Sistemaren lehentsia)</string>
     <string name="no_description">Deskribapenik ez</string>
-    <string name="description_max_characters">Deskribapenak %1$s karaktere izan behar ditu gehienez.</string>
     <string name="save_image_success">Irudia behar bezala gorde da</string>
     <string name="feed_failed">Ezin izan da jarioa lortu</string>
     <string name="loading_toast">Zerbait gaizki joan da kargatzean</string>
-    <string name="shares">%1$s Partekatze</string>
     <string name="write_permission_download_pic">Idazteko baimena eman behar duzu irudiak deskargatzeko!</string>
     <string name="empty_comment">Iruzkina ez da hutsik egon behar!</string>
-    <string name="likes">%1$s Atsegite</string>
     <string name="normal_filter">Normala</string>
     <string name="upload_post_error">Argitalpenak huts egin du</string>
     <string name="comment_posted">Iruzkina: %1$s argitaratua!</string>
@@ -88,8 +81,6 @@
     <string name="follow_error">Ezin izan da jarraitu</string>
     <string name="follow_button_failed">Ezin izan da jarraipen-botoia erakutsi</string>
     <string name="follow_status_failed">Ezin izan da segimendu-egoera lortu</string>
-    <string name="nb_posts">%1$s
-\nArgitalpen</string>
     <string name="comment">Iruzkin</string>
     <string name="write_permission_share_pic">Idazteko baimena eman behar duzu argazkiak partekatzeko!</string>
     <string name="posted_on">%1$s(e)n argitaratua</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index ac76e247..66617711 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -43,7 +43,6 @@
     <string name="instance_error">نتوانستیم اطلاعات نمونه را دریافت کنیم</string>
     <string name="permission_denied">ممنوعیت دسترسی</string>
     <string name="save_image_failed">نتوانستیم تصویر را ذخیره کنیم</string>
-    <string name="description_max_characters">توضیحات حداکثر می‌توانند تا %1$s حرف داشته باشند.</string>
     <string name="default_system">پیش‌گزیده (پیروی از سامانه)</string>
     <string name="light_theme">روشن</string>
     <string name="dark_theme">تاریک</string>
@@ -58,10 +57,8 @@
     <string name="loading_toast">مشکلی حین بارکردن رخ داد</string>
     <string name="feed_failed">نتوانستیم خوراک را دریافت کنیم</string>
     <string name="no_description">بدون توضیحات</string>
-    <string name="likes">%1$s پسند</string>
     <string name="accounts">حساب‌ها</string>
     <string name="hashtags">هشتگ‌ها</string>
-    <string name="shares">%1$s هم‌رسانی</string>
     <string name="posted_on">منتشر شده در %1$s</string>
     <string name="empty_comment">نظر نمی‌تواند خالی باشد!</string>
     <string name="write_permission_download_pic">برای بارگیری تصاویر بایستی مجوز نوشتن را بدهید!</string>
@@ -70,12 +67,6 @@
     <string name="comment_error">خطا در درج نظر!</string>
     <string name="comment_posted">نظر: %1$s منتشر کرد!</string>
     <string name="comment">نظر</string>
-    <string name="nb_posts">%1$s
-\nمطلب</string>
-    <string name="nb_followers">%1$s
-\nپی‌گیرنده</string>
-    <string name="nb_following">%1$s
-\nپی‌گیری</string>
     <string name="follow_status_failed">نتوانستیم وضعیت پی‌گیری را دریافت کنیم</string>
     <string name="follow_button_failed">نتوانستیم دکمه پی‌گیری را نمایش دهیم</string>
     <string name="follow_error">نتوانستیم پی‌گیری کنیم</string>
@@ -137,7 +128,6 @@
     <string name="post_is_album">این فرسته، یک آلبوم است</string>
     <string name="submit_comment">فرستادن نظر</string>
     <string name="add_comment">نظری اضافه کنید</string>
-    <string name="number_comments">%1$s نظر</string>
     <string name="crop_button">دکمه برش یا چرخش تصویر</string>
     <string name="image_preview">پیش‌نمایش تصویری که در حال ویرایش است</string>
     <string name="filter_thumbnail">تصویر بندانگشتی پالایه</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 400f4f58..7eeb527c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -44,7 +44,6 @@
     <string name="request_format_error">Erreur de téléchargement : format de requête incorrect</string>
     <string name="picture_format_error">Erreur de téléversement : format d\'image incorrect.</string>
     <string name="upload_picture_failed">Erreur de téléversement d\'image !</string>
-    <string name="description_max_characters">La description doit contenir au plus %1$s caractères.</string>
     <string name="save_image_success">Image enregistrée avec succès</string>
     <string name="save_image_failed">Impossible de sauvegarder l\'image</string>
     <string name="permission_denied">Permission refusée</string>
@@ -63,19 +62,11 @@
     <string name="loading_toast">Une erreur s\'est produite lors du chargement</string>
     <string name="feed_failed">Impossible d\'obtenir le flux</string>
     <string name="no_description">Sans description</string>
-    <string name="likes">%1$s J\'aimes</string>
-    <string name="shares">%1$s Partages</string>
     <string name="write_permission_download_pic">Vous devez accorder une autorisation d\'écriture pour télécharger des photos !</string>
     <string name="share_image">Partager image</string>
     <string name="comment_error">Erreur de commentaire !</string>
     <string name="comment_posted">Commentaire : %1$s publié !</string>
     <string name="comment">Commenter</string>
-    <string name="nb_posts">%1$s
-\nPublications</string>
-    <string name="nb_followers">%1$s 
-\nAbonné·e·s</string>
-    <string name="nb_following">%1$s
-\nAbonnements</string>
     <string name="follow_status_failed">Impossible d\'obtenir l\'état de suivi</string>
     <string name="follow_button_failed">Impossible d\'afficher le bouton de suivi</string>
     <string name="follow_error">Impossible de suivre</string>
@@ -131,7 +122,6 @@
     <string name="post_is_album">Cette publication est un album</string>
     <string name="submit_comment">Envoyer le commentaire</string>
     <string name="add_comment">Ajouter un commentaire</string>
-    <string name="number_comments">%1$s commentaires</string>
     <string name="crop_button">Bouton pour effectuer une rotation ou recadrement de l\'image</string>
     <string name="post_image">Une des images de la publication</string>
     <string name="add_photo">Ajouter une photo</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index ea59f512..e475fb31 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -61,12 +61,6 @@
     <string name="follow_error">Non se puido seguir</string>
     <string name="follow_button_failed">Non se pode mostrar o botón para seguir</string>
     <string name="follow_status_failed">Non se obtivo o estado de relacións</string>
-    <string name="nb_following">%1$s
-\nSeguindo</string>
-    <string name="nb_followers">%1$s
-\nSeguidoras</string>
-    <string name="nb_posts">%1$s
-\nPublicacións</string>
     <string name="comment">Comentar</string>
     <string name="comment_posted">Comentario: %1$s publicado!</string>
     <string name="comment_error">Fallo ao comentar!</string>
@@ -75,8 +69,6 @@
     <string name="write_permission_download_pic">Tes que conceder permiso de escritura para descargar fotos!</string>
     <string name="empty_comment">O comentario non debe quedar baleiro!</string>
     <string name="posted_on">Publicado o %1$s</string>
-    <string name="shares">Compartido %1$s</string>
-    <string name="likes">%1$s Gústame</string>
     <string name="no_description">Sen descrición</string>
     <string name="feed_failed">Non se obtivo a fonte</string>
     <string name="loading_toast">Algo fallou ao realizar a subida</string>
@@ -87,7 +79,6 @@
     <string name="request_format_error">Erro na subida: formato da solicitude non válido</string>
     <string name="picture_format_error">Erro na subida: formato de imaxe non válido.</string>
     <string name="upload_picture_failed">Erro ao subir a foto!</string>
-    <string name="description_max_characters">A descrición non pode superar os %1$s caracteres.</string>
     <string name="save_image_failed">Non se gardou a imaxe</string>
     <string name="permission_denied">Permiso denegado</string>
     <string name="dark_theme">Escuro</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 35abbd56..1ad6aa5f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -48,7 +48,6 @@
     <string name="picture_format_error">Errore di caricamento: formato immagine errato.</string>
     <string name="add_account_name">Aggiungi Account</string>
     <string name="add_account_description">Aggiungi un altro account Pixelfed</string>
-    <string name="description_max_characters">La descrizione deve contenere al massimo %1$s caratteri.</string>
     <string name="loading_toast">Qualcosa è andato storto durante il caricamento</string>
     <string name="write_permission_download_pic">È necessario concedere i permessi di scrittura per scaricare le immagini!</string>
     <string name="request_format_error">Errore di caricamento: formato di richiesta errato</string>
@@ -58,8 +57,6 @@
     <string name="normal_filter">Normale</string>
     <string name="feed_failed">Impossibile ottenere il feed</string>
     <string name="no_description">Nessuna descrizione</string>
-    <string name="likes">%1$s Mi piace</string>
-    <string name="shares">%1$s Condivisioni</string>
     <string name="posted_on">Postato su %1$s</string>
     <string name="empty_comment">Il commento non deve essere vuoto!</string>
     <string name="write_permission_share_pic">È necessario concedere i permessi di scrittura per condividere le immagini!</string>
@@ -67,10 +64,6 @@
     <string name="comment_error">Errore nel commento!</string>
     <string name="comment_posted">Commento: %1$s postato!</string>
     <string name="comment">Commento</string>
-    <string name="nb_followers">%1$s
-\nSeguaci</string>
-    <string name="nb_following">%1$s
-\nSeguiti</string>
     <string name="follow_error">Impossibile seguire</string>
     <string name="unfollow_error">Impossibile smettere di seguire</string>
     <string name="access_token_invalid">Il token di accesso non è valido</string>
@@ -88,8 +81,6 @@
     <string name="accounts">ACCOUNTS</string>
     <string name="hashtags">HASHTAGS</string>
     <string name="posting_image_accessibility_hint">Immagine in corso di pubblicazione</string>
-    <string name="nb_posts">%1$s
-\nPosts</string>
     <string name="action_not_allowed">Questa azione non è consentita</string>
     <string name="upload_post_error">Errore di caricamento del post</string>
     <string name="media_upload_completed">{gmd_cloud_done} Caricamento contenuti completato</string>
@@ -138,7 +129,6 @@
     <string name="post_is_album">Questo post è un album</string>
     <string name="submit_comment">Invia commento</string>
     <string name="add_comment">Aggiungi un commento</string>
-    <string name="number_comments">%1$s commenti</string>
     <string name="crop_button">Pulsante per ritagliare o ruotare l\'immagine</string>
     <string name="image_preview">Anteprima dell\'immagine in fase di modifica</string>
     <string name="filter_thumbnail">Miniatura del filtro</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index baca6c14..2dc69ffd 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -46,9 +46,6 @@
     <string name="write_permission_share_pic">画像を共有するためには書き込みの権限を更新する必要があります</string>
     <string name="write_permission_download_pic">画像をダウンロードするには書き込みの権限を更新する必要があります</string>
     <string name="empty_comment">コメントは空欄にできません</string>
-    <string name="shares">%1$s再共有</string>
-    <string name="likes">%1$sお気に入り</string>
-    <string name="description_max_characters">説明には最低 %1$s文字以上含める必要があります。</string>
     <string name="comment_posted">コメント: %1$s が投稿されました</string>
     <string name="retry">再試行</string>
     <string name="posting_image_accessibility_hint">投稿された画像</string>
@@ -72,12 +69,6 @@
     <string name="follow_error">フォローできませんでした</string>
     <string name="follow_button_failed">フォローボタンを表示できませんでした</string>
     <string name="follow_status_failed">フォローステータスを取得できませんでした</string>
-    <string name="nb_following">%1$s
-\nフォロー</string>
-    <string name="nb_followers">%1$s
-\nフォロワー</string>
-    <string name="nb_posts">%1$s
-\n投稿</string>
     <string name="comment">コメント</string>
     <string name="comment_error">コメントエラー</string>
     <string name="share_image">画像を共有</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 58db999c..cf442057 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -41,7 +41,6 @@
     <string name="add_account_description">Andere Pixelfed account toevoegen</string>
     <string name="add_account_name">Account toevoegen</string>
     <string name="upload_picture_failed">Fout bij het uploaden!</string>
-    <string name="description_max_characters">De beschrijving mag maximaal %1$s karakters bevatten.</string>
     <string name="dark_theme">Donker</string>
     <string name="light_theme">Licht</string>
     <string name="search">Zoeken</string>
@@ -53,10 +52,6 @@
     <string name="default_nfollowers">-
 \nVolgers</string>
     <string name="action_not_allowed">Deze actie is niet toegestaan</string>
-    <string name="nb_following">%1$s
-\nVolgend</string>
-    <string name="nb_followers">%1$s
-\nVolgers</string>
     <string name="empty_comment">Commentaar mag niet leeg zijn!</string>
     <string name="no_description">Geen beschrijving</string>
     <string name="loading_toast">Er ging iets mis tijdens het laden</string>
@@ -75,9 +70,7 @@
     <string name="permission_denied">Toestemming geweigerd</string>
     <string name="default_system">Standaard (systeem instelling)</string>
     <string name="instance_error">Kon instance-informatie niet ophalen</string>
-    <string name="likes">%1$s Vind-ik-leuks</string>
     <string name="request_format_error">Fout bij het uploaden: slecht verzoekformaat</string>
-    <string name="shares">%1$s keer gedeeld</string>
     <string name="posted_on">Gepost op %1$s</string>
     <string name="comment">Commentaar maken</string>
     <string name="comment_posted">Commentaar: %1$s gepost!</string>
@@ -86,8 +79,6 @@
     <string name="write_permission_share_pic">Je moet schrijven toestaan om afbeeldingen te delen!</string>
     <string name="write_permission_download_pic">Je moet schrijven toestaan om afbeeldingen te downloaden!</string>
     <string name="follow_status_failed">Kon volgstatus niet ophalen</string>
-    <string name="nb_posts">%1$s
-\nPosts</string>
     <string name="busy_dialog_ok_button">Ok, wacht.</string>
     <string name="crop_result_error">Kon de afbeelding niet ophalen na bijsnijden</string>
     <string name="busy_dialog_text">Bezig met het verwerken van de afbeelding, wacht even tot dat het klaar is!</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d7eea5e9..3eb8d485 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -45,8 +45,6 @@
     <string name="image_download_downloading">Pobieranie…</string>
     <string name="image_download_success">Pobieranie zakończone powodzeniem</string>
     <string name="no_description">Bez opisu</string>
-    <string name="likes">Polubienia: %1$s</string>
-    <string name="shares">Udostępnienia: %1$s</string>
     <string name="posted_on">Opublikowano %1$s</string>
     <string name="empty_comment">Komentarz nie może być pusty!</string>
     <string name="write_permission_share_pic">Musisz nadać uprawnienia do zapisu, aby móc udostępniać obrazki!</string>
@@ -64,7 +62,6 @@
     <string name="whats_an_instance">Co to jest instancja\?</string>
     <string name="login_connection_required_once">Musisz być online, aby dodać konto i korzystać z PixelDroida :(</string>
     <string name="permission_denied">Brak dostępu</string>
-    <string name="description_max_characters">Opis może zawierać najwyżej %1$s znaków.</string>
     <string name="picture_format_error">Błąd wgrywania na serwer: niewłaściwy format pliku.</string>
     <string name="upload_post_error">Nie udało się opublikować posta</string>
     <string name="busy_dialog_text">Przetwarzam obrazek, zaczekaj aż skończę!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 0327e411..b1896663 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,12 +41,6 @@
     <string name="add_account_description">Добавить другой аккаунт Pixelfed</string>
     <string name="add_account_name">Добавить аккаунт</string>
     <string name="instance_error">Не удалось получить информацию об инстансе</string>
-    <string name="nb_following">%1$s
-\nПодписки</string>
-    <string name="nb_followers">%1$s
-\nПодписчики</string>
-    <string name="nb_posts">%1$s
-\nПосты</string>
     <string name="comment">Комментарий</string>
     <string name="comment_posted">Комментарий: %1$s опубликован!</string>
     <string name="comment_error">Ошибка при добавлении комментария!</string>
@@ -55,8 +49,6 @@
     <string name="write_permission_share_pic">Вы должны дать разрешение на запись файлов чтобы делиться изображениями!</string>
     <string name="empty_comment">Комментарий не может быть пустым!</string>
     <string name="posted_on">Опубликовано в %1$s</string>
-    <string name="shares">%1$s репостов</string>
-    <string name="likes">%1$s лайков</string>
     <string name="no_description">Нет описания</string>
     <string name="feed_failed">Не удалось загрузить ленту</string>
     <string name="loading_toast">При загрузке что-то пошло не так</string>
@@ -67,7 +59,6 @@
     <string name="request_format_error">Ошибка загрузки: некорректный формат запроса</string>
     <string name="picture_format_error">Ошибка загрузки: неверный формат изображения.</string>
     <string name="upload_picture_failed">Ошибка загрузки изображения!</string>
-    <string name="description_max_characters">Описание должно содержать максимум %1$s символов.</string>
     <string name="save_image_success">Изображение успешно сохранено</string>
     <string name="save_image_failed">Не удалось сохранить изображение</string>
     <string name="permission_denied">Недостаточно прав</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 04ae6d2f..49014a5c 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -64,12 +64,6 @@
     <string name="follow_error">Kunde inte följa</string>
     <string name="follow_button_failed">Kunde inte visa följarknapp</string>
     <string name="follow_status_failed">Kunde inte hämta status för följare</string>
-    <string name="nb_following">%1$s
-\nFöljer</string>
-    <string name="nb_followers">%1$s
-\nFöljare</string>
-    <string name="nb_posts">%1$s
-\nInlägg</string>
     <string name="comment">Kommentera</string>
     <string name="comment_posted">Kommentar: %$s inlagd!</string>
     <string name="comment_error">Kommentarsfel!</string>
@@ -78,8 +72,6 @@
     <string name="write_permission_download_pic">Du måste tillåta skrivrättigheter för att ladda ned bilder!</string>
     <string name="empty_comment">Kommentaren får inte vara tom!</string>
     <string name="posted_on">Inlagt på %1$s</string>
-    <string name="shares">%1$s delningar</string>
-    <string name="likes">%1$s gillningar</string>
     <string name="no_description">Ingen beskrivning</string>
     <string name="feed_failed">Kunde inte hämta flöde</string>
     <string name="loading_toast">Något gick fel vid laddningen</string>
@@ -90,7 +82,6 @@
     <string name="request_format_error">Uppladdningsfel: felaktig begäran</string>
     <string name="picture_format_error">Uppladdningsfel: fel bildformat.</string>
     <string name="upload_picture_failed">Fel vid uppladdning av bild!</string>
-    <string name="description_max_characters">Beskrivningen måste minst innehålla %1$s tecken.</string>
     <string name="save_image_success">Bild sparades</string>
     <string name="save_image_failed">Kunde inte spara bild</string>
     <string name="permission_denied">Åtkomst nekas</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 866fffe5..9e4c5435 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -64,12 +64,6 @@
     <string name="follow_error">无法关注</string>
     <string name="follow_button_failed">无法显示关注按钮</string>
     <string name="follow_status_failed">无法获得关注状态</string>
-    <string name="nb_following">%1$s
-\n正在关注</string>
-    <string name="nb_followers">%1$s
-\n关注者</string>
-    <string name="nb_posts">%1$s
-\n帖文</string>
     <string name="comment">评论</string>
     <string name="comment_posted">评论： %1$s 已发布！</string>
     <string name="comment_error">评论错误！</string>
@@ -78,8 +72,6 @@
     <string name="write_permission_download_pic">您需要允许读写权限才能下载图片！</string>
     <string name="empty_comment">评论不能为空！</string>
     <string name="posted_on">发表于 %1$s</string>
-    <string name="shares">%1$s 次分享</string>
-    <string name="likes">%1$s 个赞</string>
     <string name="no_description">没有描述</string>
     <string name="feed_failed">无法获取订阅</string>
     <string name="loading_toast">加载时出了一些问题</string>
@@ -90,7 +82,6 @@
     <string name="request_format_error">上传错误：错误的请求格式</string>
     <string name="picture_format_error">上传错误：图片格式错误。</string>
     <string name="upload_picture_failed">图片上传错误！</string>
-    <string name="description_max_characters">描述最多只能包含 %1$s 个字符。</string>
     <string name="save_image_success">图片成功保存</string>
     <string name="save_image_failed">无法保存图像</string>
     <string name="permission_denied">没有权限</string>
@@ -101,7 +92,6 @@
     <string name="crop_result_error">图像裁剪后无法恢复</string>
     <string name="busy_dialog_ok_button">好的</string>
     <string name="busy_dialog_text">图像仍在处理中，请先等待完成！</string>
-    <string name="click_image_edit">点击图片可编辑</string>
     <string name="post_image">帖文中的一张图片</string>
     <string name="add_photo">添加照片</string>
     <string name="poll_notification">%1$s投票已经结束</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6fa92f97..ce3ba663 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -39,7 +39,10 @@
     <string name="permission_denied">Permission denied</string>
     <string name="save_image_failed">Unable to save image</string>
     <string name="save_image_success">Image successfully saved</string>
-    <string name="description_max_characters">"Description must contain %1$s characters at most."</string>
+    <plurals name="description_max_characters">
+        <item quantity="one">"Description must contain %d character at most."</item>
+        <item quantity="other">"Description must contain %d characters at most."</item>
+    </plurals>
     <string name="upload_picture_failed">Picture upload error!</string>
     <string name="picture_format_error">Upload error: wrong picture format.</string>
     <string name="request_format_error">Upload error: bad request format</string>
@@ -84,8 +87,14 @@
     <string name="image_download_success">Image downloaded successfully</string>
     <!-- Post attributes -->
     <string name="no_description">No description</string>
-    <string name="likes">"%1$s Likes"</string>
-    <string name="shares">"%1$s Shares"</string>
+    <plurals name="likes">
+        <item quantity="one">%d Like</item>
+        <item quantity="other">%d Likes</item>
+    </plurals>
+    <plurals name="shares">
+        <item quantity="one">%d Share</item>
+        <item quantity="other">%d Shares</item>
+    </plurals>
     <string name="posted_on">"Posted on %1$s"</string>
     <string name="NoCommentsToShow">No comments on this post…</string>
     <string name="empty_comment">Comment must not be empty!</string>
@@ -95,14 +104,32 @@
     <string name="comment_error">Comment error!</string>
     <string name="comment_posted">"Comment: %1$s posted!"</string>
     <string name="comment">Comment</string>
-    <string name="number_comments">%1$s comments</string>
+    <plurals name="number_comments">
+        <item quantity="one">%d comment</item>
+        <item quantity="other">%d comments</item>
+    </plurals>
     <string name="add_comment">Add a comment</string>
     <string name="submit_comment">Submit comment</string>
     <string name="post_is_album">This post is an album</string>
     <!-- Profile page -->
-    <string name="nb_posts">"%1$s\nPosts"</string>
-    <string name="nb_followers">"%1$s\nFollowers"</string>
-    <string name="nb_following">"%1$s\nFollowing"</string>
+    <plurals name="nb_posts">
+        <item quantity="one">"%d
+Post"</item>
+        <item quantity="other">"%d
+Posts"</item>
+    </plurals>
+    <plurals name="nb_followers">
+        <item quantity="one">"%d
+Follower"</item>
+        <item quantity="other">"%d
+Followers"</item>
+    </plurals>
+    <plurals name="nb_following">
+        <item quantity="one">"%d
+Following"</item>
+        <item quantity="other">"%d
+Following"</item>
+    </plurals>
     <string name="follow_status_failed">Could not get follow status</string>
     <string name="follow_button_failed">Could not display follow button</string>
     <string name="follow_error">Could not follow</string>

From b1fbdcf589340a35efa5137d4f20ec961c8e258e Mon Sep 17 00:00:00 2001
From: Matthieu <24-artectrex@users.noreply.shinice.net>
Date: Mon, 25 Jan 2021 11:59:50 +0100
Subject: [PATCH 2/2] Remove useless string

---
 app/src/main/res/values-nl/strings.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index cf442057..4c669e05 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -120,7 +120,6 @@
     <string name="post_is_album">Deze post is een album</string>
     <string name="submit_comment">Commentaar versturen</string>
     <string name="add_comment">Commentaar toevoegen</string>
-    <string name="number_comments">%1$s commentaren</string>
     <string name="add_photo">Foto toevoegen</string>
     <string name="instance_not_pixelfed_cancel">Aanmelding annuleren</string>
     <string name="instance_not_pixelfed_continue">OK, toch verdergaan</string>