From 80f7ffd7a6ad74fa9876bb0334ba3fbfb634bc99 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 21 Aug 2020 14:19:06 +0200
Subject: [PATCH] Fix Potential Plurals - 3

---
 .../java/im/vector/app/core/ui/views/ReadReceiptsView.kt   | 7 ++++++-
 vector/src/main/res/values-bg/strings.xml                  | 1 -
 vector/src/main/res/values-cs/strings.xml                  | 1 -
 vector/src/main/res/values-de/strings.xml                  | 1 -
 vector/src/main/res/values-es/strings.xml                  | 1 -
 vector/src/main/res/values-eu/strings.xml                  | 1 -
 vector/src/main/res/values-fi/strings.xml                  | 1 -
 vector/src/main/res/values-fr/strings.xml                  | 1 -
 vector/src/main/res/values-hu/strings.xml                  | 1 -
 vector/src/main/res/values-it/strings.xml                  | 1 -
 vector/src/main/res/values-ko/strings.xml                  | 1 -
 vector/src/main/res/values-pl/strings.xml                  | 1 -
 vector/src/main/res/values-pt-rBR/strings.xml              | 1 -
 vector/src/main/res/values-ru/strings.xml                  | 1 -
 vector/src/main/res/values-sq/strings.xml                  | 1 -
 vector/src/main/res/values-zh-rCN/strings.xml              | 1 -
 vector/src/main/res/values-zh-rTW/strings.xml              | 1 -
 vector/src/main/res/values/strings.xml                     | 5 ++++-
 18 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
index 2286662288..2ce3396d0c 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/ReadReceiptsView.kt
@@ -98,7 +98,12 @@ class ReadReceiptsView @JvmOverloads constructor(
                     }
                 else ->
                     if (displayNames.size >= 2) {
-                        context.getString(R.string.two_and_some_others_read, displayNames[0], displayNames[1], (readReceipts.size - 2))
+                        val qty = readReceipts.size - 2
+                        context.resources.getQuantityString(R.plurals.two_and_some_others_read,
+                                qty,
+                                displayNames[0],
+                                displayNames[1],
+                                qty)
                     } else {
                         context.resources.getQuantityString(R.plurals.fallback_users_read, readReceipts.size)
                     }
diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml
index f9340546c9..30689751d6 100644
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@@ -1646,7 +1646,6 @@
     <string name="a11y_hide_password">Скрий паролата</string>
     <string name="a11y_jump_to_bottom">Отиди най-отдолу</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s и %3$d други прочетоха</string>
     <string name="three_users_read">%1$s, %2$s и %3$s прочетоха</string>
     <string name="two_users_read">%1$s и %2$s прочетоха</string>
     <string name="one_user_read">%s прочете</string>
diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml
index 5fd203f3de..1db3b14c6f 100644
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@@ -1667,7 +1667,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení.</string>
     <string name="a11y_hide_password">Skrýt heslo</string>
     <string name="a11y_jump_to_bottom">Přeskočit až dolů</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s a %3$d dalších přečetli</string>
     <string name="three_users_read">%1$s, %2$s a %3$s přečetli</string>
     <string name="two_users_read">%1$s a %2$s přečetli</string>
     <string name="one_user_read">%s přečetl(a)</string>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index b7e77230f4..2579effd9c 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -1819,7 +1819,6 @@ Verwahre deinen Wiederherstellungsschlüssel an einem sehr sicheren Ort wie eine
     <string name="settings_discovery_disconnect_with_bound_pid">Du teilst deine Email Adressen oder Telefonnummern momentan auf dem Identitätsserver %1$s. Du wirst dich erneut mit %2$s verbinden müssen, um mit dem Teilen aufzuhören.</string>
     <string name="settings_agree_to_terms">Stimme den Nutzungsbedingungen des Identitätsservers (%s) zu, um zu erlauben per E-Mail oder Telefonnummer gefunden zu werden.</string>
 
-    <string name="two_and_some_others_read">gelesen von %1$s, %2$s und %3$d anderen</string>
     <string name="error_handling_incoming_share">Zu teilende Daten nicht verarbeitbar</string>
 
     <string name="login_splash_text3">Erweitere &amp; individualisiere dein Benutzererlebnis</string>
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 3759f7caae..84ea53d685 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -1739,7 +1739,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu
     <string name="a11y_hide_password">Esconder contraseña</string>
     <string name="a11y_jump_to_bottom">Saltar al final</string>
 
-    <string name="two_and_some_others_read">Leído por %1$s, %2$s, %3$d y otros</string>
     <string name="three_users_read">Leído por %1$s, %2$s y %3$s</string>
     <string name="two_users_read">Leído por %1$s y %2$s</string>
     <string name="one_user_read">Leído por %s</string>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 0e6083744a..db7cf62893 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1650,7 +1650,6 @@ Abisua: Fitxategi hau ezabatu daiteke aplikazioa desinstalatzen bada.</string>
     <string name="a11y_hide_password">Ezkutatu pasahitza</string>
     <string name="a11y_jump_to_bottom">Jauzi behera</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s eta beste %3$d erabiltzailek irakurria</string>
     <string name="three_users_read">%1$s, %2$s eta%3$s erabiltzaileek irakurria</string>
     <string name="two_users_read">%1$s eta %2$s erabiltzaileek irakurria</string>
     <string name="one_user_read">%s erabiltzaileak irakurria</string>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 624fe29931..6179d13df1 100644
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -1625,7 +1625,6 @@ Haluatko lisätä paketteja?</string>
     <string name="a11y_hide_password">Piilota salasana</string>
     <string name="a11y_jump_to_bottom">Siirry loppuun</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s ja %3$d muuta lukivat</string>
     <string name="three_users_read">%1$s, %2$s ja %3$s lukivat</string>
     <string name="two_users_read">%1$s ja %2$s lukivat</string>
     <string name="one_user_read">%s luki</string>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 280a92089f..167139cbb2 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -1655,7 +1655,6 @@ Si vous n’avez pas configuré de nouvelle méthode de récupération, un attaq
     <string name="a11y_hide_password">Masquer le mot de passe</string>
     <string name="a11y_jump_to_bottom">Sauter en bas de page</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s et %3$d autres ont lu</string>
     <string name="three_users_read">%1$s, %2$s et %3$s ont lu</string>
     <string name="two_users_read">%1$s et %2$s ont lu</string>
     <string name="one_user_read">%s a lu</string>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index b7408fc8b7..a2dcd0ea22 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -1651,7 +1651,6 @@ Ha nem te állítottad be a visszaállítási metódust, akkor egy támadó pró
     <string name="a11y_hide_password">Jelszó elrejtése</string>
     <string name="a11y_jump_to_bottom">Végére ugrás</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s és %3$d olvasták</string>
     <string name="three_users_read">%1$s, %2$s és %3$s olvasták</string>
     <string name="two_users_read">%1$s és %2$s olvasták</string>
     <string name="one_user_read">%s olvasta</string>
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 0dd5b115c7..bade2d66b7 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -1703,7 +1703,6 @@
     <string name="a11y_hide_password">Nascondi password</string>
     <string name="a11y_jump_to_bottom">Salta in fondo</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s ed altri %3$d hanno letto</string>
     <string name="three_users_read">%1$s, %2$s e %3$s hanno letto</string>
     <string name="two_users_read">%1$s e %2$s hanno letto</string>
     <string name="one_user_read">%s ha letto</string>
diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml
index 31839770ae..aec1a93bb5 100644
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@@ -1582,7 +1582,6 @@
     <string name="a11y_hide_password">비밀번호 감추기</string>
     <string name="a11y_jump_to_bottom">맨 아래로 건너뛰기</string>
 
-    <string name="two_and_some_others_read">%1$s님, %2$s님 외 %3$d명이 읽음</string>
     <string name="three_users_read">%1$s님, %2$s님 그리고 %3$s님이 읽음</string>
     <string name="two_users_read">%1$s님 그리고 %2$s님이 읽음</string>
     <string name="one_user_read">%s님이 읽음</string>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 3407212316..79764d864e 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -1709,7 +1709,6 @@ Spróbuj uruchomić ponownie aplikację.</string>
     <string name="a11y_create_menu_open">Otwórz menu tworzenia pokoju</string>
     <string name="a11y_create_menu_close">Zamknij menu tworzenia pokoju…</string>
     <string name="a11y_close_keys_backup_banner">Zamknij baner kopii zapasowej kluczy</string>
-    <string name="two_and_some_others_read">odczytano przez %1$s, %2$s oraz %3$d</string>
     <string name="three_users_read">odczytano przez %1$s, %2$s oraz %3$s</string>
     <string name="two_users_read">odczytano przez %1$s oraz %2$s</string>
     <string name="one_user_read">%s odczytał</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 1b45d066ac..493f1f43fa 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -1837,7 +1837,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr
     <string name="a11y_hide_password">Esconder senha</string>
     <string name="a11y_jump_to_bottom">Saltar para parte inferior</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s e %3$d outros leram</string>
     <string name="three_users_read">%1$s, %2$s e %3$s leu</string>
     <string name="two_users_read">%1$s e %2$s lê</string>
     <string name="one_user_read">%s lê</string>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index 354efd2025..72291bdb04 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -2047,7 +2047,6 @@
 
     <string name="command_description_discard_session_not_handled">Поддерживается только в зашифрованных комнатах</string>
     <string name="a11y_create_direct_message">Создать новый диалог</string>
-    <string name="two_and_some_others_read">%1$s, %2$s и %3$d других прочли</string>
     <string name="three_users_read">%1$s, %2$s и %3$s прочли</string>
     <string name="two_users_read">%1$s и %2$s прочли</string>
     <string name="error_file_too_big">Файл \'%1$s\' (%2$s) слишком большой. Максимальный размер для загрузки %3$s.</string>
diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml
index efd186621f..f4b2799591 100644
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@@ -1609,7 +1609,6 @@
     <string name="a11y_hide_password">Fshihe fjalëkalimin</string>
     <string name="a11y_jump_to_bottom">Hidhu në fund</string>
 
-    <string name="two_and_some_others_read">%1$s, %2$s dhe %3$d të tjerë të lexuar</string>
     <string name="three_users_read">%1$s, %2$s dhe %3$s të lexuar</string>
     <string name="two_users_read">%1$s dhe %2$s të lexuar</string>
     <string name="one_user_read">%s i lexuar</string>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index b1723284ba..cac1d7bd0e 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -1764,7 +1764,6 @@ Element 在后台时的工作将被显著的限制，这可能会影响消息通
     <string name="a11y_hide_password">隐藏密码</string>
     <string name="a11y_jump_to_bottom">跳到底部</string>
 
-    <string name="two_and_some_others_read">%1$s，%2$s 和 %3$d 其他人已读</string>
     <string name="three_users_read">%1$s，%2$s 和 %3$s 已读</string>
     <string name="two_users_read">%1$s 和 %2$s 已读</string>
     <string name="one_user_read">%s 已读</string>
diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml
index 1999f76419..fbf26817b8 100644
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@@ -1606,7 +1606,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意
     <string name="a11y_hide_password">隱藏密碼</string>
     <string name="a11y_jump_to_bottom">跳到底部</string>
 
-    <string name="two_and_some_others_read">%1$s、%2$s 與 %3$d 個其他人已閱讀</string>
     <string name="three_users_read">%1$s、%2$s 與 %3$s 已閱讀</string>
     <string name="two_users_read">%1$s 與 %2$s 已閱讀</string>
     <string name="one_user_read">%s 已閱讀</string>
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 83c5ca7367..0b9cbab57a 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1782,7 +1782,10 @@
     <string name="a11y_jump_to_bottom">Jump to bottom</string>
 
     <!-- Read receipts list a11y -->
-    <string name="two_and_some_others_read">%1$s, %2$s and %3$d others read</string>
+    <plurals name="two_and_some_others_read">
+        <item quantity="one">%1$s, %2$s and %3$d other read</item>
+        <item quantity="other">%1$s, %2$s and %3$d others read</item>
+    </plurals>
     <string name="three_users_read">%1$s, %2$s and %3$s read</string>
     <string name="two_users_read">%1$s and %2$s read</string>
     <string name="one_user_read">%s read</string>