From f84ea0ad5b28be4bf012eb18aab9d61d0f50e25d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 21 Aug 2020 12:55:15 +0200 Subject: [PATCH] Fix Potential Plurals - 1 --- .../settings/VectorSettingsSecurityPrivacyFragment.kt | 5 +++-- vector/src/main/res/values-bg/strings.xml | 1 - vector/src/main/res/values-bn-rIN/strings.xml | 1 - vector/src/main/res/values-ca/strings.xml | 2 -- vector/src/main/res/values-cs/strings.xml | 1 - vector/src/main/res/values-de/strings.xml | 2 -- vector/src/main/res/values-es/strings.xml | 2 -- vector/src/main/res/values-et/strings.xml | 1 - vector/src/main/res/values-eu/strings.xml | 2 -- vector/src/main/res/values-fi/strings.xml | 2 -- vector/src/main/res/values-fr/strings.xml | 2 -- vector/src/main/res/values-hr/strings.xml | 1 - vector/src/main/res/values-hu/strings.xml | 2 -- vector/src/main/res/values-it/strings.xml | 2 -- vector/src/main/res/values-ko/strings.xml | 1 - vector/src/main/res/values-nl/strings.xml | 2 -- vector/src/main/res/values-pl/strings.xml | 2 -- vector/src/main/res/values-pt-rBR/strings.xml | 2 -- vector/src/main/res/values-ru/strings.xml | 1 - vector/src/main/res/values-sk/strings.xml | 2 -- vector/src/main/res/values-sq/strings.xml | 2 -- vector/src/main/res/values-tr/strings.xml | 1 - vector/src/main/res/values-uk/strings.xml | 2 -- vector/src/main/res/values-zh-rCN/strings.xml | 1 - vector/src/main/res/values-zh-rTW/strings.xml | 2 -- vector/src/main/res/values/strings.xml | 5 ++++- 26 files changed, 7 insertions(+), 42 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt index 92c372f946..7f6dd7b05f 100644 --- a/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt +++ b/vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt @@ -416,7 +416,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor( val sharedDataItem = sharedDataItems[0] val uri = when (sharedDataItem) { - is ExternalIntentData.IntentDataUri -> sharedDataItem.uri + is ExternalIntentData.IntentDataUri -> sharedDataItem.uri is ExternalIntentData.IntentDataClipData -> sharedDataItem.clipDataItem.uri else -> null } @@ -479,7 +479,8 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor( hideLoadingView() AlertDialog.Builder(thisActivity) - .setMessage(getString(R.string.encryption_import_room_keys_success, + .setMessage(resources.getQuantityString(R.plurals.encryption_import_room_keys_success, + data.successfullyNumberOfImportedKeys, data.successfullyNumberOfImportedKeys, data.totalNumberOfKeys)) .setPositiveButton(R.string.ok) { dialog, _ -> dialog.dismiss() } diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml index 4cc483f8be..06389cfd8e 100644 --- a/vector/src/main/res/values-bg/strings.xml +++ b/vector/src/main/res/values-bg/strings.xml @@ -1016,7 +1016,6 @@ Показване на събития за потребителски профили Включва промени в снимки и имена. Парола - %1$d/%2$d ключ(а) бяха успешно импортирани. Използване на системната камера вместо собствената интеграция на приложението. Тази опция изисква отделно приложение за записване на съобщенията. diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml index 6a618b04f0..188e956c95 100644 --- a/vector/src/main/res/values-bn-rIN/strings.xml +++ b/vector/src/main/res/values-bn-rIN/strings.xml @@ -949,7 +949,6 @@ ইম্পোর্ট শুধুমাত্র যাচাই সেশানে এনক্রিপ্ট করুন এই সেশান থেকে যাচাই করা সেশানগুলিতে এনক্রিপ্ট করা বার্তাগুলি কখনও প্রেরণ করবেন না। - %1$d/%2$d কুঞ্জি(গুলি) সাফল্য সাথে ইম্পোর্ট করা হয়েছে। যাচাই করা হয়নি প্রতিপাদিত diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml index 7a6c4b1d26..436781777e 100644 --- a/vector/src/main/res/values-ca/strings.xml +++ b/vector/src/main/res/values-ca/strings.xml @@ -1089,8 +1089,6 @@ A la pantalla següent se us demanarà que permeteu al Element executar-se sempr Contrasenya Informació addicional: %s - S\'ha importat %1$d/%2$d claus amb èxit. - S\'ha habilitat el Markdown. S\'ha inhabilitat el Markdown. diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml index 5870a4d64a..ea735fab5c 100644 --- a/vector/src/main/res/values-cs/strings.xml +++ b/vector/src/main/res/values-cs/strings.xml @@ -1004,7 +1004,6 @@ Vaši e-mailovou adresu můžete přidat k profilu v nastavení. Import Šifruj pouze do ověřených relací Nikdy neposílejte šifrované zprávy do neověřených relací z této relace. - Klíče %1$d/%2$d importovány úspěšně. Není ověřeno Potvrzeno diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml index 0beed1de4a..7f283c258d 100644 --- a/vector/src/main/res/values-de/strings.xml +++ b/vector/src/main/res/values-de/strings.xml @@ -1085,8 +1085,6 @@ Achtung: Diese Datei wird vielleicht gelöscht, wenn die App deinstalliert wird. Bitte prüfe und akzeptiere die Richtlinien dieses Home-Servers: - %1$d/%2$d Schlüssel erfolgreich importiert. - Tests ausführen Läuft… (%1$d von %2$d) Einer oder mehrere Tests sind fehlgeschlagen. Versuche vorgeschlagene Lösung(en). diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml index 492b593d71..6c6f3c0962 100644 --- a/vector/src/main/res/values-es/strings.xml +++ b/vector/src/main/res/values-es/strings.xml @@ -1236,8 +1236,6 @@ La visibilidad de mensajes en Matrix es similar a la del correo electrónico. Qu Recuperación de mensajes cifrados Gestionar copia de seguridad clave - %1$d/%2$d clave(s) importada(s) satisfactoriamente. - %1$s: 1 mensaje %1$s: %2$d mensajes diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml index 9508999429..799f343d48 100644 --- a/vector/src/main/res/values-et/strings.xml +++ b/vector/src/main/res/values-et/strings.xml @@ -1447,7 +1447,6 @@ Impordi Kasuta krüptimist vaid verifitseeritud sessioonides Ära iialgi saada sellest sessioonist krüptitud sõnumeid verifitseerimata sessioonidesse. - %1$d/%2$d võtme importimine õnnestus. Ei ole verifitseeritud Verifitseeritud diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml index 4df9486bbb..da38a18a1f 100644 --- a/vector/src/main/res/values-eu/strings.xml +++ b/vector/src/main/res/values-eu/strings.xml @@ -1030,8 +1030,6 @@ Matrix-eko mezuen ikusgaitasuna e-mail sistemaren antekoa da. Guk zure mezuak ah Irakurri eta onartu hasiera-zerbitzari honen baldintzak: - %1$d/%2$d gako ongi inportatu dira. - Egiaztatu arazoak jakinarazpenekin Arazoak egiaztatzen Abiatu probak diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml index 0f0547a9aa..a632f42b70 100644 --- a/vector/src/main/res/values-fi/strings.xml +++ b/vector/src/main/res/values-fi/strings.xml @@ -1115,8 +1115,6 @@ Haluatko lisätä paketteja? Salattujen viestien palautus Hallitse avainten varmuuskopiointia - %1$d / %2$d avainta tuotu onnistuneesti. - Kirjoita tähän… diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml index 74fcf588cb..f48fd2e160 100644 --- a/vector/src/main/res/values-fr/strings.xml +++ b/vector/src/main/res/values-fr/strings.xml @@ -1035,8 +1035,6 @@ Voulez-vous en ajouter ? Veuillez lire et accepter les politiques de ce serveur d’accueil : - %1$d/%2$d clé(s) importée(s) avec succès. - Résoudre les problèmes de notification Diagnostics de résolution de problème Lancer les tests diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml index 49f464f610..acd24b2491 100644 --- a/vector/src/main/res/values-hr/strings.xml +++ b/vector/src/main/res/values-hr/strings.xml @@ -1286,7 +1286,6 @@ Uvezi Šifriraj samo ka potvrđenim sesijama Nikada iz ove sesije ne šalji šifrirane poruke nepotvrđenim sesijama. - %1$d od %2$d ključ(eva) je uspješno uvezeno. Nije potvrđeno Potvrđeno diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml index edba67dcc8..e1fced512a 100644 --- a/vector/src/main/res/values-hu/strings.xml +++ b/vector/src/main/res/values-hu/strings.xml @@ -1032,8 +1032,6 @@ Matrixban az üzenetek láthatósága hasonlít az e-mailre. Az üzenet törlés Kérlek nézd át és fogadd el a Matrix szerver felhasználói feltételeit: - %1$d/%2$d kulcs sikeresen betöltve. - Értesítéshibák felderítése Hibakereső diagnosztika Tesztek futtatása diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml index 9386bf2665..65d34d8b14 100644 --- a/vector/src/main/res/values-it/strings.xml +++ b/vector/src/main/res/values-it/strings.xml @@ -1087,8 +1087,6 @@ Per favore, leggi e accetta i termini di servizio di questo Home Server: - %1$d/%2$d chiav(i) importate con successo. - Diagnostica delle notifiche Diagnosi Esegui i test diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml index d479e6f058..cf1dcee3d2 100644 --- a/vector/src/main/res/values-ko/strings.xml +++ b/vector/src/main/res/values-ko/strings.xml @@ -920,7 +920,6 @@ 가져오기 확인된 기기로만 암호화 이 기기에서 확인되지 않은 기기로 절대 암호화된 메시지를 보내지 않습니다. - %1$d/%2$d 키를 성공적으로 가져왔습니다. 확인되지 않음 확인됨 diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml index 70a52cc8b6..764b994810 100644 --- a/vector/src/main/res/values-nl/strings.xml +++ b/vector/src/main/res/values-nl/strings.xml @@ -1219,8 +1219,6 @@ Herstel van versleutelde berichten Sleutelback-up beheren - %1$d/%2$d sleutel(s) geïmporteerd. - %1$s: 1 bericht %1$s: %2$d berichten diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml index 57b1afe4f2..59684544cc 100644 --- a/vector/src/main/res/values-pl/strings.xml +++ b/vector/src/main/res/values-pl/strings.xml @@ -1043,8 +1043,6 @@ Widoczność wiadomości w Matrix jest podobna do wiadomości e-mail. Nasze zapo Przeczytaj i zaakceptuj zasady tego serwera domowego: - %1$d/%2$d klucz(y) zaimportowano z sukcesem. - Ta opcja wymaga aplikacji osoby trzeciej do nagrywania wiadomości. Uruchom Testy diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml index 2ac531585c..d75082f480 100644 --- a/vector/src/main/res/values-pt-rBR/strings.xml +++ b/vector/src/main/res/values-pt-rBR/strings.xml @@ -1142,8 +1142,6 @@ Na próxima tela, você será solicitado a permitir que o Element funcione sempr Ocorreu um erro ao confirmar seu número de telefone. Informação adicional: %s - %1$d/%2$d chave(es) importada(as) com sucesso. - Inicie a câmera do sistema em vez da câmera personalizada. Esta opção requer um aplicativo de terceiros para gravar as mensagens. diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml index 8a8ac342ae..eaabe83348 100644 --- a/vector/src/main/res/values-ru/strings.xml +++ b/vector/src/main/res/values-ru/strings.xml @@ -1194,7 +1194,6 @@ Включает изменения аватара и отображаемого имени. Необходимо минимизировать влияние на фоновое соединение для надёжности уведомлений. На следующем экране вам будет предложено разрешить Райоту всегда работать в фоновом режиме, пожалуйста, примите. - %1$d/%2$d ключ(и) успешно импортированы. Использовать системную камеру вместо камеры Райот. Показать информацию diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml index a685545acd..13e05110d9 100644 --- a/vector/src/main/res/values-sk/strings.xml +++ b/vector/src/main/res/values-sk/strings.xml @@ -1126,8 +1126,6 @@ Na ďalšej obrazovke vás systém požiada o povolenie vždy bežať na pozadí Pri pokuse overiť vaše telefónne číslo sa vyskytla chyba. Dodatočné informácie: %s - Úspešne importovaných %1$d/%2$d kľúč(ov). - Spustiť predvolený fotoaparát v systéme namiesto zobrazenia vlastnej vstavanej obrazovky. Vyžaduje externú aplikáciu na nahrávanie zvuku. diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml index d301dfe2d0..19692a7368 100644 --- a/vector/src/main/res/values-sq/strings.xml +++ b/vector/src/main/res/values-sq/strings.xml @@ -995,8 +995,6 @@ Ju lutemi, merrni në shqyrtim dhe pranoni rregullat e këtij shërbyesi Home: - %1$d/%2$d kyç(e) u importuan me sukses. - Diagnostikoni Njoftime Diagnostikime Xhironi Teste diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml index 52e73afdbb..fa85f68f9c 100644 --- a/vector/src/main/res/values-tr/strings.xml +++ b/vector/src/main/res/values-tr/strings.xml @@ -938,7 +938,6 @@ Eğer yeni kurtarma yöntemini siz ayarlamadıysanız, bir saldırgan hesabını İçe aktar Sadece doğrulanmış oturumlara şifrele Asla bu cihazdan doğrulanmamış oturumlara şifrelenmiş mesaj gönderme. - %1$d/%2$d anahtar başarı ile içe aktarıldı. Doğrulanmamış Doğrulanmış diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml index e143da6116..9c27392e81 100644 --- a/vector/src/main/res/values-uk/strings.xml +++ b/vector/src/main/res/values-uk/strings.xml @@ -1112,7 +1112,5 @@ Будь ласка, ознайомтесь та прийміть правила цього серверу: - %1$d/%2$d ключ(і/ів) успішно імпортовано. - Позначити як прочитане diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml index 19195e9719..b30473a986 100644 --- a/vector/src/main/res/values-zh-rCN/strings.xml +++ b/vector/src/main/res/values-zh-rCN/strings.xml @@ -962,7 +962,6 @@ Matrix 中的消息可见性类似于电子邮件。我们忘记您的消息意 请 %s 以继续使用本服务。 请 %s 以增加此限制的额度。 - 导入了 %2$d 个密钥,其中 %1$d 个导入成功。 Status.im 主题 diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml index f1818f3d83..79efec1dbf 100644 --- a/vector/src/main/res/values-zh-rTW/strings.xml +++ b/vector/src/main/res/values-zh-rTW/strings.xml @@ -992,8 +992,6 @@ Matrix 中的消息可見度類似于電子郵件。我們忘記您的郵件意 請審閱並接受此家伺服器的政策: - %1$d/%2$d 個金鑰匯入成功。 - 疑難排解通知 疑難排解診斷 執行測試 diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index 6108166d23..3edce5d09a 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -1085,7 +1085,10 @@ Import Encrypt to verified sessions only Never send encrypted messages to unverified sessions from this session. - %1$d/%2$d key(s) imported with success. + + %1$d/%2$d key imported with success. + %1$d/%2$d keys imported with success. + Not Verified Verified