diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md index aeec826e..4594391a 100644 --- a/docs/ARCHITECTURE.md +++ b/docs/ARCHITECTURE.md @@ -245,8 +245,9 @@ run as server jobs whose progress comes from the events. - Labels ≤ 30 chars, tooltips/errors/advisor reasons ≤ 200 chars (one or two sentences). - Plurals: `Key.one` / `Key.few` / `Key.many` / `Key.other`, resolved by `Loc.Plural("Key", n)`; keys that travel as data (analysis findings, advisor reasons) by `Loc.Text(key, args)`, with the count as their first argument. A text - with two or more counts reads as labels ("Frames: 300, warnings: 2"). `i18n check` fails on an English text that - puts a number before a counted noun without plural forms. + with two or more counts reads as labels ("Frames: 300, warnings: 2", "Copied: 40 · failed: 2"). `i18n check` fails on + an English text that puts a number before a counted noun without plural forms, or that tallies two or more counts + with participles or adjectives ("40 copied · 2 failed"), which agree with the number in other languages. ## 8. Build, checks and CI diff --git a/i18n/ar/Archive.ar.resx b/i18n/ar/Archive.ar.resx index df4a4822..cc223b39 100644 --- a/i18n/ar/Archive.ar.resx +++ b/i18n/ar/Archive.ar.resx @@ -113,7 +113,6 @@ جارٍ البحث… تم التحقق من كل التسلسلات تم تحليل كل التسلسلات - مفقودة: {0} · تالفة: {1} {0:N0} مجموعات تكرارات {0:N0} مجموعة تكرارات مجموعة تكرارات واحدة @@ -151,8 +150,6 @@ تغيّر: {0} تالف: {0} مفقود: {0} - {0}: أُنشئ {1}، أُعيد استخدام {2}، غير مقروء {3} - نُسخ {0}، تُخطّي {1}، فشل {2} لم يُنسخ: {0} ({1}) لم يُعثر على التسلسل: {0} نسخ قاعدة البيانات احتياطيًا diff --git a/i18n/ar/Import.ar.resx b/i18n/ar/Import.ar.resx index d927679b..2fb09ef7 100644 --- a/i18n/ar/Import.ar.resx +++ b/i18n/ar/Import.ar.resx @@ -178,7 +178,6 @@ فتح في المكتبة استيراد جديد لا توجد نسخة في الأرشيف بعد الاستيراد؛ راجع سجل المهمة. - نُسخ: {0} · فشل: {1} تُخطيت {0:N0} صور تُخطيت {0:N0} صورة تُخطيت صورة واحدة diff --git a/i18n/bg/Archive.bg.resx b/i18n/bg/Archive.bg.resx index f476bc62..93ab739c 100644 --- a/i18n/bg/Archive.bg.resx +++ b/i18n/bg/Archive.bg.resx @@ -93,7 +93,6 @@ Търси се… Всички серии са проверени Всички серии са анализирани - Липсващи: {0} · повредени: {1} {0:N0} група дубликати {0:N0} групи дубликати {0:N0} дублиран кадър @@ -121,8 +120,6 @@ Променен: {0} Повреден: {0} Липсващ: {0} - {0}: създадени {1}, използвани повторно {2}, нечетими {3} - Копирани {0}, пропуснати {1}, неуспешни {2} Не е копиран: {0} ({1}) Серията не е намерена: {0} Създаване на резервно копие diff --git a/i18n/bg/Import.bg.resx b/i18n/bg/Import.bg.resx index 07418faf..93ee9dc1 100644 --- a/i18n/bg/Import.bg.resx +++ b/i18n/bg/Import.bg.resx @@ -150,7 +150,6 @@ Отваряне в библиотеката Ново импортиране След импортирането няма копие в архива; вижте журнала на задачата. - Копирани: {0} · неуспешни: {1} {0:N0} пропусната {0:N0} пропуснати {0:N0} копирана и проверена diff --git a/i18n/cs/Archive.cs.resx b/i18n/cs/Archive.cs.resx index 02170a7e..2ef94ae4 100644 --- a/i18n/cs/Archive.cs.resx +++ b/i18n/cs/Archive.cs.resx @@ -103,7 +103,6 @@ Hledání… Všechny sekvence ověřeny Všechny sekvence analyzovány - Chybí {0} · poškozeno {1} {0:N0} skupiny duplikátů {0:N0} skupina duplikátů {0:N0} skupin duplikátů @@ -136,8 +135,6 @@ Změněno: {0} Poškozeno: {0} Chybí: {0} - {0}: vytvořeno {1}, znovu použito {2}, nečitelné {3} - Zkopírováno {0}, přeskočeno {1}, selhalo {2} Nezkopírováno: {0} ({1}) Sekvence nenalezena: {0} Zálohovat databázi diff --git a/i18n/cs/Import.cs.resx b/i18n/cs/Import.cs.resx index 758e9ee5..88e5d6d4 100644 --- a/i18n/cs/Import.cs.resx +++ b/i18n/cs/Import.cs.resx @@ -164,7 +164,6 @@ Otevřít v knihovně Nový import Po importu chybí kopie v archivu; podrobnosti najdete v protokolu úlohy. - Zkopírováno {0} · selhalo {1} {0:N0} přeskočeny {0:N0} přeskočena {0:N0} přeskočeno diff --git a/i18n/da/Archive.da.resx b/i18n/da/Archive.da.resx index e88e5e41..da3be1d0 100644 --- a/i18n/da/Archive.da.resx +++ b/i18n/da/Archive.da.resx @@ -93,7 +93,6 @@ Søger… Alle sekvenser er verificeret Alle sekvenser er analyseret - {0} mangler · {1} beskadiget {0:N0} dubletgruppe {0:N0} dubletgrupper {0:N0} dubleret billede @@ -121,8 +120,6 @@ Ændret: {0} Beskadiget: {0} Mangler: {0} - {0}: {1} oprettet, {2} genbrugt, {3} ulæselige - {0} kopieret, {1} sprunget over, {2} mislykkedes Ikke kopieret: {0} ({1}) Sekvens ikke fundet: {0} Sikkerhedskopiér database diff --git a/i18n/da/Import.da.resx b/i18n/da/Import.da.resx index 58ea802e..67fd712b 100644 --- a/i18n/da/Import.da.resx +++ b/i18n/da/Import.da.resx @@ -150,7 +150,6 @@ Åbn i Bibliotek Ny import Ingen arkivkopi efter importen; se jobloggen. - {0} kopieret · {1} mislykkedes {0:N0} sprunget over {0:N0} sprunget over {0:N0} kopieret og verificeret diff --git a/i18n/de/Archive.de.resx b/i18n/de/Archive.de.resx index 71f7d063..addadc43 100644 --- a/i18n/de/Archive.de.resx +++ b/i18n/de/Archive.de.resx @@ -93,7 +93,6 @@ Wird gesucht… Alle Sequenzen geprüft Alle Sequenzen analysiert - {0} fehlend · {1} beschädigt {0:N0} Duplikatgruppe {0:N0} Duplikatgruppen {0:N0} doppelter Frame @@ -121,8 +120,6 @@ Geändert: {0} Beschädigt: {0} Fehlt: {0} - {0}: {1} erstellt, {2} wiederverwendet, {3} unlesbar - {0} kopiert, {1} übersprungen, {2} fehlgeschlagen Nicht kopiert: {0} ({1}) Sequenz nicht gefunden: {0} Datenbank sichern diff --git a/i18n/de/Import.de.resx b/i18n/de/Import.de.resx index 6e0b7102..0aa93210 100644 --- a/i18n/de/Import.de.resx +++ b/i18n/de/Import.de.resx @@ -150,7 +150,6 @@ In Bibliothek öffnen Neuer Import Nach dem Import gibt es keine Archivkopie; siehe Auftragsprotokoll. - {0} kopiert · {1} fehlgeschlagen {0:N0} übersprungen {0:N0} übersprungen {0:N0} kopiert und geprüft diff --git a/i18n/el/Archive.el.resx b/i18n/el/Archive.el.resx index 8691d9f5..02efc352 100644 --- a/i18n/el/Archive.el.resx +++ b/i18n/el/Archive.el.resx @@ -93,7 +93,6 @@ Αναζήτηση… Όλες οι ακολουθίες επαληθεύτηκαν Όλες οι ακολουθίες αναλύθηκαν - {0} λείπουν · {1} κατεστραμμένα {0:N0} ομάδα διπλοτύπων {0:N0} ομάδες διπλοτύπων {0:N0} διπλότυπο καρέ @@ -121,8 +120,6 @@ Τροποποιήθηκε: {0} Κατεστραμμένο: {0} Λείπει: {0} - {0}: {1} δημιουργήθηκαν, {2} επαναχρησιμοποιήθηκαν, {3} μη αναγνώσιμα - {0} αντιγράφηκαν, {1} παραλείφθηκαν, {2} απέτυχαν Δεν αντιγράφηκε: {0} ({1}) Η ακολουθία δεν βρέθηκε: {0} Αντίγραφο ασφαλείας βάσης diff --git a/i18n/el/Import.el.resx b/i18n/el/Import.el.resx index 958f1fac..bad8dcbb 100644 --- a/i18n/el/Import.el.resx +++ b/i18n/el/Import.el.resx @@ -150,7 +150,6 @@ Άνοιγμα στη Βιβλιοθήκη Νέα εισαγωγή Κανένα αντίγραφο στην αρχειοθήκη μετά την εισαγωγή. Δείτε την καταγραφή της εργασίας. - {0} αντιγράφηκαν · {1} απέτυχαν {0:N0} παραλείφθηκε {0:N0} παραλείφθηκαν {0:N0} αντιγράφηκε και επαληθεύτηκε diff --git a/i18n/en/Archive.resx b/i18n/en/Archive.resx index 5b0fcf17..bcd6b5a5 100644 --- a/i18n/en/Archive.resx +++ b/i18n/en/Archive.resx @@ -99,7 +99,7 @@ Searching… Every sequence verified Every sequence analysed - {0} missing · {1} damaged + Missing: {0} · damaged: {1} {0:N0} duplicate group {0:N0} duplicate groups {0:N0} duplicate frame @@ -127,8 +127,8 @@ Changed: {0}long: job log line Damaged: {0}long: job log line Missing: {0}long: job log line - {0}: {1} made, {2} reused, {3} unreadablelong: job log line - {0} copied, {1} skipped, {2} failedlong: job log line + {0}: made {1}, reused {2}, unreadable {3}long: job log line + Copied: {0}, skipped: {1}, failed: {2}long: job log line Not copied: {0} ({1})long: job log line Stale locks: {0}, temporary files: {1}, packs compacted: {2}, duplicate flags changed: {3}long: job log line Unindexed photos: {0}, missing photos: {1}long: job log line diff --git a/i18n/en/Import.resx b/i18n/en/Import.resx index d11cc36f..594867fa 100644 --- a/i18n/en/Import.resx +++ b/i18n/en/Import.resx @@ -156,7 +156,7 @@ Open in Library New import No archive copy after the import; see the job log.long - {0} copied · {1} failedlong + Copied: {0} · failed: {1}long {0:N0} skipped {0:N0} skipped {0:N0} copied and verified diff --git a/i18n/es/Archive.es.resx b/i18n/es/Archive.es.resx index 8dbf743f..42ffe5c3 100644 --- a/i18n/es/Archive.es.resx +++ b/i18n/es/Archive.es.resx @@ -93,7 +93,6 @@ Buscando… Todas las secuencias verificadas Todas las secuencias analizadas - {0} ausentes · {1} dañados {0:N0} grupo de duplicados {0:N0} grupos de duplicados {0:N0} fotograma duplicado @@ -121,8 +120,6 @@ Modificado: {0} Dañado: {0} Falta: {0} - {0}: {1} generadas, {2} reutilizadas, {3} ilegibles - {0} copiados, {1} omitidos, {2} con error No copiado: {0} ({1}) Secuencia no encontrada: {0} Hacer copia de seguridad diff --git a/i18n/es/Import.es.resx b/i18n/es/Import.es.resx index 6a3da51c..65e020a7 100644 --- a/i18n/es/Import.es.resx +++ b/i18n/es/Import.es.resx @@ -150,7 +150,6 @@ Abrir en la Biblioteca Nueva importación No hay copia en la fototeca tras la importación; consulta el registro de la tarea. - {0} copiadas · {1} con error {0:N0} omitida {0:N0} omitidas {0:N0} copiada y verificada diff --git a/i18n/et/Archive.et.resx b/i18n/et/Archive.et.resx index 8ccd1797..0113e202 100644 --- a/i18n/et/Archive.et.resx +++ b/i18n/et/Archive.et.resx @@ -93,7 +93,6 @@ Otsimine… Kõik jadad on kontrollitud Kõik jadad on analüüsitud - {0} puudu · {1} kahjustatud {0:N0} duplikaadirühm {0:N0} duplikaadirühma {0:N0} duplikaatkaader @@ -121,8 +120,6 @@ Muudetud: {0} Kahjustatud: {0} Puudub: {0} - {0}: loodud {1}, taaskasutatud {2}, loetamatuid {3} - kopeeritud {0}, vahele jäetud {1}, nurjunud {2} Kopeerimata: {0} ({1}) Jada ei leitud: {0} Varunda andmebaas diff --git a/i18n/et/Import.et.resx b/i18n/et/Import.et.resx index 9ec6b20c..cbbe188d 100644 --- a/i18n/et/Import.et.resx +++ b/i18n/et/Import.et.resx @@ -150,7 +150,6 @@ Ava teegis Uus import Pärast importimist pole arhiivikoopiat; vaadake töö logi. - {0} kopeeritud · {1} nurjus {0:N0} vahele jäetud {0:N0} vahele jäetud {0:N0} kopeeritud ja kontrollitud diff --git a/i18n/fi/Archive.fi.resx b/i18n/fi/Archive.fi.resx index 5394ff9f..318edfbf 100644 --- a/i18n/fi/Archive.fi.resx +++ b/i18n/fi/Archive.fi.resx @@ -93,7 +93,6 @@ Haetaan… Kaikki sarjat tarkistettu Kaikki sarjat analysoitu - Puuttuvia {0} · vaurioituneita {1} {0:N0} kaksoiskappaleryhmä {0:N0} kaksoiskappaleryhmää {0:N0} kaksoiskappale @@ -121,8 +120,6 @@ Muuttunut: {0} Vaurioitunut: {0} Puuttuu: {0} - {0}: luotu {1}, käytetty uudelleen {2}, lukukelvottomia {3} - Kopioitu {0}, ohitettu {1}, epäonnistui {2} Ei kopioitu: {0} ({1}) Sarjaa ei löydy: {0} Varmuuskopioi tietokanta diff --git a/i18n/fi/Import.fi.resx b/i18n/fi/Import.fi.resx index c888926c..e971b229 100644 --- a/i18n/fi/Import.fi.resx +++ b/i18n/fi/Import.fi.resx @@ -150,7 +150,6 @@ Avaa kirjastossa Uusi tuonti Tuonnin jälkeen arkistossa ei ole kopiota; katso työn loki. - Kopioitu {0} · epäonnistui {1} {0:N0} ohitettu {0:N0} ohitettu {0:N0} kopioitu ja tarkistettu diff --git a/i18n/fr/Archive.fr.resx b/i18n/fr/Archive.fr.resx index d73278d4..f3658192 100644 --- a/i18n/fr/Archive.fr.resx +++ b/i18n/fr/Archive.fr.resx @@ -93,7 +93,6 @@ Recherche… Toutes les séquences vérifiées Toutes les séquences analysées - Manquantes : {0} · endommagées : {1} {0:N0} groupe de doublons {0:N0} groupes de doublons {0:N0} image en double @@ -121,8 +120,6 @@ Modifié : {0} Endommagé : {0} Manquant : {0} - {0} : {1} créées, {2} réutilisées, {3} illisibles - {0} copiés, {1} ignorés, {2} en échec Non copié : {0} ({1}) Séquence introuvable : {0} Sauvegarder la base diff --git a/i18n/fr/Import.fr.resx b/i18n/fr/Import.fr.resx index c5669615..c3e75b73 100644 --- a/i18n/fr/Import.fr.resx +++ b/i18n/fr/Import.fr.resx @@ -150,7 +150,6 @@ Ouvrir dans la Bibliothèque Nouvelle importation Aucune copie dans l'archive après l'importation ; consultez le journal de la tâche. - {0} copiées · {1} en échec {0:N0} ignorée {0:N0} ignorées {0:N0} copiée et vérifiée diff --git a/i18n/he/Archive.he.resx b/i18n/he/Archive.he.resx index 15c4b887..93e53201 100644 --- a/i18n/he/Archive.he.resx +++ b/i18n/he/Archive.he.resx @@ -103,7 +103,6 @@ מחפש… כל הרצפים אומתו כל הרצפים נותחו - {0} חסרים · {1} פגומים {0:N0} קבוצות כפילויות קבוצת כפילויות אחת {0:N0} קבוצות כפילויות @@ -136,8 +135,6 @@ השתנה: {0} פגום: {0} חסר: {0} - {0}: {1} נוצרו, {2} שומשו מחדש, {3} בלתי קריאים - {0} הועתקו, {1} דולגו, {2} נכשלו לא הועתק: {0} ({1}) הרצף לא נמצא: {0} גבה מסד נתונים diff --git a/i18n/he/Import.he.resx b/i18n/he/Import.he.resx index 74e74aa3..c053b47d 100644 --- a/i18n/he/Import.he.resx +++ b/i18n/he/Import.he.resx @@ -164,7 +164,6 @@ פתח בספרייה ייבוא חדש אין עותק בארכיון אחרי הייבוא; הפרטים ביומן המשימה. - {0} הועתקו · {1} נכשלו {0:N0} דולגו {0:N0} דולגה {0:N0} דולגו diff --git a/i18n/hi/Archive.hi.resx b/i18n/hi/Archive.hi.resx index 62d7dccc..7277fdca 100644 --- a/i18n/hi/Archive.hi.resx +++ b/i18n/hi/Archive.hi.resx @@ -93,7 +93,6 @@ खोज जारी… हर सीक्वेंस सत्यापित हर सीक्वेंस विश्लेषित - {0} गुम · {1} क्षतिग्रस्त {0:N0} डुप्लिकेट समूह {0:N0} डुप्लिकेट समूह {0:N0} डुप्लिकेट फ़्रेम @@ -121,8 +120,6 @@ बदला गया: {0} क्षतिग्रस्त: {0} गुम: {0} - {0}: {1} बनाए गए, {2} दोबारा उपयोग किए गए, {3} अपठनीय - {0} कॉपी किए गए, {1} छोड़े गए, {2} विफल कॉपी नहीं हुआ: {0} ({1}) सीक्वेंस नहीं मिला: {0} डेटाबेस का बैकअप लें diff --git a/i18n/hi/Import.hi.resx b/i18n/hi/Import.hi.resx index b1beadb8..5c5924a1 100644 --- a/i18n/hi/Import.hi.resx +++ b/i18n/hi/Import.hi.resx @@ -150,7 +150,6 @@ लाइब्रेरी में खोलें नया आयात आयात के बाद संग्रह में कोई कॉपी नहीं; कार्य लॉग देखें। - {0} कॉपी की गईं · {1} विफल {0:N0} छोड़ी गई {0:N0} छोड़ी गईं {0:N0} कॉपी और सत्यापित की गई diff --git a/i18n/hr/Archive.hr.resx b/i18n/hr/Archive.hr.resx index de7c8d5b..6fe57f04 100644 --- a/i18n/hr/Archive.hr.resx +++ b/i18n/hr/Archive.hr.resx @@ -103,7 +103,6 @@ Pretraživanje… Sve sekvence su provjerene Sve sekvence su analizirane - Nedostaje: {0} · oštećeno: {1} {0:N0} grupe duplikata {0:N0} grupa duplikata {0:N0} grupa duplikata @@ -136,8 +135,6 @@ Promijenjeno: {0} Oštećeno: {0} Nedostaje: {0} - {0}: izrađeno {1}, ponovno upotrijebljeno {2}, nečitljivo {3} - Kopirano: {0}, preskočeno: {1}, neuspjelo: {2} Nije kopirano: {0} ({1}) Sekvenca nije pronađena: {0} Sigurnosno kopiraj bazu diff --git a/i18n/hr/Import.hr.resx b/i18n/hr/Import.hr.resx index 06947f46..158d0114 100644 --- a/i18n/hr/Import.hr.resx +++ b/i18n/hr/Import.hr.resx @@ -164,7 +164,6 @@ Otvori u Biblioteci Novi uvoz Nakon uvoza nema kopije u arhivi; pogledajte zapisnik zadatka. - Kopirano: {0} · neuspjelo: {1} {0:N0} preskočene {0:N0} preskočena {0:N0} preskočeno diff --git a/i18n/hu/Archive.hu.resx b/i18n/hu/Archive.hu.resx index c15d2f31..4e9103a3 100644 --- a/i18n/hu/Archive.hu.resx +++ b/i18n/hu/Archive.hu.resx @@ -93,7 +93,6 @@ Keresés… Minden sorozat ellenőrizve Minden sorozat elemezve - {0} hiányzik · {1} sérült {0:N0} duplikátumcsoport {0:N0} duplikátumcsoport {0:N0} duplikált képkocka @@ -121,8 +120,6 @@ Módosult: {0} Sérült: {0} Hiányzik: {0} - {0}: {1} elkészült, {2} újrahasznosítva, {3} olvashatatlan - {0} másolva, {1} kihagyva, {2} sikertelen Nincs másolva: {0} ({1}) A sorozat nem található: {0} Adatbázis mentése diff --git a/i18n/hu/Import.hu.resx b/i18n/hu/Import.hu.resx index 37170fb1..788128e8 100644 --- a/i18n/hu/Import.hu.resx +++ b/i18n/hu/Import.hu.resx @@ -150,7 +150,6 @@ Megnyitás a Könyvtárban Új importálás Az importálás után nincs archív másolat; a részletek a feladat naplójában találhatók. - {0} másolva · {1} sikertelen {0:N0} kihagyva {0:N0} kihagyva {0:N0} másolva és ellenőrizve diff --git a/i18n/id/Archive.id.resx b/i18n/id/Archive.id.resx index d93923d9..ea252646 100644 --- a/i18n/id/Archive.id.resx +++ b/i18n/id/Archive.id.resx @@ -93,7 +93,6 @@ Mencari… Semua sekuens terverifikasi Semua sekuens sudah dianalisis - {0} hilang · {1} rusak {0:N0} grup duplikat {0:N0} grup duplikat {0:N0} bingkai duplikat @@ -121,8 +120,6 @@ Berubah: {0} Rusak: {0} Hilang: {0} - {0}: {1} dibuat, {2} dipakai ulang, {3} tidak terbaca - {0} disalin, {1} dilewati, {2} gagal Tidak disalin: {0} ({1}) Sekuens tidak ditemukan: {0} Cadangkan basis data diff --git a/i18n/id/Import.id.resx b/i18n/id/Import.id.resx index b124434f..5349c60e 100644 --- a/i18n/id/Import.id.resx +++ b/i18n/id/Import.id.resx @@ -150,7 +150,6 @@ Buka di Pustaka Impor baru Tidak ada salinan arsip setelah impor; lihat log tugas. - {0} disalin · {1} gagal {0:N0} dilewati {0:N0} dilewati {0:N0} disalin dan diverifikasi diff --git a/i18n/it/Admin.it.resx b/i18n/it/Admin.it.resx index 5bbd110c..8bae0199 100644 --- a/i18n/it/Admin.it.resx +++ b/i18n/it/Admin.it.resx @@ -103,7 +103,7 @@ sequenza sequenze Spazio - foto al giorno · {0} totali · picco {1} + foto al giorno · totale {0} · picco {1} Caricamenti · ultimi 30 giorni {0} sequenza senza proxy {0} sequenze senza proxy diff --git a/i18n/it/Archive.it.resx b/i18n/it/Archive.it.resx index cbc765d4..e84a0420 100644 --- a/i18n/it/Archive.it.resx +++ b/i18n/it/Archive.it.resx @@ -94,7 +94,7 @@ Ricerca… Tutte le sequenze verificate Tutte le sequenze analizzate - {0} mancanti · {1} danneggiati + Mancanti: {0} · danneggiati: {1} {0:N0} gruppo di doppioni {0:N0} gruppi di doppioni {0:N0} fotogramma doppio @@ -122,8 +122,8 @@ Modificato: {0} Danneggiato: {0} Mancante: {0} - {0}: {1} create, {2} riusate, {3} illeggibili - {0} copiate, {1} saltate, {2} non riuscite + {0}: create {1}, riusate {2}, illeggibili {3} + Copiate: {0}, saltate: {1}, non riuscite: {2} Non copiata: {0} ({1}) Blocchi scaduti: {0}, file temporanei: {1}, pacchetti compattati: {2}, segni di duplicato cambiati: {3} Foto non indicizzate: {0}, foto mancanti: {1} diff --git a/i18n/it/Import.it.resx b/i18n/it/Import.it.resx index 840ec7bd..d7f703a7 100644 --- a/i18n/it/Import.it.resx +++ b/i18n/it/Import.it.resx @@ -152,7 +152,7 @@ Apri nella Libreria Nuova importazione Nessuna copia in archivio dopo l'importazione: vedi il registro dell'attività. - {0} copiate · {1} non riuscite + Copiate: {0} · non riuscite: {1} {0:N0} saltata {0:N0} saltate {0:N0} copiata e verificata diff --git a/i18n/it/Uploader.it.resx b/i18n/it/Uploader.it.resx index 013dcd0c..067de910 100644 --- a/i18n/it/Uploader.it.resx +++ b/i18n/it/Uploader.it.resx @@ -47,11 +47,11 @@ Elimina dopo l'invio Riduci nell'area notifiche Avvia con Windows - {0:N0} non riusciti + Non riusciti: {0:N0} {0:N0} nuovo tentativo {0:N0} nuovi tentativi - {0:N0} di {1:N0} inviati - {0:N0} verificati dal server + Inviati: {0:N0} di {1:N0} + Verificati dal server: {0:N0} Completato Coda vuota {0:N0} file diff --git a/i18n/ja/Archive.ja.resx b/i18n/ja/Archive.ja.resx index 69083cf8..b58a6e60 100644 --- a/i18n/ja/Archive.ja.resx +++ b/i18n/ja/Archive.ja.resx @@ -93,7 +93,6 @@ 検索中… すべてのシーケンスが検証済み すべてのシーケンスが分析済み - 欠落 {0} · 破損 {1} 重複グループ {0:N0} 個 重複グループ {0:N0} 個 重複フレーム {0:N0} 枚 @@ -121,8 +120,6 @@ 変更あり: {0} 破損: {0} 欠落: {0} - {0}: 作成 {1}、再利用 {2}、読み取り不能 {3} - コピー {0}、スキップ {1}、失敗 {2} 未コピー: {0} ({1}) シーケンスが見つかりません: {0} データベースをバックアップ diff --git a/i18n/ja/Import.ja.resx b/i18n/ja/Import.ja.resx index da591b2a..5887f624 100644 --- a/i18n/ja/Import.ja.resx +++ b/i18n/ja/Import.ja.resx @@ -150,7 +150,6 @@ ライブラリで開く 新規インポート インポート後にアーカイブのコピーがありません。ジョブのログを確認してください。 - コピー {0} · 失敗 {1} スキップ {0:N0} 枚 スキップ {0:N0} 枚 コピー・検証済み {0:N0} 枚 diff --git a/i18n/ko/Archive.ko.resx b/i18n/ko/Archive.ko.resx index 3e450b29..10dde2bb 100644 --- a/i18n/ko/Archive.ko.resx +++ b/i18n/ko/Archive.ko.resx @@ -93,7 +93,6 @@ 검색 중… 모든 시퀀스 검증됨 모든 시퀀스 분석됨 - 누락 {0}개 · 손상 {1}개 중복 그룹 {0:N0}개 중복 그룹 {0:N0}개 중복 프레임 {0:N0}개 @@ -121,8 +120,6 @@ 변경됨: {0} 손상됨: {0} 없음: {0} - {0}: 생성 {1}, 재사용 {2}, 읽을 수 없음 {3} - 복사 {0}, 건너뜀 {1}, 실패 {2} 복사 안 됨: {0} ({1}) 시퀀스를 찾을 수 없음: {0} 데이터베이스 백업 diff --git a/i18n/ko/Import.ko.resx b/i18n/ko/Import.ko.resx index f86b36d0..f81c1d71 100644 --- a/i18n/ko/Import.ko.resx +++ b/i18n/ko/Import.ko.resx @@ -150,7 +150,6 @@ 라이브러리에서 열기 새 가져오기 가져온 후 아카이브 복사본이 없습니다. 작업 로그를 확인하십시오. - {0}장 복사됨 · {1}장 실패 {0:N0}장 건너뜀 {0:N0}장 건너뜀 {0:N0}장 복사 및 검증됨 diff --git a/i18n/lt/Archive.lt.resx b/i18n/lt/Archive.lt.resx index b2223e15..03e43f31 100644 --- a/i18n/lt/Archive.lt.resx +++ b/i18n/lt/Archive.lt.resx @@ -103,7 +103,6 @@ Ieškoma… Visos sekos patikrintos Visos sekos išanalizuotos - trūksta {0} · sugadinta {1} {0:N0} dublikatų grupės {0:N0} dublikatų grupė {0:N0} dublikatų grupių @@ -136,8 +135,6 @@ Pakeista: {0} Sugadinta: {0} Trūksta: {0} - {0}: sukurta {1}, pakartotinai panaudota {2}, neperskaitoma {3} - nukopijuota {0}, praleista {1}, nepavyko {2} Nenukopijuota: {0} ({1}) Seka nerasta: {0} Kurti atsarginę DB kopiją diff --git a/i18n/lt/Import.lt.resx b/i18n/lt/Import.lt.resx index de77efa3..933028f4 100644 --- a/i18n/lt/Import.lt.resx +++ b/i18n/lt/Import.lt.resx @@ -164,7 +164,6 @@ Atidaryti bibliotekoje Naujas importavimas Po importavimo archyve nėra kopijos; žr. užduoties žurnalą. - nukopijuota {0} · nepavyko {1} {0:N0} praleistos {0:N0} praleista {0:N0} praleista diff --git a/i18n/lv/Archive.lv.resx b/i18n/lv/Archive.lv.resx index 8d076262..b8b06669 100644 --- a/i18n/lv/Archive.lv.resx +++ b/i18n/lv/Archive.lv.resx @@ -103,7 +103,6 @@ Meklē… Visas secības verificētas Visas secības analizētas - Trūkst: {0} · bojāti: {1} {0:N0} dublikātu grupu {0:N0} dublikātu grupa {0:N0} dublikātu grupas @@ -136,8 +135,6 @@ Mainīts: {0} Bojāts: {0} Trūkst: {0} - {0}: izveidoti {1}, atkārtoti izmantoti {2}, nenolasāmi {3} - Nokopēti {0}, izlaisti {1}, neizdevās {2} Nav nokopēts: {0} ({1}) Secība nav atrasta: {0} Dublēt datu bāzi diff --git a/i18n/lv/Import.lv.resx b/i18n/lv/Import.lv.resx index 8c0cad35..883b914a 100644 --- a/i18n/lv/Import.lv.resx +++ b/i18n/lv/Import.lv.resx @@ -164,7 +164,6 @@ Atvērt bibliotēkā Jauna importēšana Pēc importēšanas nav arhīva kopijas; skatiet darba žurnālu. - Nokopēti: {0} · neizdevās: {1} Izlaists {0:N0} Izlaists {0:N0} Izlaisti {0:N0} diff --git a/i18n/ms/Archive.ms.resx b/i18n/ms/Archive.ms.resx index e04de237..2c9240ed 100644 --- a/i18n/ms/Archive.ms.resx +++ b/i18n/ms/Archive.ms.resx @@ -93,7 +93,6 @@ Mencari… Semua jujukan disahkan Semua jujukan dianalisis - {0} hilang · {1} rosak {0:N0} kumpulan pendua {0:N0} kumpulan pendua {0:N0} bingkai pendua @@ -121,8 +120,6 @@ Berubah: {0} Rosak: {0} Hilang: {0} - {0}: {1} dibuat, {2} diguna semula, {3} tidak boleh dibaca - {0} disalin, {1} dilangkau, {2} gagal Tidak disalin: {0} ({1}) Jujukan tidak ditemui: {0} Sandarkan pangkalan data diff --git a/i18n/ms/Import.ms.resx b/i18n/ms/Import.ms.resx index 32613074..a3131402 100644 --- a/i18n/ms/Import.ms.resx +++ b/i18n/ms/Import.ms.resx @@ -150,7 +150,6 @@ Buka dalam Pustaka Import baharu Tiada salinan arkib selepas import; lihat log tugas. - {0} disalin · {1} gagal {0:N0} dilangkau {0:N0} dilangkau {0:N0} disalin dan disahkan diff --git a/i18n/nb/Archive.nb.resx b/i18n/nb/Archive.nb.resx index 3f34b4f0..6ecc772a 100644 --- a/i18n/nb/Archive.nb.resx +++ b/i18n/nb/Archive.nb.resx @@ -93,7 +93,6 @@ Søker… Alle sekvenser er verifisert Alle sekvenser er analysert - {0} mangler · {1} skadet {0:N0} duplikatgruppe {0:N0} duplikatgrupper {0:N0} duplisert bilde @@ -121,8 +120,6 @@ Endret: {0} Skadet: {0} Mangler: {0} - {0}: {1} laget, {2} gjenbrukt, {3} uleselige - {0} kopiert, {1} hoppet over, {2} mislykket Ikke kopiert: {0} ({1}) Fant ikke sekvensen: {0} Sikkerhetskopier databasen diff --git a/i18n/nb/Import.nb.resx b/i18n/nb/Import.nb.resx index 97515029..ba3942ec 100644 --- a/i18n/nb/Import.nb.resx +++ b/i18n/nb/Import.nb.resx @@ -150,7 +150,6 @@ Åpne i biblioteket Ny import Ingen arkivkopi etter importen; se jobbloggen. - {0} kopiert · {1} mislykket {0:N0} hoppet over {0:N0} hoppet over {0:N0} kopiert og verifisert diff --git a/i18n/nl/Archive.nl.resx b/i18n/nl/Archive.nl.resx index 80ab6f0e..31d8a012 100644 --- a/i18n/nl/Archive.nl.resx +++ b/i18n/nl/Archive.nl.resx @@ -93,7 +93,6 @@ Zoeken… Alle reeksen geverifieerd Alle reeksen geanalyseerd - {0} ontbrekend · {1} beschadigd {0:N0} groep duplicaten {0:N0} groepen duplicaten {0:N0} dubbel frame @@ -121,8 +120,6 @@ Gewijzigd: {0} Beschadigd: {0} Ontbreekt: {0} - {0}: {1} gemaakt, {2} hergebruikt, {3} onleesbaar - {0} gekopieerd, {1} overgeslagen, {2} mislukt Niet gekopieerd: {0} ({1}) Reeks niet gevonden: {0} Back-up van database maken diff --git a/i18n/nl/Import.nl.resx b/i18n/nl/Import.nl.resx index 76f44cbf..488d9cac 100644 --- a/i18n/nl/Import.nl.resx +++ b/i18n/nl/Import.nl.resx @@ -150,7 +150,6 @@ Openen in Bibliotheek Nieuwe import Geen archiefkopie na de import; zie het taaklogboek. - {0} gekopieerd · {1} mislukt {0:N0} overgeslagen {0:N0} overgeslagen {0:N0} gekopieerd en geverifieerd diff --git a/i18n/pl/Archive.pl.resx b/i18n/pl/Archive.pl.resx index f3bff5d0..9ffb6e0a 100644 --- a/i18n/pl/Archive.pl.resx +++ b/i18n/pl/Archive.pl.resx @@ -113,7 +113,6 @@ Wyszukiwanie… Wszystkie sekwencje zweryfikowane Wszystkie sekwencje przeanalizowane - Brakujące: {0} · uszkodzone: {1} {0:N0} grupy duplikatów {0:N0} grup duplikatów {0:N0} grupa duplikatów @@ -151,8 +150,6 @@ Zmieniony plik: {0} Uszkodzony plik: {0} Brakujący plik: {0} - {0}: utworzone: {1}, użyte ponownie: {2}, nieczytelne: {3} - Skopiowane: {0}, pominięte: {1}, nieudane: {2} Nie skopiowano: {0} ({1}) Nie znaleziono sekwencji: {0} Utwórz kopię zapasową bazy diff --git a/i18n/pl/Import.pl.resx b/i18n/pl/Import.pl.resx index 9c0e44bd..33e09c2c 100644 --- a/i18n/pl/Import.pl.resx +++ b/i18n/pl/Import.pl.resx @@ -178,7 +178,6 @@ Otwórz w Bibliotece Nowy import Brak kopii w archiwum po imporcie; szczegóły znajdziesz w dzienniku zadania. - Skopiowane: {0} · nieudane: {1} Pominięte: {0:N0} Pominięte: {0:N0} Pominięte: {0:N0} diff --git a/i18n/pt-BR/Archive.pt-BR.resx b/i18n/pt-BR/Archive.pt-BR.resx index fb7b883b..f1148d45 100644 --- a/i18n/pt-BR/Archive.pt-BR.resx +++ b/i18n/pt-BR/Archive.pt-BR.resx @@ -93,7 +93,6 @@ Pesquisando… Todas as sequências verificadas Todas as sequências analisadas - {0} ausentes · {1} danificados {0:N0} grupo de duplicatas {0:N0} grupos de duplicatas {0:N0} quadro duplicado @@ -121,8 +120,6 @@ Alterado: {0} Danificado: {0} Ausente: {0} - {0}: {1} criadas, {2} reutilizadas, {3} ilegíveis - {0} copiados, {1} ignorados, {2} com falha Não copiado: {0} ({1}) Sequência não encontrada: {0} Fazer backup do banco de dados diff --git a/i18n/pt-BR/Import.pt-BR.resx b/i18n/pt-BR/Import.pt-BR.resx index fc94d287..31571517 100644 --- a/i18n/pt-BR/Import.pt-BR.resx +++ b/i18n/pt-BR/Import.pt-BR.resx @@ -150,7 +150,6 @@ Abrir na Biblioteca Nova importação Nenhuma cópia no acervo após a importação; consulte o log da tarefa. - {0} copiadas · {1} com falha {0:N0} ignorada {0:N0} ignoradas {0:N0} copiada e verificada diff --git a/i18n/pt-PT/Archive.pt-PT.resx b/i18n/pt-PT/Archive.pt-PT.resx index b1906506..0e637d18 100644 --- a/i18n/pt-PT/Archive.pt-PT.resx +++ b/i18n/pt-PT/Archive.pt-PT.resx @@ -93,7 +93,6 @@ A procurar… Todas as sequências verificadas Todas as sequências analisadas - {0} em falta · {1} danificados {0:N0} grupo de duplicados {0:N0} grupos de duplicados {0:N0} fotograma duplicado @@ -121,8 +120,6 @@ Alterado: {0} Danificado: {0} Em falta: {0} - {0}: {1} criadas, {2} reutilizadas, {3} ilegíveis - {0} copiados, {1} ignorados, {2} falhados Não copiado: {0} ({1}) Sequência não encontrada: {0} Fazer cópia da base de dados diff --git a/i18n/pt-PT/Import.pt-PT.resx b/i18n/pt-PT/Import.pt-PT.resx index fcf506da..10d6fd4a 100644 --- a/i18n/pt-PT/Import.pt-PT.resx +++ b/i18n/pt-PT/Import.pt-PT.resx @@ -150,7 +150,6 @@ Abrir na Biblioteca Nova importação Nenhuma cópia no arquivo após a importação; consulte o registo da tarefa. - {0} copiadas · {1} falhadas {0:N0} ignorada {0:N0} ignoradas {0:N0} copiada e verificada diff --git a/i18n/ro/Archive.ro.resx b/i18n/ro/Archive.ro.resx index a129eb7a..fa0c7d89 100644 --- a/i18n/ro/Archive.ro.resx +++ b/i18n/ro/Archive.ro.resx @@ -103,7 +103,6 @@ Se caută… Toate secvențele verificate Toate secvențele analizate - Lipsă: {0} · deteriorate: {1} {0:N0} grupuri de duplicate {0:N0} grup de duplicate {0:N0} de grupuri de duplicate @@ -136,8 +135,6 @@ Modificat: {0} Deteriorat: {0} Lipsă: {0} - {0} — create: {1}, reutilizate: {2}, ilizibile: {3} - copiate: {0}, omise: {1}, eșuate: {2} Necopiat: {0} ({1}) Secvența nu a fost găsită: {0} Copiere de rezervă a bazei de date diff --git a/i18n/ro/Import.ro.resx b/i18n/ro/Import.ro.resx index 75604a4e..af6fb5b9 100644 --- a/i18n/ro/Import.ro.resx +++ b/i18n/ro/Import.ro.resx @@ -164,7 +164,6 @@ Deschidere în Bibliotecă Import nou Nicio copie în arhivă după import; consultați jurnalul lucrării. - Copiate: {0} · eșuate: {1} {0:N0} fotografii omise {0:N0} fotografie omisă {0:N0} de fotografii omise diff --git a/i18n/ru/Archive.ru.resx b/i18n/ru/Archive.ru.resx index 2046c7ec..b599fd8b 100644 --- a/i18n/ru/Archive.ru.resx +++ b/i18n/ru/Archive.ru.resx @@ -113,7 +113,6 @@ Поиск… Все серии проверены Все серии проанализированы - Отсутствует: {0} · повреждено: {1} {0:N0} группы дубликатов {0:N0} групп дубликатов {0:N0} группа дубликатов @@ -151,8 +150,6 @@ Изменён: {0} Повреждён: {0} Отсутствует: {0} - {0}: создано — {1}, использовано повторно — {2}, нечитаемых — {3} - Скопировано: {0}, пропущено: {1}, ошибок: {2} Не скопировано: {0} ({1}) Серия не найдена: {0} Создать резервную копию diff --git a/i18n/ru/Import.ru.resx b/i18n/ru/Import.ru.resx index f47b3d8c..47613fae 100644 --- a/i18n/ru/Import.ru.resx +++ b/i18n/ru/Import.ru.resx @@ -178,7 +178,6 @@ Открыть в библиотеке Новый импорт После импорта в архиве нет копий; подробности — в журнале задания. - Скопировано: {0} · со сбоем: {1} Пропущено: {0:N0} Пропущено: {0:N0} Пропущено: {0:N0} diff --git a/i18n/sk/Archive.sk.resx b/i18n/sk/Archive.sk.resx index 93d7768e..c55b1412 100644 --- a/i18n/sk/Archive.sk.resx +++ b/i18n/sk/Archive.sk.resx @@ -103,7 +103,6 @@ Hľadá sa… Všetky sekvencie overené Všetky sekvencie analyzované - Chýbajúce: {0} · poškodené: {1} {0:N0} skupiny duplikátov {0:N0} skupina duplikátov {0:N0} skupín duplikátov @@ -136,8 +135,6 @@ Zmenené: {0} Poškodené: {0} Chýba: {0} - {0}: vytvorené {1}, opätovne použité {2}, nečitateľné {3} - Skopírované: {0}, preskočené: {1}, zlyhané: {2} Neskopírované: {0} ({1}) Sekvencia sa nenašla: {0} Zálohovať databázu diff --git a/i18n/sk/Import.sk.resx b/i18n/sk/Import.sk.resx index 27b25036..27995875 100644 --- a/i18n/sk/Import.sk.resx +++ b/i18n/sk/Import.sk.resx @@ -164,7 +164,6 @@ Otvoriť v knižnici Nový import Po importe nevznikla kópia v archíve; pozrite si denník úlohy. - Skopírované: {0} · zlyhané: {1} Preskočené: {0:N0} Preskočené: {0:N0} Preskočené: {0:N0} diff --git a/i18n/sl/Archive.sl.resx b/i18n/sl/Archive.sl.resx index 7eda99bf..5f186d0a 100644 --- a/i18n/sl/Archive.sl.resx +++ b/i18n/sl/Archive.sl.resx @@ -103,7 +103,6 @@ Iskanje … Vse sekvence so preverjene Vse sekvence so analizirane - Manjka: {0} · poškodovano: {1} {0:N0} skupine dvojnikov {0:N0} skupina dvojnikov {0:N0} skupin dvojnikov @@ -136,8 +135,6 @@ Spremenjeno: {0} Poškodovano: {0} Manjka: {0} - {0}: ustvarjeno {1}, znova uporabljeno {2}, neberljivo {3} - Kopirano {0}, preskočeno {1}, neuspelo {2} Ni kopirano: {0} ({1}) Sekvence ni mogoče najti: {0} Varnostno kopiraj zbirko podatkov diff --git a/i18n/sl/Import.sl.resx b/i18n/sl/Import.sl.resx index 8484bc02..f91a0fcb 100644 --- a/i18n/sl/Import.sl.resx +++ b/i18n/sl/Import.sl.resx @@ -164,7 +164,6 @@ Odpri v knjižnici Nov uvoz Po uvozu ni kopije v arhivu; oglejte si dnevnik opravila. - Kopirano: {0} · neuspelo: {1} {0:N0} preskočene {0:N0} preskočena {0:N0} preskočenih diff --git a/i18n/sv/Archive.sv.resx b/i18n/sv/Archive.sv.resx index 5d14fb0f..6753504b 100644 --- a/i18n/sv/Archive.sv.resx +++ b/i18n/sv/Archive.sv.resx @@ -93,7 +93,6 @@ Söker… Alla sekvenser verifierade Alla sekvenser analyserade - {0} saknas · {1} skadade {0:N0} dubblettgrupp {0:N0} dubblettgrupper {0:N0} dubblerad bildruta @@ -121,8 +120,6 @@ Ändrad: {0} Skadad: {0} Saknas: {0} - {0}: {1} skapade, {2} återanvända, {3} oläsbara - {0} kopierade, {1} överhoppade, {2} misslyckade Inte kopierad: {0} ({1}) Sekvensen hittades inte: {0} Säkerhetskopiera databas diff --git a/i18n/sv/Import.sv.resx b/i18n/sv/Import.sv.resx index 6e3607ae..62132f15 100644 --- a/i18n/sv/Import.sv.resx +++ b/i18n/sv/Import.sv.resx @@ -150,7 +150,6 @@ Öppna i Bibliotek Ny import Ingen arkivkopia efter importen; se jobbloggen. - {0} kopierade · {1} misslyckades {0:N0} överhoppat {0:N0} överhoppade {0:N0} kopierat och verifierat diff --git a/i18n/th/Archive.th.resx b/i18n/th/Archive.th.resx index 8ffab434..fa97c632 100644 --- a/i18n/th/Archive.th.resx +++ b/i18n/th/Archive.th.resx @@ -93,7 +93,6 @@ กำลังค้นหา… ตรวจสอบครบทุกซีเควนซ์แล้ว วิเคราะห์ครบทุกซีเควนซ์แล้ว - หายไป {0} · เสียหาย {1} เฟรมซ้ำ {0:N0} กลุ่ม เฟรมซ้ำ {0:N0} กลุ่ม เฟรมซ้ำ {0:N0} เฟรม @@ -121,8 +120,6 @@ เปลี่ยนแปลง: {0} เสียหาย: {0} หายไป: {0} - {0}: สร้าง {1}, ใช้ซ้ำ {2}, อ่านไม่ได้ {3} - คัดลอก {0}, ข้าม {1}, ล้มเหลว {2} ไม่ได้คัดลอก: {0} ({1}) ไม่พบซีเควนซ์: {0} สำรองฐานข้อมูล diff --git a/i18n/th/Import.th.resx b/i18n/th/Import.th.resx index 946d8411..dcd6e37d 100644 --- a/i18n/th/Import.th.resx +++ b/i18n/th/Import.th.resx @@ -150,7 +150,6 @@ เปิดในไลบรารี นำเข้าใหม่ ไม่มีสำเนาในคลังภาพหลังการนำเข้า ดูรายละเอียดในบันทึกงาน - คัดลอกแล้ว {0} · ล้มเหลว {1} ข้าม {0:N0} ข้าม {0:N0} คัดลอกและตรวจสอบแล้ว {0:N0} diff --git a/i18n/tr/Archive.tr.resx b/i18n/tr/Archive.tr.resx index 56e6c6fb..786f9443 100644 --- a/i18n/tr/Archive.tr.resx +++ b/i18n/tr/Archive.tr.resx @@ -93,7 +93,6 @@ Aranıyor… Tüm sekanslar doğrulandı Tüm sekanslar analiz edildi - {0} eksik · {1} hasarlı {0:N0} yinelenen kare grubu {0:N0} yinelenen kare grubu {0:N0} yinelenen kare @@ -121,8 +120,6 @@ Değişti: {0} Hasarlı: {0} Eksik: {0} - {0}: {1} oluşturuldu, {2} yeniden kullanıldı, {3} okunamadı - {0} kopyalandı, {1} atlandı, {2} başarısız Kopyalanmadı: {0} ({1}) Sekans bulunamadı: {0} Veritabanını yedekle diff --git a/i18n/tr/Import.tr.resx b/i18n/tr/Import.tr.resx index 71e1dacb..7301ee3d 100644 --- a/i18n/tr/Import.tr.resx +++ b/i18n/tr/Import.tr.resx @@ -150,7 +150,6 @@ Kitaplıkta aç Yeni içe aktarma İçe aktarmadan sonra arşiv kopyası yok; görev günlüğüne bakın. - {0} kopyalandı · {1} başarısız {0:N0} atlandı {0:N0} atlandı {0:N0} kopyalandı ve doğrulandı diff --git a/i18n/uk/Archive.uk.resx b/i18n/uk/Archive.uk.resx index e9f5ae08..c3a9eb21 100644 --- a/i18n/uk/Archive.uk.resx +++ b/i18n/uk/Archive.uk.resx @@ -113,7 +113,6 @@ Пошук… Усі послідовності перевірено Усі послідовності проаналізовано - Відсутніх: {0} · пошкоджених: {1} {0:N0} групи дублікатів {0:N0} груп дублікатів {0:N0} група дублікатів @@ -151,8 +150,6 @@ Змінено: {0} Пошкоджено: {0} Бракує: {0} - {0}: створено {1}, використано повторно {2}, нечитабельних {3} - Скопійовано: {0}, пропущено: {1}, з помилкою: {2} Не скопійовано: {0} ({1}) Послідовність не знайдено: {0} Створити копію бази diff --git a/i18n/uk/Import.uk.resx b/i18n/uk/Import.uk.resx index 2e775d4b..fa12b8e6 100644 --- a/i18n/uk/Import.uk.resx +++ b/i18n/uk/Import.uk.resx @@ -178,7 +178,6 @@ Відкрити в Бібліотеці Новий імпорт Після імпорту немає копії в архіві; див. журнал завдання. - Скопійовано: {0} · з помилкою: {1} Пропущено {0:N0} Пропущено {0:N0} Пропущено {0:N0} diff --git a/i18n/vi/Archive.vi.resx b/i18n/vi/Archive.vi.resx index b052ad68..e1c88c25 100644 --- a/i18n/vi/Archive.vi.resx +++ b/i18n/vi/Archive.vi.resx @@ -93,7 +93,6 @@ Đang tìm… Mọi chuỗi ảnh đã được xác minh Mọi chuỗi ảnh đã được phân tích - {0} bị thiếu · {1} bị hỏng {0:N0} nhóm trùng lặp {0:N0} nhóm trùng lặp {0:N0} khung hình trùng lặp @@ -121,8 +120,6 @@ Đã thay đổi: {0} Bị hỏng: {0} Bị thiếu: {0} - {0}: {1} đã tạo, {2} dùng lại, {3} không đọc được - {0} đã sao chép, {1} bỏ qua, {2} thất bại Chưa sao chép: {0} ({1}) Không tìm thấy chuỗi ảnh: {0} Sao lưu cơ sở dữ liệu diff --git a/i18n/vi/Import.vi.resx b/i18n/vi/Import.vi.resx index 414fb81e..3cc5b6d2 100644 --- a/i18n/vi/Import.vi.resx +++ b/i18n/vi/Import.vi.resx @@ -150,7 +150,6 @@ Mở trong Thư viện Lượt nhập mới Không có bản sao trong kho lưu trữ sau lượt nhập; hãy xem nhật ký tác vụ. - Đã sao chép {0} · {1} thất bại Đã bỏ qua {0:N0} Đã bỏ qua {0:N0} Đã sao chép và xác minh {0:N0} diff --git a/i18n/zh-Hans/Archive.zh-Hans.resx b/i18n/zh-Hans/Archive.zh-Hans.resx index e9a81ae1..d8b07988 100644 --- a/i18n/zh-Hans/Archive.zh-Hans.resx +++ b/i18n/zh-Hans/Archive.zh-Hans.resx @@ -93,7 +93,6 @@ 正在搜索… 所有序列均已校验 所有序列均已分析 - 缺失 {0} · 损坏 {1} {0:N0} 个重复组 {0:N0} 个重复组 {0:N0} 帧重复 @@ -121,8 +120,6 @@ 已更改:{0} 已损坏:{0} 缺失:{0} - {0}:已生成 {1},已复用 {2},无法读取 {3} - 已复制 {0},已跳过 {1},失败 {2} 未复制:{0}({1}) 未找到序列:{0} 备份数据库 diff --git a/i18n/zh-Hans/Import.zh-Hans.resx b/i18n/zh-Hans/Import.zh-Hans.resx index b52d4ccb..0d3aa8a7 100644 --- a/i18n/zh-Hans/Import.zh-Hans.resx +++ b/i18n/zh-Hans/Import.zh-Hans.resx @@ -150,7 +150,6 @@ 在图库中打开 新建导入 导入后档案库中没有副本;请查看任务日志。 - 已复制 {0} · 失败 {1} 已跳过 {0:N0} 个 已跳过 {0:N0} 个 已复制并校验 {0:N0} 个 diff --git a/i18n/zh-Hant/Archive.zh-Hant.resx b/i18n/zh-Hant/Archive.zh-Hant.resx index 48f7a902..93105c87 100644 --- a/i18n/zh-Hant/Archive.zh-Hant.resx +++ b/i18n/zh-Hant/Archive.zh-Hant.resx @@ -93,7 +93,6 @@ 正在搜尋… 所有序列皆已驗證 所有序列皆已分析 - 遺失 {0} 個 · 損毀 {1} 個 {0:N0} 個重複群組 {0:N0} 個重複群組 {0:N0} 個重複影格 @@ -121,8 +120,6 @@ 已變更:{0} 已損毀:{0} 遺失:{0} - {0}:已產生 {1} 個,重複使用 {2} 個,{3} 個無法讀取 - 已複製 {0} 個,略過 {1} 個,失敗 {2} 個 未複製:{0}({1}) 找不到序列:{0} 備份資料庫 diff --git a/i18n/zh-Hant/Import.zh-Hant.resx b/i18n/zh-Hant/Import.zh-Hant.resx index a6f8d5c9..ebdf88f7 100644 --- a/i18n/zh-Hant/Import.zh-Hant.resx +++ b/i18n/zh-Hant/Import.zh-Hant.resx @@ -150,7 +150,6 @@ 在圖庫中開啟 新增匯入 匯入後典藏庫中沒有副本;請參閱工作記錄。 - 已複製 {0} 個 · 失敗 {1} 個 已略過 {0:N0} 個 已略過 {0:N0} 個 已複製並驗證 {0:N0} 個 diff --git a/src/Titano.App/Import/ImportResultViewModel.cs b/src/Titano.App/Import/ImportResultViewModel.cs index 24b77458..30562a40 100644 --- a/src/Titano.App/Import/ImportResultViewModel.cs +++ b/src/Titano.App/Import/ImportResultViewModel.cs @@ -77,7 +77,7 @@ public sealed class ImportResultViewModel : LocalizedViewModel public ICommand EjectCommand { get; } public ICommand OpenLibraryCommand { get; } - /// "4,812 copied and verified", "4,800 copied · 12 failed". + /// "4,812 copied and verified", "Copied: 4,800 · failed: 12". public string ResultText => Outcome.IsComplete ? Loc.Plural(Outcome.Verified ? "Import.Result.Verified" : "Import.Result.Copied", Outcome.Imported) : Loc.L("Import.Result.Partial", Formatting.Count(Outcome.Imported), Formatting.Count(Outcome.Failures.Count)); diff --git a/src/Titano.Tools/Commands/I18nCommand.cs b/src/Titano.Tools/Commands/I18nCommand.cs index ec51f0d1..49b0f02b 100644 --- a/src/Titano.Tools/Commands/I18nCommand.cs +++ b/src/Titano.Tools/Commands/I18nCommand.cs @@ -56,6 +56,8 @@ internal sealed partial class I18nCommand : ICommand errors.Add($"en: {key} is empty"); if (CountedNoun(key, entry.Value) is { } noun) errors.Add($"en: {key} counts {noun} but is not a plural stem: write {key}.one and {key}.other with the count as {{0}}, or a label (\"Frames: {{0}}\")"); + if (CountedTally(key, entry.Value) is { } word) + errors.Add($"en: {key} puts counts before \"{word}\", which agrees with the number in other languages: write labels (\"Copied: {{0}}, failed: {{1}}\")"); } foreach (var (culture, strings) in catalog.Cultures) @@ -141,6 +143,20 @@ internal sealed partial class I18nCommand : ICommand return null; } + /// + /// The first word of a tally that counts with participles or adjectives ("{0} copied · {1} failed", "{1} made, {2} + /// reused"): Italian, Polish or Russian inflect those words for the number ("1 copiata", "3 copiate"), so the tally + /// reads "1 copiate" unless it is written as labels ("Copied: {0} · failed: {1}"). Only a list of two or more counts + /// is a tally: before a single "failed" or "missing" the placeholder is as often a name ("Import of {0} failed") or a + /// size ("{0} missing") as a count. Null when the value holds no such tally. + /// + internal static string? CountedTally(string key, string value) + { + if (PluralSuffix().IsMatch(key[(key.LastIndexOf('.') + 1)..])) return null; + var items = CountedTallyRegex().Matches(value); + return items.Count >= 2 ? items[0].Groups["word"].Value : null; + } + /// The English other form when is a plural form of an English plural key. private static Entry? PluralStem(string key, Dictionary en) { @@ -316,6 +332,14 @@ internal sealed partial class I18nCommand : ICommand + @"keyframes|encoders|errors|problems|duplicates|locks|packs|flags|lines|months|years|previews|settings|versions|workers|stars|rows|chunks)\b")] private static partial Regex CountedNounRegex(); + /// One item of a tally: a placeholder that starts the text or follows a list separator, then a participle or + /// adjective that ends the item. + [GeneratedRegex(@"(?<=^|[,;:·(]\s*)\{\d+(?:[,:][^}]*)?\}\s+(?copied|skipped|failed|made|reused|missing|damaged|unreadable|deleted|kept|" + + @"moved|removed|added|indexed|adopted|checked|intact|hashed|verified|imported|exported|rendered|renamed|uploaded|downloaded|sent|" + + @"received|created|updated|changed|restored|trashed|merged|found|lost|broken|corrupt|undecodable|unchanged|cancelled|done|finished|" + + @"queued|running|waiting|pending|selected|linked|synced|compacted|flagged|marked)(?=\s*(?:$|[,;·.)]))")] + private static partial Regex CountedTallyRegex(); + internal sealed record Entry(string File, string Value, string? Comment); internal sealed class Catalog diff --git a/tests/Titano.App.Tests/Uploader/UploaderTextTests.cs b/tests/Titano.App.Tests/Uploader/UploaderTextTests.cs index a1b4bfc6..1250796c 100644 --- a/tests/Titano.App.Tests/Uploader/UploaderTextTests.cs +++ b/tests/Titano.App.Tests/Uploader/UploaderTextTests.cs @@ -55,7 +55,16 @@ public sealed class UploaderTextTests { Assert.Null(UploaderText.Failed(Mockup, En)); Assert.Equal("1,203 failed", UploaderText.Failed(Mockup with { Failed = 1_203 }, En)); - Assert.Equal("3 non riusciti", UploaderText.Failed(Mockup with { Failed = 3 }, It)); + // Italian participles agree with the number ("1 non riuscito", "3 non riusciti"): the count follows a label instead. + Assert.Equal("Non riusciti: 3", UploaderText.Failed(Mockup with { Failed = 3 }, It)); + Assert.Equal("Non riusciti: 1", UploaderText.Failed(Mockup with { Failed = 1 }, It)); + } + + [Test] + public void ItalianProgressReadsForASingleFileToo() + { + Assert.Equal("Inviati: 1 di 1 · Verificati dal server: 1 · 0 nuovi tentativi", + UploaderText.ProgressLine(Mockup with { Files = 1, Sent = 1, Verified = 1 }, It)); } [Test] diff --git a/tests/Titano.Data.Tests/Archiving/ArchiveJobTests.cs b/tests/Titano.Data.Tests/Archiving/ArchiveJobTests.cs index c59f6ba6..f69a1867 100644 --- a/tests/Titano.Data.Tests/Archiving/ArchiveJobTests.cs +++ b/tests/Titano.Data.Tests/Archiving/ArchiveJobTests.cs @@ -85,7 +85,7 @@ public sealed class ArchiveJobTests(TestContext context) // A full pass reuses what is current and builds the rest. var all = await engine.EnqueueAsync(ArchiveJobs.Thumbnails([a.Id]), cancellationToken: fx.Ct); var done = await fx.WaitForAsync(all.Id, JobState.Done); - Assert.Contains("3 made, 3 reused", done.LogTail); + Assert.Contains("made 3, reused 3", done.LogTail); } [Test] @@ -125,6 +125,6 @@ public sealed class ArchiveJobTests(TestContext context) var frames = await fx.Db.Frames.ListBySequenceAsync(id); Assert.SequenceEqual(plan.Items.Skip(32).Select(i => i.FileName), frames.Select(f => f.FileName)); Assert.Equal(8, (await fx.Db.MediaCards.GetImportedKeysAsync(media.Id)).Count); - Assert.Contains("8 copied", done.LogTail); + Assert.Contains("Copied: 8,", done.LogTail); } } diff --git a/tests/Titano.Tools.Tests/I18nCommandTests.cs b/tests/Titano.Tools.Tests/I18nCommandTests.cs index dcc63301..129aa010 100644 --- a/tests/Titano.Tools.Tests/I18nCommandTests.cs +++ b/tests/Titano.Tools.Tests/I18nCommandTests.cs @@ -32,4 +32,28 @@ public sealed class I18nCommandTests Assert.Null(I18nCommand.CountedNoun("Tooltips.Editor.Remote", "Changes are saved on {0} and analyses and renders run there")); Assert.Null(I18nCommand.CountedNoun("Advisor.Reason.Transition.Single", "A single exposure step: a {0}-frame transition keeps the change gentle.")); } + + [Test] + public void ATallyOfParticiplesNeedsLabels() + { + // Italian reads "1 copiate · 1 non riuscite": the participle agrees with the number in front of it. + Assert.Equal("copied", I18nCommand.CountedTally("Import.Result.Partial", "{0} copied · {1} failed")); + Assert.Equal("missing", I18nCommand.CountedTally("Archive.Health.Damaged", "{0} missing · {1} damaged")); + Assert.Equal("made", I18nCommand.CountedTally("Archive.Log.ImagesDone", "{0}: {1} made, {2} reused, {3} unreadable")); + Assert.Equal("copied", I18nCommand.CountedTally("Archive.Log.ImportDone", "{0:N0} copied, {1:N0} skipped, {2:N0} failed.")); + } + + [Test] + public void LabelsNamesAndSizesAreNoTally() + { + Assert.Null(I18nCommand.CountedTally("Import.Result.Partial", "Copied: {0} · failed: {1}")); + Assert.Null(I18nCommand.CountedTally("Archive.Log.ImagesDone", "{0}: made {1}, reused {2}, unreadable {3}")); + Assert.Null(I18nCommand.CountedTally("Archive.Log.ScanDone", "Folders: {0}, indexed: {1}, adopted: {2}, removed: {3}")); + // A single participle after a placeholder is as often a name or a size as a count. + Assert.Null(I18nCommand.CountedTally("Export.Log.Failed", "{0} failed: {1}")); + Assert.Null(I18nCommand.CountedTally("Library.Queued", "{0} queued · {1}")); + Assert.Null(I18nCommand.CountedTally("Import.Plan.SpaceMissing", "{0} missing")); + Assert.Null(I18nCommand.CountedTally("Settings.Storage.Usage", "{0} used · {1} free")); + Assert.Null(I18nCommand.CountedTally("Import.Result.Skipped.other", "{0:N0} copied, {1:N0} skipped")); + } }