From ab2426ca15a5c99609140eec23a006e3541fd6da Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Fri, 30 Oct 2026 23:53:09 -0700 Subject: [PATCH 1/3] Swatches: the delete prompt for several swatches uses each language's plural forms The confirmation for deleting several swatches and groups now goes through i18n::tn, as the Graphic Styles prompt does, and each catalog gives the count-dependent forms in an @plural row. --- crates/ui-egui/src/i18n/bg.tsv | 2 +- crates/ui-egui/src/i18n/bs.tsv | 2 +- crates/ui-egui/src/i18n/ca.tsv | 2 +- crates/ui-egui/src/i18n/cs.tsv | 2 +- crates/ui-egui/src/i18n/da.tsv | 2 +- crates/ui-egui/src/i18n/de.tsv | 2 +- crates/ui-egui/src/i18n/el.tsv | 2 +- crates/ui-egui/src/i18n/es.tsv | 2 +- crates/ui-egui/src/i18n/fi.tsv | 2 +- crates/ui-egui/src/i18n/fr.tsv | 2 +- crates/ui-egui/src/i18n/hu.tsv | 2 +- crates/ui-egui/src/i18n/id.tsv | 2 +- crates/ui-egui/src/i18n/it.tsv | 2 +- crates/ui-egui/src/i18n/ja.tsv | 2 +- crates/ui-egui/src/i18n/ka.tsv | 2 +- crates/ui-egui/src/i18n/ko.tsv | 2 +- crates/ui-egui/src/i18n/nl.tsv | 2 +- crates/ui-egui/src/i18n/pl.tsv | 2 +- crates/ui-egui/src/i18n/pt-br.tsv | 2 +- crates/ui-egui/src/i18n/ru.tsv | 2 +- crates/ui-egui/src/i18n/sv.tsv | 2 +- crates/ui-egui/src/i18n/tr.tsv | 2 +- crates/ui-egui/src/i18n/uk.tsv | 2 +- crates/ui-egui/src/i18n/vi.tsv | 2 +- crates/ui-egui/src/i18n/zh-hans.tsv | 2 +- crates/ui-egui/src/i18n/zh-hant.tsv | 2 +- crates/ui-egui/src/panels/swatches/actions.rs | 2 +- crates/ui-egui/src/panels/swatches/tests.rs | 20 +++++++++++++++++++ docs/target-app-parity.md | 1 + 29 files changed, 48 insertions(+), 27 deletions(-) diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index f7687e161..2ddd7fd2b 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -732,7 +732,6 @@ font-technology Variable Променливи Delete the graphic style “{name}”? Изтриване на графичния стил „{name}“? Delete Theme Изтриване на тема Delete theme Изтриване на тема - Delete these {count} swatches and groups? Изтриване на тези {count} образца и групи? Delete these {n} graphic styles? Изтриване на тези {n} графични стила? Delete this saved preset Изтриване на тази запазена предварителна настройка Delete this {n} graphic style? Изтриване на този {n} графичен стил? @@ -3618,6 +3617,7 @@ imageTrace Outline Контур @plural {n} item|{n} items {n} обект|{n} обекта @plural Color Table ({n} color)|Color Table ({n} colors) Цветна таблица ({n} цвят)|Цветна таблица ({n} цвята) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Изтриване на този графичен стил ({n})?|Изтриване на тези графични стилове ({n})? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Изтриване на този {n} образец или група?|Изтриване на тези {n} образца и групи? @plural {n} Layer|{n} Layers {n} слой|{n} слоя @plural {n} Object|{n} Objects {n} обект|{n} обекта @plural {n} area highlighted|{n} areas highlighted {n} осветена област|{n} осветени области diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index d32d91503..f356047ee 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -1917,7 +1917,6 @@ lighting Light Svjetlo Weight: Debljina: Art using a deleted global swatch keeps its colour. Crtež koji koristi izbrisani globalni uzorak boje zadržava svoju boju. Color Group: {name} Grupa boja: {name} - Delete these {count} swatches and groups? Izbrisati ove uzorke boja i grupe ({count})? Delete “{name}”? Izbrisati „{name}”? Document Swatches Uzorci boja dokumenta Edit or Apply Color Group Uredi ili primijeni grupu boja @@ -4088,6 +4087,7 @@ imageTrace Outline Obris @plural {n} item|{n} items {n} stavka|{n} stavke|{n} stavki @plural Color Table ({n} color)|Color Table ({n} colors) Tabela boja ({n} boja)|Tabela boja ({n} boje)|Tabela boja ({n} boja) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Izbrisati ovaj {n} grafički stil?|Izbrisati ova {n} grafička stila?|Izbrisati ovih {n} grafičkih stilova? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Izbrisati {n} uzorak boje ili grupu?|Izbrisati {n} uzorka boja i grupe?|Izbrisati {n} uzoraka boja i grupa? @plural {n} Layer|{n} Layers {n} sloj|{n} sloja|{n} slojeva @plural {n} Object|{n} Objects {n} objekat|{n} objekta|{n} objekata @plural {n} area highlighted|{n} areas highlighted Istaknuto {n} područje|Istaknuta {n} područja|Istaknuto {n} područja diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index ae721b931..34722c0b1 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -1050,7 +1050,6 @@ Delete the library “{name}”? Voleu suprimir la biblioteca “{name}”? Delete Theme Suprimeix el tema Delete theme Suprimeix el tema - Delete these {count} swatches and groups? Voleu suprimir aquestes {count} mostres i grups? Delete these {n} graphic styles? Voleu suprimir aquests {n} estils gràfics? Delete this saved preset Suprimeix aquest preajust desat Delete this {n} graphic style? Voleu suprimir aquest {n} estil gràfic? @@ -4678,6 +4677,7 @@ @plural agrees with {n} default shortcut|agrees with {n} default shortcuts coincideix amb {n} drecera per defecte|coincideix amb {n} dreceres per defecte @plural Color Table ({n} color)|Color Table ({n} colors) Taula de colors ({n} color)|Taula de colors ({n} colors) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Voleu suprimir aquest {n} estil gràfic?|Voleu suprimir aquests {n} estils gràfics? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Voleu suprimir aquesta {n} mostra o grup?|Voleu suprimir aquestes {n} mostres i grups? @plural {n} area highlighted|{n} areas highlighted {n} àrea ressaltada|{n} àrees ressaltades @plural {n} color|{n} colors {n} color|{n} colors @plural {n} commit|{n} commits {n} commit|{n} commits diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index f21ad521c..b5fbc2154 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -1944,7 +1944,6 @@ lighting Light Světlo Weight: Tloušťka: Art using a deleted global swatch keeps its colour. Kresba, která používá odstraněnou globální položku vzorníku, si barvu ponechá. Color Group: {name} Skupina barev: {name} - Delete these {count} swatches and groups? Odstranit tyto položky vzorníku a skupiny ({count})? Delete “{name}”? Odstranit „{name}“? Document Swatches Vzorník dokumentu Edit or Apply Color Group Upravit nebo použít skupinu barev @@ -4122,6 +4121,7 @@ imageTrace Outline Obrys @plural {n} item|{n} items {n} položka|{n} položky|{n} položek @plural Color Table ({n} color)|Color Table ({n} colors) Tabulka barev ({n} barva)|Tabulka barev ({n} barvy)|Tabulka barev ({n} barev) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Odstranit {n} grafický styl?|Odstranit {n} grafické styly?|Odstranit {n} grafických stylů? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Odstranit {n} položku vzorníku nebo skupinu?|Odstranit {n} položky vzorníku a skupiny?|Odstranit {n} položek vzorníku a skupin? @plural {n} Layer|{n} Layers {n} vrstva|{n} vrstvy|{n} vrstev @plural {n} Object|{n} Objects {n} objekt|{n} objekty|{n} objektů @plural {n} area highlighted|{n} areas highlighted Zvýrazněna {n} oblast|Zvýrazněny {n} oblasti|Zvýrazněno {n} oblastí diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index b310616e3..4642b364b 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -1755,7 +1755,6 @@ lighting Light Lys Weight: Vægt: Art using a deleted global swatch keeps its colour. Grafik, der bruger en slettet global farveprøve, bevarer sin farve. Color Group: {name} Farvegruppe: {name} - Delete these {count} swatches and groups? Slet disse {count} farveprøver og grupper? Delete “{name}”? Slet »{name}«? Document Swatches Dokumentfarveprøver Edit or Apply Color Group Redigér eller anvend farvegruppe @@ -3854,6 +3853,7 @@ imageTrace Outline Kontur @plural {n} item|{n} items {n} element|{n} elementer @plural Color Table ({n} color)|Color Table ({n} colors) Farvetabel ({n} farve)|Farvetabel ({n} farver) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Vil du slette denne {n} grafikstil?|Vil du slette disse {n} grafikstile? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Slet denne {n} farveprøve eller gruppe?|Slet disse {n} farveprøver og grupper? @plural {n} Layer|{n} Layers {n} lag|{n} lag @plural {n} Object|{n} Objects {n} objekt|{n} objekter @plural {n} area highlighted|{n} areas highlighted {n} område fremhævet|{n} områder fremhævet diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 5b29c93e2..320960d0e 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -726,7 +726,6 @@ font-technology Variable Variabel Delete the graphic style “{name}”? Grafikstil „{name}“ löschen? Delete Theme Thema löschen Delete theme Thema löschen - Delete these {count} swatches and groups? Diese {count} Farbfelder und Gruppen löschen? Delete these {n} graphic styles? Diese {n} Grafikstile löschen? Delete this saved preset Diese gespeicherte Vorgabe löschen Delete this {n} graphic style? Diesen {n} Grafikstil löschen? @@ -3605,6 +3604,7 @@ imageTrace Outline Kontur @plural {n} item|{n} items {n} Element|{n} Elemente @plural Color Table ({n} color)|Color Table ({n} colors) Farbtabelle ({n} Farbe)|Farbtabelle ({n} Farben) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Diesen {n} Grafikstil löschen?|Diese {n} Grafikstile löschen? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? {n} Farbfeld oder Gruppe löschen?|Diese {n} Farbfelder und Gruppen löschen? @plural {n} Layer|{n} Layers {n} Ebene|{n} Ebenen @plural {n} Object|{n} Objects {n} Objekt|{n} Objekte @plural {n} area highlighted|{n} areas highlighted {n} Bereich hervorgehoben|{n} Bereiche hervorgehoben diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 290935530..7dfc4f3e6 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -706,7 +706,6 @@ font-technology Variable Μεταβλητές Delete the graphic style “{name}”? Να διαγραφεί το στυλ γραφικών «{name}»; Delete Theme Διαγραφή θέματος Delete theme Διαγραφή θέματος - Delete these {count} swatches and groups? Να διαγραφούν αυτά τα {count} δείγματα χρωμάτων και οι ομάδες; Delete these {n} graphic styles? Να διαγραφούν αυτά τα {n} στυλ γραφικών; Delete this saved preset Διαγραφή αυτής της αποθηκευμένης προεπιλογής Delete this {n} graphic style? Να διαγραφεί αυτό το {n} στυλ γραφικών; @@ -2017,6 +2016,7 @@ imageTrace Outline Περίγραμμα @plural {n} item|{n} items {n} στοιχείο|{n} στοιχεία @plural Color Table ({n} color)|Color Table ({n} colors) Πίνακας χρωμάτων ({n} χρώμα)|Πίνακας χρωμάτων ({n} χρώματα) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Να διαγραφεί αυτό το {n} στυλ γραφικών;|Να διαγραφούν αυτά τα {n} στυλ γραφικών; +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Να διαγραφεί αυτό το {n} δείγμα χρώματος ή ομάδα;|Να διαγραφούν αυτά τα {n} δείγματα χρωμάτων και οι ομάδες; @plural {n} Layer|{n} Layers {n} επίπεδο|{n} επίπεδα @plural {n} Object|{n} Objects {n} αντικείμενο|{n} αντικείμενα @plural {n} area highlighted|{n} areas highlighted {n} περιοχή επισημάνθηκε|{n} περιοχές επισημάνθηκαν diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index bc21e2e6c..454557e04 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -747,7 +747,6 @@ font-technology Variable Variables Delete the graphic style “{name}”? ¿Eliminar el estilo gráfico “{name}”? Delete Theme Eliminar tema Delete theme Eliminar tema - Delete these {count} swatches and groups? ¿Eliminar estas {count} muestras y grupos? Delete these {n} graphic styles? ¿Eliminar estos {n} estilos gráficos? Delete this saved preset Eliminar este preajuste guardado Delete this {n} graphic style? ¿Eliminar {n} estilo gráfico? @@ -3690,6 +3689,7 @@ imageTrace Outline Contorno @plural {n} item|{n} items {n} elemento|{n} elementos @plural Color Table ({n} color)|Color Table ({n} colors) Tabla de colores ({n} color)|Tabla de colores ({n} colores) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? ¿Eliminar {n} estilo gráfico?|¿Eliminar estos {n} estilos gráficos? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? ¿Eliminar {n} muestra o grupo?|¿Eliminar estas {n} muestras y grupos? @plural {n} Layer|{n} Layers {n} capa|{n} capas @plural {n} Object|{n} Objects {n} objeto|{n} objetos @plural {n} area highlighted|{n} areas highlighted {n} área resaltada|{n} áreas resaltadas diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 7941c911b..ede17d2ac 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -1906,7 +1906,6 @@ lighting Light Valo Weight: Paksuus: Art using a deleted global swatch keeps its colour. Poistettua globaalia värimallia käyttävä kuvitus säilyttää värinsä. Color Group: {name} Väriryhmä: {name} - Delete these {count} swatches and groups? Poistetaanko nämä {count} värimallia ja ryhmää? Delete “{name}”? Poistetaanko ”{name}”? Document Swatches Asiakirjan värimallit Edit or Apply Color Group Muokkaa tai käytä väriryhmää @@ -4040,6 +4039,7 @@ imageTrace Outline Ääriviiva @plural {n} item|{n} items {n} kohde|{n} kohdetta @plural Color Table ({n} color)|Color Table ({n} colors) Väritaulukko ({n} väri)|Väritaulukko ({n} väriä) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Poistetaanko tämä {n} grafiikkatyyli?|Poistetaanko nämä {n} grafiikkatyyliä? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Poistetaanko tämä {n} värimalli tai ryhmä?|Poistetaanko nämä {n} värimallia ja ryhmää? @plural {n} Layer|{n} Layers {n} taso|{n} tasoa @plural {n} Object|{n} Objects {n} objekti|{n} objektia @plural {n} area highlighted|{n} areas highlighted {n} alue korostettu|{n} aluetta korostettu diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index c59ae9ad4..e6c5ef0be 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -749,7 +749,7 @@ font-technology Variable Variables Delete the graphic style “{name}”? Supprimer le style graphique « {name} » ? Delete Theme Supprimer le thème Delete theme Supprimer le thème - Delete these {count} swatches and groups? Supprimer ces {count} nuances et groupes ? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Supprimer {n} nuance ou groupe ?|Supprimer ces {n} nuances et groupes ? Delete these {n} graphic styles? Supprimer ces {n} styles graphiques ? Delete this saved preset Supprimer ce paramètre prédéfini enregistré Delete this {n} graphic style? Supprimer {n} style graphique ? diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 3b1de01a5..eb4e09e41 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -972,7 +972,6 @@ font-technology Variable Változó Delete the library “{name}”? Törlöd ezt a könyvtárat: „{name}”? Delete Theme Téma törlése Delete theme Téma törlése - Delete these {count} swatches and groups? {count} színminta és csoport törlése? Delete these {n} graphic styles? {n} grafikai stílus törlése? Delete this saved preset A mentett előbeállítás törlése Delete this {n} graphic style? {n} grafikai stílus törlése? @@ -4443,6 +4442,7 @@ theme Appearance Kinézet imageTrace Outline Körvonal @plural Color Table ({n} color)|Color Table ({n} colors) Színtábla ({n} szín) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? {n} grafikai stílus törlése? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? {n} színminta és csoport törlése? @plural {n} area highlighted|{n} areas highlighted Kiemelt terület: {n} @plural {n} color|{n} colors {n} szín @plural {n} fill|{n} fills {n} kitöltés diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 9184b8635..e43dc998a 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -1755,7 +1755,6 @@ lighting Light Cahaya Weight: Ketebalan: Art using a deleted global swatch keeps its colour. Karya seni yang memakai swatch global terhapus tetap mempertahankan warnanya. Color Group: {name} Grup warna: {name} - Delete these {count} swatches and groups? Hapus {count} swatch dan grup ini? Delete “{name}”? Hapus “{name}”? Document Swatches Swatch dokumen Edit or Apply Color Group Edit atau terapkan grup warna @@ -3854,6 +3853,7 @@ imageTrace Outline Kontur @plural {n} item|{n} items {n} item @plural Color Table ({n} color)|Color Table ({n} colors) Tabel warna ({n} warna) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Hapus {n} gaya grafis ini? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Hapus {n} swatch dan grup ini? @plural {n} Layer|{n} Layers {n} lapisan @plural {n} Object|{n} Objects {n} objek @plural {n} area highlighted|{n} areas highlighted {n} area disorot diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 605a4145b..eefe97ac7 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -747,7 +747,6 @@ font-technology Variable Variabili Delete the graphic style “{name}”? Eliminare lo stile grafico “{name}”? Delete Theme Elimina tema Delete theme Elimina tema - Delete these {count} swatches and groups? Eliminare questi {count} campioni e gruppi? Delete these {n} graphic styles? Eliminare questi {n} stili grafici? Delete this saved preset Elimina questo preset salvato Delete this {n} graphic style? Eliminare {n} stile grafico? @@ -3726,6 +3725,7 @@ imageTrace Outline Contorno @plural {n} item|{n} items {n} elemento|{n} elementi @plural Color Table ({n} color)|Color Table ({n} colors) Tabella colori ({n} colore)|Tabella colori ({n} colori) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Eliminare {n} stile grafico?|Eliminare questi {n} stili grafici? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Eliminare {n} campione o gruppo?|Eliminare questi {n} campioni e gruppi? @plural {n} Layer|{n} Layers {n} livello|{n} livelli @plural {n} Object|{n} Objects {n} oggetto|{n} oggetti @plural {n} area highlighted|{n} areas highlighted {n} area evidenziata|{n} aree evidenziate diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 2542ac663..51b72cd23 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -1297,7 +1297,6 @@ font-technology Variable バリアブル Delete Workspace ワークスペースを削除 Delete the graphic style “{name}”? グラフィックスタイル「{name}」を削除しますか? Delete theme テーマを削除 - Delete these {count} swatches and groups? これら {count} 個のスウォッチとグループを削除しますか? Delete this saved preset この保存済みプリセットを削除 Delete {kind} Style {kind}スタイルを削除 Delete “{name}”? 「{name}」を削除しますか? @@ -3709,6 +3708,7 @@ file-filter Templates テンプレート imageTrace Outline アウトライン @plural Color Table ({n} color)|Color Table ({n} colors) カラーテーブル ({n} 色) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? {n} 個のグラフィックスタイルを削除しますか? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? これら {n} 個のスウォッチとグループを削除しますか? @plural {n} Layer|{n} Layers {n} レイヤー @plural {n} Object|{n} Objects {n} オブジェクト @plural {n} area highlighted|{n} areas highlighted {n} 個の範囲を強調表示 diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index ab961a710..7ae614f12 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -1658,7 +1658,6 @@ lighting Light სინათლე Weight: სისქე: Art using a deleted global swatch keeps its colour. წაშლილი გლობალური ფერის ნიმუშის მქონე ნახატი თავის ფერს ინარჩუნებს. Color Group: {name} ფერთა ჯგუფი: {name} - Delete these {count} swatches and groups? წაიშალოს ეს ფერის ნიმუშები და ჯგუფები ({count})? Delete “{name}”? წაიშალოს „{name}“? Document Swatches დოკუმენტის ფერის ნიმუშები Edit or Apply Color Group ფერთა ჯგუფის რედაქტირება ან გამოყენება @@ -3620,6 +3619,7 @@ font-technology Variable ცვლადი @plural {n} item|{n} items ელემენტი: {n} @plural Color Table ({n} color)|Color Table ({n} colors) ფერების ცხრილი (ფერი: {n}) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? წაიშალოს გრაფიკული სტილები ({n})? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? წაიშალოს ეს ფერის ნიმუშები და ჯგუფები ({n})? @plural {n} Layer|{n} Layers შრე: {n} @plural {n} Object|{n} Objects ობიექტი: {n} @plural {n} area highlighted|{n} areas highlighted გამოკვეთილი არე: {n} diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index cbfe1c6f2..23e55a28f 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -1288,7 +1288,6 @@ font-technology Variable 가변 Delete Workspace 작업 영역 삭제 Delete the graphic style “{name}”? 그래픽 스타일 “{name}”을(를) 삭제하시겠습니까? Delete theme 테마 삭제 - Delete these {count} swatches and groups? 견본과 그룹 {count}개를 삭제하시겠습니까? Delete this saved preset 저장된 이 프리셋 삭제 Delete {kind} Style {kind} 스타일 삭제 Delete “{name}”? “{name}”을(를) 삭제하시겠습니까? @@ -3698,6 +3697,7 @@ file-filter Templates 템플릿 imageTrace Outline 윤곽선 @plural Color Table ({n} color)|Color Table ({n} colors) 색상 표 ({n}색)|색상 표 ({n}색) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? 그래픽 스타일 {n}개를 삭제하시겠습니까?|그래픽 스타일 {n}개를 삭제하시겠습니까? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? 견본과 그룹 {n}개를 삭제하시겠습니까? @plural {n} Layer|{n} Layers 레이어 {n}개|레이어 {n}개 @plural {n} Object|{n} Objects 개체 {n}개|개체 {n}개 @plural {n} area highlighted|{n} areas highlighted 강조된 영역 {n}개|강조된 영역 {n}개 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 65a2d5440..c26983241 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -1769,7 +1769,6 @@ lighting Light Licht Weight: Dikte: Art using a deleted global swatch keeps its colour. Artwork met een verwijderd globaal staal behoudt zijn kleur. Color Group: {name} Kleurgroep: {name} - Delete these {count} swatches and groups? Deze {count} stalen en groepen verwijderen? Delete “{name}”? „{name}” verwijderen? Document Swatches Documentstalen Edit or Apply Color Group Kleurgroep bewerken of toepassen @@ -3868,6 +3867,7 @@ imageTrace Outline Contour @plural {n} item|{n} items {n} item|{n} items @plural Color Table ({n} color)|Color Table ({n} colors) Kleurentabel ({n} kleur)|Kleurentabel ({n} kleuren) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Deze {n} grafische stijl verwijderen?|Deze {n} grafische stijlen verwijderen? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Deze {n} staal of groep verwijderen?|Deze {n} stalen en groepen verwijderen? @plural {n} Layer|{n} Layers {n} laag|{n} lagen @plural {n} Object|{n} Objects {n} object|{n} objecten @plural {n} area highlighted|{n} areas highlighted {n} gebied gemarkeerd|{n} gebieden gemarkeerd diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 7eb02958a..65cb40b34 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -1864,7 +1864,6 @@ lighting Light Światło Weight: Grubość: Art using a deleted global swatch keeps its colour. Kompozycja używająca usuniętej próbki globalnej zachowa swój kolor. Color Group: {name} Grupa kolorów: {name} - Delete these {count} swatches and groups? Usunąć te próbki i grupy ({count})? Delete “{name}”? Usunąć „{name}”? Document Swatches Próbki dokumentu Edit or Apply Color Group Edytuj lub zastosuj grupę kolorów @@ -3948,6 +3947,7 @@ imageTrace Outline Kontur @plural {n} item|{n} items {n} element|{n} elementy|{n} elementów @plural Color Table ({n} color)|Color Table ({n} colors) Tablica kolorów ({n} kolor)|Tablica kolorów ({n} kolory)|Tablica kolorów ({n} kolorów) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Usunąć {n} styl graficzny?|Usunąć {n} style graficzne?|Usunąć {n} stylów graficznych? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Usunąć {n} próbkę lub grupę?|Usunąć {n} próbki i grupy?|Usunąć {n} próbek i grup? @plural {n} Layer|{n} Layers {n} warstwa|{n} warstwy|{n} warstw @plural {n} Object|{n} Objects {n} obiekt|{n} obiekty|{n} obiektów @plural {n} area highlighted|{n} areas highlighted Wyróżniono {n} obszar|Wyróżniono {n} obszary|Wyróżniono {n} obszarów diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index bd4b760a5..8fd2b3ba5 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -663,7 +663,6 @@ Delete Workspace Excluir Espaço de Trabalho Delete the graphic style “{name}”? Excluir o estilo gráfico “{name}”? Delete theme Excluir tema - Delete these {count} swatches and groups? Excluir estas {count} amostras e grupos? Delete this saved preset Excluir este predefinido salvo Delete {kind} Style Excluir Estilo de {kind} Delete “{name}”? Excluir “{name}”? @@ -3028,6 +3027,7 @@ imageTrace Outline Contorno @plural {n} item|{n} items {n} item|{n} itens @plural Color Table ({n} color)|Color Table ({n} colors) Tabela de Cores ({n} cor)|Tabela de Cores ({n} cores) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Excluir este {n} estilo gráfico?|Excluir estes {n} estilos gráficos? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Excluir esta {n} amostra ou grupo?|Excluir estas {n} amostras e grupos? @plural {n} Layer|{n} Layers {n} Camada|{n} Camadas @plural {n} Object|{n} Objects {n} Objeto|{n} Objetos @plural {n} area highlighted|{n} areas highlighted {n} área realçada|{n} áreas realçadas diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index c1e796308..379cf8a93 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -745,7 +745,6 @@ font-technology Variable Вариативные Delete the graphic style “{name}”? Удалить графический стиль «{name}»? Delete Theme Удалить тему Delete theme Удалить тему - Delete these {count} swatches and groups? Удалить эти образцы и группы ({count})? Delete these {n} graphic styles? Удалить эти графические стили ({n})? Delete this saved preset Удалить этот сохранённый набор Delete this {n} graphic style? Удалить этот графический стиль ({n})? @@ -3722,6 +3721,7 @@ imageTrace Outline Контур @plural {n} item|{n} items {n} элемент|{n} элемента|{n} элементов @plural Color Table ({n} color)|Color Table ({n} colors) Цветовая таблица ({n} цвет)|Цветовая таблица ({n} цвета)|Цветовая таблица ({n} цветов) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Удалить этот графический стиль ({n})?|Удалить эти графические стили ({n})?|Удалить эти графические стили ({n})? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Удалить {n} образец или группу?|Удалить {n} образца и группы?|Удалить {n} образцов и групп? @plural {n} Layer|{n} Layers {n} слой|{n} слоя|{n} слоёв @plural {n} Object|{n} Objects {n} объект|{n} объекта|{n} объектов @plural {n} area highlighted|{n} areas highlighted {n} область выделена|{n} области выделено|{n} областей выделено diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 3da858206..df96962c1 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -734,7 +734,6 @@ font-technology Variable Variabla Delete the graphic style “{name}”? Radera grafikstilen ”{name}”? Delete Theme Radera tema Delete theme Radera tema - Delete these {count} swatches and groups? Radera dessa {count} färgrutor och grupper? Delete these {n} graphic styles? Radera dessa {n} grafikstilar? Delete this saved preset Radera den här sparade förinställningen Delete this {n} graphic style? Radera denna {n} grafikstil? @@ -3618,6 +3617,7 @@ imageTrace Outline Kontur @plural {n} item|{n} items {n} objekt|{n} objekt @plural Color Table ({n} color)|Color Table ({n} colors) Färgtabell ({n} färg)|Färgtabell ({n} färger) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Radera {n} grafisk stil?|Radera de här {n} grafiska stilarna? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Radera {n} färgruta eller grupp?|Radera dessa {n} färgrutor och grupper? @plural {n} Layer|{n} Layers {n} lager|{n} lager @plural {n} Object|{n} Objects {n} objekt|{n} objekt @plural {n} area highlighted|{n} areas highlighted {n} område framhävt|{n} områden framhävda diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index ab17bb053..d099149f0 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -726,7 +726,6 @@ font-technology Variable Değişken Delete the graphic style “{name}”? “{name}” grafik stili silinsin mi? Delete Theme Temayı Sil Delete theme Temayı sil - Delete these {count} swatches and groups? Bu {count} renk örnekleri ve grupları silinsin mi? Delete these {n} graphic styles? Bu {n} grafik stilleri silinsin mi? Delete this saved preset Bu kayıtlı ön ayarı silin Delete this {n} graphic style? Bu {n} grafik stili silinsin mi? @@ -3512,6 +3511,7 @@ imageTrace Outline Kontur @plural {n} item|{n} items {n} öğe @plural Color Table ({n} color)|Color Table ({n} colors) Renk Tablosu ({n} renk) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Bu {n} grafik stili silinsin mi? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Bu {n} renk örneği ve grup silinsin mi? @plural {n} Layer|{n} Layers {n} Katman @plural {n} Object|{n} Objects {n} Nesne @plural {n} area highlighted|{n} areas highlighted {n} alan vurgulandı diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index ebf801d5f..632d9c732 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -741,7 +741,6 @@ font-technology Variable Варіативні Delete the graphic style “{name}”? Видалити графічний стиль «{name}»? Delete Theme Видалити тему Delete theme Видалити тему - Delete these {count} swatches and groups? Видалити ці зразки та групи ({count})? Delete these {n} graphic styles? Видалити ці графічні стилі ({n})? Delete this saved preset Видалити цей збережений набір Delete this {n} graphic style? Видалити цей графічний стиль ({n})? @@ -3719,6 +3718,7 @@ imageTrace Outline Контур @plural {n} item|{n} items {n} елемент|{n} елементи|{n} елементів @plural Color Table ({n} color)|Color Table ({n} colors) Таблиця кольорів ({n} колір)|Таблиця кольорів ({n} кольори)|Таблиця кольорів ({n} кольорів) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Видалити цей графічний стиль ({n})?|Видалити ці графічні стилі ({n})?|Видалити ці графічні стилі ({n})? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Видалити {n} зразок або групу?|Видалити {n} зразки та групи?|Видалити {n} зразків і груп? @plural {n} Layer|{n} Layers {n} шар|{n} шари|{n} шарів @plural {n} Object|{n} Objects {n} об’єкт|{n} об’єкти|{n} об’єктів @plural {n} area highlighted|{n} areas highlighted Підсвічено {n} область|Підсвічено {n} області|Підсвічено {n} областей diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index d41165b25..f0c495d4f 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -868,7 +868,6 @@ font-technology Variable Biến thiên Delete the library “{name}”? Xóa thư viện “{name}”? Delete Theme Xóa bộ màu Delete theme Xóa bộ màu - Delete these {count} swatches and groups? Xóa {count} mẫu màu và nhóm này? Delete these {n} graphic styles? Xóa {n} kiểu đồ họa này? Delete this saved preset Xóa thiết lập sẵn đã lưu này Delete this {n} graphic style? Xóa {n} kiểu đồ họa này? @@ -4084,6 +4083,7 @@ gradient-kind Radial Hướng tâm imageTrace Outline Đường viền @plural Color Table ({n} color)|Color Table ({n} colors) Bảng màu ({n} màu) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Xóa {n} kiểu đồ họa này? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Xóa {n} mẫu màu và nhóm này? @plural {n} area highlighted|{n} areas highlighted {n} vùng được tô sáng @plural {n} color|{n} colors {n} màu @plural {n} fill|{n} fills {n} tô diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 0cf85b50d..61defa020 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -690,7 +690,6 @@ Delete the graphic style “{name}”? 要删除图形样式“{name}”吗? Delete Theme 删除主题 Delete theme 删除主题 - Delete these {count} swatches and groups? 要删除这 {count} 个色板和编组吗? Delete these {n} graphic styles? 要删除这 {n} 个图形样式吗? Delete this saved preset 删除此已存储的预设 Delete this {n} graphic style? 要删除这 {n} 个图形样式吗? @@ -3565,6 +3564,7 @@ imageTrace Outline 轮廓 @plural {n} item|{n} items {n} 个项目 @plural Color Table ({n} color)|Color Table ({n} colors) 颜色表 ({n} 色) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? 要删除这 {n} 个图形样式吗? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? 要删除这 {n} 个色板和编组吗? @plural {n} Layer|{n} Layers {n} 个图层 @plural {n} Object|{n} Objects {n} 个对象 @plural {n} area highlighted|{n} areas highlighted 已标示 {n} 个区域 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 47a38972c..423e780b0 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -709,7 +709,6 @@ font-technology Variable 可變 Delete the graphic style “{name}”? 要刪除繪圖樣式「{name}」嗎? Delete Theme 刪除主題 Delete theme 刪除主題 - Delete these {count} swatches and groups? 要刪除這 {count} 個色票和群組嗎? Delete these {n} graphic styles? 要刪除這 {n} 個繪圖樣式嗎? Delete this saved preset 刪除此已儲存的預設集 Delete this {n} graphic style? 要刪除這 {n} 個繪圖樣式嗎? @@ -4542,6 +4541,7 @@ imageTrace Outline 輪廓 @plural {n} item|{n} items {n} 個項目 @plural Color Table ({n} color)|Color Table ({n} colors) 色彩表 ({n} 色) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? 要刪除這 {n} 個繪圖樣式嗎? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? 要刪除這 {n} 個色票和群組嗎? @plural {n} Layer|{n} Layers {n} 個圖層 @plural {n} Object|{n} Objects {n} 個物件 @plural {n} area highlighted|{n} areas highlighted 已標示 {n} 個區域 diff --git a/crates/ui-egui/src/panels/swatches/actions.rs b/crates/ui-egui/src/panels/swatches/actions.rs index 6e9a56fd9..be275c108 100644 --- a/crates/ui-egui/src/panels/swatches/actions.rs +++ b/crates/ui-egui/src/panels/swatches/actions.rs @@ -42,7 +42,7 @@ pub(super) fn delete(app: &mut VectorcraftApp, names: Vec, now: bool) { } let message = match names.as_slice() { [n] => crate::i18n::fmt(tl!("Delete “{name}”?"), &[("name", n)]), - _ => crate::i18n::fmt(tl!("Delete these {count} swatches and groups?"), &[("count", &names.len().to_string())]), + _ => crate::i18n::tn(names.len() as u64, "Delete this {n} swatch or group?", "Delete these {n} swatches and groups?"), }; crate::dialogs::confirm::ask(app, &message, tl!("Art using a deleted global swatch keeps its colour."), "swatch.delete", params); } diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index c65941370..9f6f036e5 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -265,6 +265,26 @@ fn delete_asks_then_removes_the_selection_and_unlinks_art() { assert_eq!(deletable(&["[None]".into(), REGISTRATION.into(), "Grays".into()]), ["Grays"]); } +/// The prompt for several swatches and groups gives the form the language's plural rule picks for the count. +#[test] +fn deleting_several_swatches_uses_each_count_form() { + let mut app = app(); + let mut prompt = |code: &str, count: usize| { + crate::i18n::set_current(crate::i18n::Lang::from_code(code).unwrap()); + let names: Vec = (1..=count).map(|n| format!("Swatch {n}")).collect(); + delete(&mut app, names, false); + let message = app.ui.dialog.as_ref().map(|d| d.str("message")); + crate::dialogs::cancel(&mut app); + crate::i18n::set_current(crate::i18n::Lang::EN); + message + }; + assert_eq!(prompt("pl", 2), Some("Usunąć 2 próbki i grupy?".to_string())); + assert_eq!(prompt("pl", 5), Some("Usunąć 5 próbek i grup?".to_string())); + assert_eq!(prompt("uk", 21), Some("Видалити 21 зразок або групу?".to_string())); + assert_eq!(prompt("uk", 22), Some("Видалити 22 зразки та групи?".to_string())); + assert_eq!(prompt("uk", 25), Some("Видалити 25 зразків і груп?".to_string())); +} + #[test] fn new_swatch_dialog_prefills_the_active_colour_and_saves_into_the_selected_group() { let mut app = app(); diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index a4207f302..416501d55 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -912,6 +912,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **CSS swatch libraries:** fractional linear and radial gradient stop positions are preserved, so nearby stops such as 12.5% and 12.890625% remain distinct instead of collapsing to 13%. Reference: [CSS Images 3 color stops](https://www.w3.org/TR/css-images-3/#color-stop-syntax). The original synthetic regression is `palette_io::tests::css_preserves_fractional_gradient_stop_positions` in `crates/color/src/palette_io.rs`. Scores and hours are unchanged. - **Swatches:** names follow the colour model and are unique; Swatch Options (process/spot, Global, Gray/RGB/HSB/CMYK/Web, live preview); editing a global or spot swatch recolours every linked fill, stroke and text run in one undo step; multi-select and delete with confirmation; New Swatch and New Color Group dialogs (a group from the selected artwork's colours); swatches in colour groups convert, separate and count like any other. The Swatches panel selects ranges and whole groups, has a find field, and drags swatches to reorder, regroup or paint art; Add Used Colors, Select All Unused, Merge, Ungroup and Sort by Kind; a CMYK document keeps applied colours in CMYK. Swatch libraries: nine generated colour libraries and five gradient libraries in a library panel, saved as `.vcswatches`, `.gpl`, swatch exchange (`.ase`) or CSS, and loaded from `.vcswatches`, `.gpl` and `.ase` files (`.ase` both ways: RGB, CMYK, Lab and Gray; global, spot and process; groups) and from color books (`.acb`, read only: the RGB, CMYK or Lab colors of a book such as a Pantone book a user owns, named with its prefix and suffix, spot unless it says process, #831); `swatch.library.copyToUser` copies a loaded library into the User Defined folder without replacing a file, and a file with the same extension and bytes as a User Defined library opens as that library. Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate. Editing, renaming, deleting or merging a global swatch also changes the colors linked to it in graph designs, the art of brushes and the tile that pattern editing's Cancel puts back, in the same undo step as the rest of the art; Default Swatches with replace unlinks them there too. + The prompt for deleting several swatches and groups uses the interface language's plural form for the count. Evidence: `deleting_several_swatches_uses_each_count_form` in `crates/ui-egui/src/panels/swatches/tests.rs`. - **Colorized images (#1466):** a fill color applied to a selected grayscale or 1-bit image (`paint.setFill`) colorizes it with black, white, a process color or a spot color, and refuses a process color when the image has an alpha channel ([Convert color modes](https://web.archive.org/web/20251220223850/https://helpx.adobe.com/illustrator/desktop/manage-colors/select-and-adjust-colors/convert-color-modes.html), "Colorize Grayscale or 1-bit images"); black and white are accepted there too. The canvas draws each pixel in the color as far as the pixel is dark, with white pixels transparent; PDF export writes the image in the color (a spot color as its ink, Registration in every ink) with the image as its soft mask; Separations Preview and printed separations show it on its color's plates; native files keep the color. EPS and SVG write the image's own pixels. - **Missing library files:** a persistent swatch or graphic style library panel whose file is gone at startup reopens and stays in the preferences, showing the file's path with Locate Library… (`ui.libraryPanel.locate`), which reads the file from where it is now into the same panel. - **Swatch library and Recolor Artwork parameters:** the `swatch.library.*` commands, `swatch.resetDefaults`, the graphic style library save, load and add, the `recolor.*` commands and `color.harmony`'s `limitTo` refuse parameters of the wrong form, such as `names: "Grays"`, `limitTo: 5` or `includeImages: "false"`. Errors name the parameter, except that a `limitTo` that is not a string, such as `5`, gets an unknown-library error. A `null` counts as left out except for `recolor.apply`'s `model`, which must be a string when given. From 541a6c33f0647c93bdb436ca64a3d925b78afe29 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 31 Oct 2026 00:05:16 -0700 Subject: [PATCH 2/3] Swatches: the Ukrainian, Russian and Bosnian delete prompt for 21 or 31 items names swatches and groups In these languages a count ending in 1 (other than 11) takes the singular form, which read as one swatch or one group. That form now names swatches and groups with the count in parentheses. --- crates/ui-egui/src/i18n/bs.tsv | 2 +- crates/ui-egui/src/i18n/ru.tsv | 2 +- crates/ui-egui/src/i18n/uk.tsv | 2 +- crates/ui-egui/src/panels/swatches/tests.rs | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index f356047ee..1c0416e67 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -4087,7 +4087,7 @@ imageTrace Outline Obris @plural {n} item|{n} items {n} stavka|{n} stavke|{n} stavki @plural Color Table ({n} color)|Color Table ({n} colors) Tabela boja ({n} boja)|Tabela boja ({n} boje)|Tabela boja ({n} boja) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Izbrisati ovaj {n} grafički stil?|Izbrisati ova {n} grafička stila?|Izbrisati ovih {n} grafičkih stilova? -@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Izbrisati {n} uzorak boje ili grupu?|Izbrisati {n} uzorka boja i grupe?|Izbrisati {n} uzoraka boja i grupa? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Izbrisati uzorke boja i grupe ({n})?|Izbrisati {n} uzorka boja i grupe?|Izbrisati {n} uzoraka boja i grupa? @plural {n} Layer|{n} Layers {n} sloj|{n} sloja|{n} slojeva @plural {n} Object|{n} Objects {n} objekat|{n} objekta|{n} objekata @plural {n} area highlighted|{n} areas highlighted Istaknuto {n} područje|Istaknuta {n} područja|Istaknuto {n} područja diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 379cf8a93..b605f9277 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -3721,7 +3721,7 @@ imageTrace Outline Контур @plural {n} item|{n} items {n} элемент|{n} элемента|{n} элементов @plural Color Table ({n} color)|Color Table ({n} colors) Цветовая таблица ({n} цвет)|Цветовая таблица ({n} цвета)|Цветовая таблица ({n} цветов) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Удалить этот графический стиль ({n})?|Удалить эти графические стили ({n})?|Удалить эти графические стили ({n})? -@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Удалить {n} образец или группу?|Удалить {n} образца и группы?|Удалить {n} образцов и групп? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Удалить образцы и группы ({n})?|Удалить {n} образца и группы?|Удалить {n} образцов и групп? @plural {n} Layer|{n} Layers {n} слой|{n} слоя|{n} слоёв @plural {n} Object|{n} Objects {n} объект|{n} объекта|{n} объектов @plural {n} area highlighted|{n} areas highlighted {n} область выделена|{n} области выделено|{n} областей выделено diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 632d9c732..9454d2f36 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -3718,7 +3718,7 @@ imageTrace Outline Контур @plural {n} item|{n} items {n} елемент|{n} елементи|{n} елементів @plural Color Table ({n} color)|Color Table ({n} colors) Таблиця кольорів ({n} колір)|Таблиця кольорів ({n} кольори)|Таблиця кольорів ({n} кольорів) @plural Delete this {n} graphic style?|Delete these {n} graphic styles? Видалити цей графічний стиль ({n})?|Видалити ці графічні стилі ({n})?|Видалити ці графічні стилі ({n})? -@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Видалити {n} зразок або групу?|Видалити {n} зразки та групи?|Видалити {n} зразків і груп? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Видалити зразки та групи ({n})?|Видалити {n} зразки та групи?|Видалити {n} зразків і груп? @plural {n} Layer|{n} Layers {n} шар|{n} шари|{n} шарів @plural {n} Object|{n} Objects {n} об’єкт|{n} об’єкти|{n} об’єктів @plural {n} area highlighted|{n} areas highlighted Підсвічено {n} область|Підсвічено {n} області|Підсвічено {n} областей diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs index 9f6f036e5..c649e282b 100644 --- a/crates/ui-egui/src/panels/swatches/tests.rs +++ b/crates/ui-egui/src/panels/swatches/tests.rs @@ -280,7 +280,9 @@ fn deleting_several_swatches_uses_each_count_form() { }; assert_eq!(prompt("pl", 2), Some("Usunąć 2 próbki i grupy?".to_string())); assert_eq!(prompt("pl", 5), Some("Usunąć 5 próbek i grup?".to_string())); - assert_eq!(prompt("uk", 21), Some("Видалити 21 зразок або групу?".to_string())); + assert_eq!(prompt("uk", 21), Some("Видалити зразки та групи (21)?".to_string())); + assert_eq!(prompt("ru", 21), Some("Удалить образцы и группы (21)?".to_string())); + assert_eq!(prompt("bs", 21), Some("Izbrisati uzorke boja i grupe (21)?".to_string())); assert_eq!(prompt("uk", 22), Some("Видалити 22 зразки та групи?".to_string())); assert_eq!(prompt("uk", 25), Some("Видалити 25 зразків і груп?".to_string())); } From 9dcbe3688e38393a56d4f9a722bfd0643d436f6c Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 31 Oct 2026 00:14:07 -0700 Subject: [PATCH 3/3] Swatches: the French one-item delete prompt keeps the no-break space before ? --- crates/ui-egui/src/i18n/fr.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index e6c5ef0be..fae329cc5 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -749,7 +749,7 @@ font-technology Variable Variables Delete the graphic style “{name}”? Supprimer le style graphique « {name} » ? Delete Theme Supprimer le thème Delete theme Supprimer le thème -@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Supprimer {n} nuance ou groupe ?|Supprimer ces {n} nuances et groupes ? +@plural Delete this {n} swatch or group?|Delete these {n} swatches and groups? Supprimer {n} nuance ou groupe ?|Supprimer ces {n} nuances et groupes ? Delete these {n} graphic styles? Supprimer ces {n} styles graphiques ? Delete this saved preset Supprimer ce paramètre prédéfini enregistré Delete this {n} graphic style? Supprimer {n} style graphique ?