From a5a282792405f43b0fa7ae876e9f5bc62636777e Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 16:08:24 -0800 Subject: [PATCH 1/4] i18n: translate the reworded symbol.options error in every catalog The error that asks for at least one Symbol Options field now also names alignToPixelGrid. Each catalog's row for the old wording is replaced with a row for the new one, so the message is translated again. --- 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/hi.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 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index c18df53992..819a6488e5 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -6805,7 +6805,7 @@ breakText Glyphs Глифи @msg stroke cannot be set on a symbol instance stroke не може да се задава за екземпляр на символ @msg fill on a symbol instance must be a solid color or none fill на екземпляр на символ трябва да е плътен цвят или none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} не може да се задава за изображение без ефект „Конвертиране в фигура“ или „Преобразуване на обекта в контур“ -@msg pass newName, registration, exportType, nineSlice and/or type задайте newName, registration, exportType, nineSlice и/или type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid задайте newName, registration, exportType, nineSlice, type и/или alignToPixelGrid Text Flow Поток на текста By Rows По редове By Columns По колони diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 3484e06bdf..419701f804 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -6857,7 +6857,7 @@ shape Open Otvoren @msg stroke cannot be set on a symbol instance stroke se ne može postaviti na instancu simbola @msg fill on a symbol instance must be a solid color or none fill instance simbola mora biti puna boja ili none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} se ne može postaviti na sliku bez efekta „Pretvori u oblik“ ili „Objekat u obrisu“ -@msg pass newName, registration, exportType, nineSlice and/or type navedite newName, registration, exportType, nineSlice i/ili type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid navedite newName, registration, exportType, nineSlice, type i/ili alignToPixelGrid Text Flow Tok teksta By Rows Po redovima By Columns Po kolonama diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 5970f572d8..5ddc80126e 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -7468,7 +7468,7 @@ breakText Glyphs Glifs @msg stroke cannot be set on a symbol instance stroke no es pot definir en una instància de símbol @msg fill on a symbol instance must be a solid color or none el fill d’una instància de símbol ha de ser un color sòlid o none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} no es pot definir en una imatge sense l’efecte Converteix en forma o Contorneja l’objecte -@msg pass newName, registration, exportType, nineSlice and/or type indiqueu newName, registration, exportType, nineSlice i/o type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid indiqueu newName, registration, exportType, nineSlice, type i/o alignToPixelGrid Text Flow Flux del text By Rows Per files By Columns Per columnes diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 3aecd729a9..b9d782b8a1 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -7472,7 +7472,7 @@ breakText Glyphs Glyfy @msg stroke cannot be set on a symbol instance stroke nelze nastavit u instance symbolu @msg fill on a symbol instance must be a solid color or none fill instance symbolu musí být plná barva nebo none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} nelze nastavit u obrazu bez efektu Převést na tvar nebo Převést objekt na obrys -@msg pass newName, registration, exportType, nineSlice and/or type zadejte newName, registration, exportType, nineSlice a/nebo type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid zadejte newName, registration, exportType, nineSlice, type a/nebo alignToPixelGrid Text Flow Tok textu By Rows Po řádcích By Columns Po sloupcích diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 59a09bca8b..0788b34379 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -9510,7 +9510,7 @@ breakText Glyphs Glyffer @msg stroke cannot be set on a symbol instance stroke kan ikke angives for en symbolforekomst @msg fill on a symbol instance must be a solid color or none fill på en symbolforekomst skal være en ensfarvet farve eller none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} kan ikke angives for et billede uden effekten Konvertér til form eller Objekt til kontur -@msg pass newName, registration, exportType, nineSlice and/or type angiv newName, registration, exportType, nineSlice og/eller type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid angiv newName, registration, exportType, nineSlice, type og/eller alignToPixelGrid Text Flow Tekstflow By Rows Efter rækker By Columns Efter kolonner diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index afa0451e48..5a7f79a9c2 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -7063,7 +7063,7 @@ breakText Glyphs Glyphen @msg stroke cannot be set on a symbol instance stroke kann nicht für eine Symbolinstanz gesetzt werden @msg fill on a symbol instance must be a solid color or none fill einer Symbolinstanz muss eine Vollfarbe oder none sein @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} kann nicht für ein Bild ohne den Effekt „In Form umwandeln“ oder „Objekt in Pfade umwandeln“ gesetzt werden -@msg pass newName, registration, exportType, nineSlice and/or type geben Sie newName, registration, exportType, nineSlice und/oder type an +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid geben Sie newName, registration, exportType, nineSlice, type und/oder alignToPixelGrid an Text Flow Textfluss By Rows Nach Zeilen By Columns Nach Spalten diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 726e0630a0..cd9277bf96 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -7441,7 +7441,7 @@ breakText Glyphs Γλύφοι @msg stroke cannot be set on a symbol instance το stroke δεν μπορεί να οριστεί σε στιγμιότυπο συμβόλου @msg fill on a symbol instance must be a solid color or none το fill ενός στιγμιότυπου συμβόλου πρέπει να είναι συμπαγές χρώμα ή none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it το {key} δεν μπορεί να οριστεί σε εικόνα χωρίς το εφέ «Μετατροπή σε σχήμα» ή «Μετατροπή αντικειμένου σε περιγράμματα» -@msg pass newName, registration, exportType, nineSlice and/or type δώστε newName, registration, exportType, nineSlice ή/και type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid δώστε newName, registration, exportType, nineSlice, type ή/και alignToPixelGrid Text Flow Ροή κειμένου By Rows Κατά γραμμές By Columns Κατά στήλες diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index c668971d37..fb81283e20 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -7429,7 +7429,7 @@ breakText Glyphs Glifos @msg stroke cannot be set on a symbol instance stroke no se puede definir en una instancia de símbolo @msg fill on a symbol instance must be a solid color or none el fill de una instancia de símbolo debe ser un color sólido o none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} no se puede definir en una imagen sin el efecto Convertir en forma o Contornear objeto -@msg pass newName, registration, exportType, nineSlice and/or type indique newName, registration, exportType, nineSlice y/o type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid indique newName, registration, exportType, nineSlice, type y/o alignToPixelGrid Text Flow Flujo de texto By Rows Por filas By Columns Por columnas diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 08a84268a7..5c30a92099 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -7517,7 +7517,7 @@ breakText Glyphs Merkit @msg stroke cannot be set on a symbol instance stroke-arvoa ei voi asettaa symbolin ilmentymälle @msg fill on a symbol instance must be a solid color or none symbolin ilmentymän fill-arvon on oltava tasainen väri tai none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key}-arvoa ei voi asettaa kuvalle, jolla ei ole tehostetta Muunna muodoksi tai Muunna objekti ääriviivoiksi -@msg pass newName, registration, exportType, nineSlice and/or type anna newName, registration, exportType, nineSlice ja/tai type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid anna newName, registration, exportType, nineSlice, type ja/tai alignToPixelGrid Text Flow Tekstin kulku By Rows Riveittäin By Columns Sarakkeittain diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 197e20565c..e76a0b0ce5 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -7467,7 +7467,7 @@ breakText Glyphs Glyphes @msg stroke cannot be set on a symbol instance stroke ne peut pas être défini sur une instance de symbole @msg fill on a symbol instance must be a solid color or none le fill d’une instance de symbole doit être une couleur unie ou none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} ne peut pas être défini sur une image sans l’effet Convertir en forme ou Vectoriser l’objet -@msg pass newName, registration, exportType, nineSlice and/or type indiquez newName, registration, exportType, nineSlice et/ou type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid indiquez newName, registration, exportType, nineSlice, type et/ou alignToPixelGrid Text Flow Flux du texte By Rows Par lignes By Columns Par colonnes diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 2014f66fdc..8d71e16c69 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -7868,7 +7868,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg parameters must be an object parameters एक ऑब्जेक्ट होना चाहिए @msg params must be an object params एक ऑब्जेक्ट होना चाहिए @msg part of the program isn't valid PostScript text कार्यक्रम का हिस्सा मान्य नहीं है PostScript टेक्स्ट -@msg pass newName, registration, exportType, nineSlice and/or type newName, registration, exportType, nineSlice और/या type दें +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid newName, registration, exportType, nineSlice, type और/या alignToPixelGrid दें @msg passwords can have up to {MAX_PASSWORD} bytes पासवर्ड {MAX_PASSWORD} बाइट्स तक हो सकता है @msg paste unavailable पेस्ट करें अनुपलब्ध @msg Pasting चिपकाना diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 9b536ed556..8226922371 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -7457,7 +7457,7 @@ breakText Glyphs Glifák @msg stroke cannot be set on a symbol instance a stroke nem állítható be szimbólumpéldányon @msg fill on a symbol instance must be a solid color or none a szimbólumpéldány fill értéke csak egyszínű szín vagy none lehet @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it a {key} nem állítható be olyan képen, amelyen nincs Átalakítás alakzattá vagy Objektum útvonallá alakítása effektus -@msg pass newName, registration, exportType, nineSlice and/or type adja meg a newName, registration, exportType, nineSlice és/vagy type értékét +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid adja meg a newName, registration, exportType, nineSlice, type és/vagy alignToPixelGrid értékét Text Flow Szövegfolyás By Rows Soronként By Columns Oszloponként diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 760f0b591a..35fd9cc3ad 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -6820,7 +6820,7 @@ breakText Glyphs Glif @msg stroke cannot be set on a symbol instance stroke tidak dapat diatur pada instans simbol @msg fill on a symbol instance must be a solid color or none fill pada instans simbol harus berupa warna solid atau none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} tidak dapat diatur pada gambar tanpa efek Konversi ke bentuk atau Kerangka objek -@msg pass newName, registration, exportType, nineSlice and/or type berikan newName, registration, exportType, nineSlice dan/atau type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid berikan newName, registration, exportType, nineSlice, type dan/atau alignToPixelGrid Text Flow Alur teks By Rows Per baris By Columns Per kolom diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 2540830b01..6e8752b0fd 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -7099,7 +7099,7 @@ breakText Glyphs Glifi @msg stroke cannot be set on a symbol instance stroke non può essere impostato su un’istanza di simbolo @msg fill on a symbol instance must be a solid color or none il fill di un’istanza di simbolo deve essere un colore pieno o none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} non può essere impostato su un’immagine senza l’effetto Converti in forma o Contorna oggetto -@msg pass newName, registration, exportType, nineSlice and/or type specifica newName, registration, exportType, nineSlice e/o type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid specifica newName, registration, exportType, nineSlice, type e/o alignToPixelGrid Text Flow Flusso del testo By Rows Per righe By Columns Per colonne diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 084c59e9a0..516e2c318b 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -8976,7 +8976,7 @@ breakText Glyphs 字形 @msg stroke cannot be set on a symbol instance シンボルインスタンスには stroke を設定できません @msg fill on a symbol instance must be a solid color or none シンボルインスタンスの fill は単色または none にしてください @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it 「シェイプに変換」または「オブジェクトのアウトライン」効果のない画像には {key} を設定できません -@msg pass newName, registration, exportType, nineSlice and/or type newName、registration、exportType、nineSlice、type のいずれかを指定してください +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid newName、registration、exportType、nineSlice、type、alignToPixelGrid のいずれかを指定してください Text Flow テキストの流れ By Rows 行方向 By Columns 列方向 diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index bd069f4b9b..aed4c10348 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -9607,7 +9607,7 @@ breakText Glyphs გლიფები @msg stroke cannot be set on a symbol instance stroke ვერ დაყენდება სიმბოლოს ეგზემპლარზე @msg fill on a symbol instance must be a solid color or none სიმბოლოს ეგზემპლარის fill უნდა იყოს ერთფეროვანი ფერი ან none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} ვერ დაყენდება გამოსახულებაზე „ფიგურად გარდაქმნის“ ან „ობიექტის კონტურებად გარდაქმნის“ ეფექტის გარეშე -@msg pass newName, registration, exportType, nineSlice and/or type მიუთითეთ newName, registration, exportType, nineSlice და/ან type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid მიუთითეთ newName, registration, exportType, nineSlice, type და/ან alignToPixelGrid Text Flow ტექსტის დინება By Rows სტრიქონების მიხედვით By Columns სვეტების მიხედვით diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 239a805465..c7e040e4f5 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -7063,7 +7063,7 @@ breakText Glyphs 글리프 @msg stroke cannot be set on a symbol instance 심볼 인스턴스에는 stroke를 설정할 수 없습니다 @msg fill on a symbol instance must be a solid color or none 심볼 인스턴스의 fill은 단색 또는 none이어야 합니다 @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it 모양으로 변환 또는 개체 윤곽선화 효과가 없는 이미지에는 {key}을(를) 설정할 수 없습니다 -@msg pass newName, registration, exportType, nineSlice and/or type newName, registration, exportType, nineSlice 및/또는 type을 지정하세요 +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid newName, registration, exportType, nineSlice, type 및/또는 alignToPixelGrid을 지정하세요 Text Flow 텍스트 흐름 By Rows 행 방향 By Columns 열 방향 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 2f98ee84fe..b289bd15d4 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -9346,7 +9346,7 @@ breakText Glyphs Glyphs @msg stroke cannot be set on a symbol instance stroke kan niet worden ingesteld op een symboolinstantie @msg fill on a symbol instance must be a solid color or none fill van een symboolinstantie moet een egale kleur of none zijn @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} kan niet worden ingesteld op een afbeelding zonder het effect Converteren naar vorm of Object omtrekken -@msg pass newName, registration, exportType, nineSlice and/or type geef newName, registration, exportType, nineSlice en/of type op +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid geef newName, registration, exportType, nineSlice, type en/of alignToPixelGrid op Text Flow Tekstdoorloop By Rows Per rij By Columns Per kolom diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index bf8c7593a1..6293ddf5f9 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -7328,7 +7328,7 @@ breakText Glyphs Glify @msg stroke cannot be set on a symbol instance nie można ustawić stroke dla wystąpienia symbolu @msg fill on a symbol instance must be a solid color or none fill wystąpienia symbolu musi być jednolitym kolorem lub none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it nie można ustawić {key} dla obrazu bez efektu Konwertuj na kształt lub Kontur obiektu -@msg pass newName, registration, exportType, nineSlice and/or type podaj newName, registration, exportType, nineSlice i/lub type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid podaj newName, registration, exportType, nineSlice, type i/lub alignToPixelGrid Text Flow Przepływ tekstu By Rows Wierszami By Columns Kolumnami diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 03b9998eb2..ac622720ed 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -7503,7 +7503,7 @@ breakText Glyphs Glifos @msg stroke cannot be set on a symbol instance stroke não pode ser definido em uma instância de símbolo @msg fill on a symbol instance must be a solid color or none o fill de uma instância de símbolo deve ser uma cor sólida ou none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} não pode ser definido em uma imagem sem o efeito Converter em Forma ou Contornar Objeto -@msg pass newName, registration, exportType, nineSlice and/or type informe newName, registration, exportType, nineSlice e/ou type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid informe newName, registration, exportType, nineSlice, type e/ou alignToPixelGrid # Strings the sibling catalogs translate that pt-BR did not yet cover (translated 2026-10-31). on the canvas to create one na tela para criar um 1 Layer 1 camada diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index a729b05460..71af9c062b 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -7462,7 +7462,7 @@ breakText Glyphs Глифы @msg stroke cannot be set on a symbol instance stroke нельзя задать для экземпляра символа @msg fill on a symbol instance must be a solid color or none fill экземпляра символа должен быть сплошным цветом или none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} нельзя задать для изображения без эффекта «Преобразовать в фигуру» или «Обвести объект» -@msg pass newName, registration, exportType, nineSlice and/or type укажите newName, registration, exportType, nineSlice и/или type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid укажите newName, registration, exportType, nineSlice, type и/или alignToPixelGrid Text Flow Поток текста By Rows По строкам By Columns По столбцам diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index d4c923d87d..31bd152ac4 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -7488,7 +7488,7 @@ breakText Glyphs Glyfer @msg stroke cannot be set on a symbol instance stroke kan inte anges för en symbolinstans @msg fill on a symbol instance must be a solid color or none fill för en symbolinstans måste vara en enfärgad färg eller none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} kan inte anges för en bild utan effekten Konvertera till form eller Konvertera objekt till konturer -@msg pass newName, registration, exportType, nineSlice and/or type ange newName, registration, exportType, nineSlice och/eller type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid ange newName, registration, exportType, nineSlice, type och/eller alignToPixelGrid Text Flow Textflöde By Rows Radvis By Columns Kolumnvis diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 2017637952..f536115ef3 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -9350,7 +9350,7 @@ breakText Glyphs Glifler @msg stroke cannot be set on a symbol instance stroke bir sembol örneğinde ayarlanamaz @msg fill on a symbol instance must be a solid color or none bir sembol örneğinin fill değeri düz renk veya none olmalıdır @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key}, Şekle Dönüştür veya Anahat Nesnesi efekti olmayan bir görüntüde ayarlanamaz -@msg pass newName, registration, exportType, nineSlice and/or type newName, registration, exportType, nineSlice ve/veya type verin +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid newName, registration, exportType, nineSlice, type ve/veya alignToPixelGrid verin Text Flow Metin Akışı By Rows Satırlara Göre By Columns Sütunlara Göre diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 53ca6b8a43..cfea3031e8 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7081,7 +7081,7 @@ breakText Glyphs Гліфи @msg stroke cannot be set on a symbol instance stroke не можна задати для екземпляра символу @msg fill on a symbol instance must be a solid color or none fill екземпляра символу має бути суцільним кольором або none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it {key} не можна задати для зображення без ефекту «Перетворити на фігуру» або «Обвести об’єкт» -@msg pass newName, registration, exportType, nineSlice and/or type вкажіть newName, registration, exportType, nineSlice та/або type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid вкажіть newName, registration, exportType, nineSlice, type та/або alignToPixelGrid Text Flow Потік тексту By Rows За рядками By Columns За стовпцями diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 7dcf6219fd..d599ffb419 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -7098,7 +7098,7 @@ breakText Glyphs Glyph @msg stroke cannot be set on a symbol instance không thể đặt stroke cho thực thể ký hiệu @msg fill on a symbol instance must be a solid color or none fill của thực thể ký hiệu phải là màu đặc hoặc none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it không thể đặt {key} cho hình ảnh không có hiệu ứng Chuyển thành hình dạng hoặc Đường bao đối tượng -@msg pass newName, registration, exportType, nineSlice and/or type hãy cung cấp newName, registration, exportType, nineSlice và/hoặc type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid hãy cung cấp newName, registration, exportType, nineSlice, type và/hoặc alignToPixelGrid Text Flow Luồng văn bản By Rows Theo hàng By Columns Theo cột diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 5c8ea12be7..18cb41974d 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -7313,7 +7313,7 @@ breakText Glyphs 字形 @msg stroke cannot be set on a symbol instance 无法为符号实例设置 stroke @msg fill on a symbol instance must be a solid color or none 符号实例的 fill 必须是纯色或 none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it 无法为没有“转换为形状”或“轮廓化对象”效果的图像设置 {key} -@msg pass newName, registration, exportType, nineSlice and/or type 请提供 newName、registration、exportType、nineSlice 和/或 type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid 请提供 newName、registration、exportType、nineSlice、type 和/或 alignToPixelGrid Text Flow 文本流向 By Rows 按行 By Columns 按列 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 2134e31d7f..6bffbba9bf 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -7122,7 +7122,7 @@ breakText Glyphs 字符 @msg stroke cannot be set on a symbol instance 無法為符號範例設定 stroke @msg fill on a symbol instance must be a solid color or none 符號範例的 fill 必須是純色或 none @msg {key} cannot be set on an image without a Convert to Shape or Outline Object effect on it 無法為沒有「轉換為形狀」或「外框物件」效果的影像設定 {key} -@msg pass newName, registration, exportType, nineSlice and/or type 請提供 newName、registration、exportType、nineSlice 和/或 type +@msg pass newName, registration, exportType, nineSlice, type and/or alignToPixelGrid 請提供 newName、registration、exportType、nineSlice、type 和/或 alignToPixelGrid Text Flow 文字流向 By Rows 依列 By Columns 依欄 From 3d0900bd77f207e4354458f2a3949a6237a466d3 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 16:39:20 -0800 Subject: [PATCH 2/4] Symbols: a symbol instance snapped to the pixel grid takes its linked mask along Snapping an instance of a pixel-aligned symbol to whole points set its transform directly, so the art of a linked opacity mask stayed at the old fractional position and shifted against the artwork. The instance now moves as any move moves it, and the art of an unlinked mask stays where it is. --- crates/engine/src/cmd/object/pixelgrid.rs | 12 ++++++-- crates/engine/src/tests/pixelalign.rs | 34 +++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/crates/engine/src/cmd/object/pixelgrid.rs b/crates/engine/src/cmd/object/pixelgrid.rs index a8bb12b429..ba95db0d69 100644 --- a/crates/engine/src/cmd/object/pixelgrid.rs +++ b/crates/engine/src/cmd/object/pixelgrid.rs @@ -358,9 +358,10 @@ fn snap_mask(n: &mut Node) -> bool { /// Move symbol instance `n` to whole points when its transform places its symbol's art at the /// symbol's natural size (`natural`, by symbol name), reflected across one axis or not. A scaled, -/// rotated (a half turn included) or sheared instance stays where it is. +/// rotated (a half turn included) or sheared instance stays where it is. The instance moves as any +/// move moves it ([`Node::transform`]), so the art of a linked opacity mask moves with it. fn snap_instance(n: &mut Node, natural: &HashMap) { - let NodeKind::SymbolInstance { symbol, xf } = &mut n.kind else { return }; + let NodeKind::SymbolInstance { symbol, xf } = &n.kind else { return }; let Some(nat) = natural.get(symbol.as_str()) else { return }; let [a, b, c, d, e, f] = xf.as_coeffs(); let [na, _, _, nd, _, _] = nat.as_coeffs(); @@ -373,7 +374,12 @@ fn snap_instance(n: &mut Node, natural: &HashMap) { return; } let (x, y) = (e.round(), f.round()); - if x != e || y != f { + if x == e && y == f { + return; + } + n.transform(Affine::translate((x - e, y - f)), Scaling::default()); + // Whole points exactly, which adding the offset to the old position need not give. + if let NodeKind::SymbolInstance { xf, .. } = &mut n.kind { *xf = Affine::new([a, b, c, d, x, y]); } } diff --git a/crates/engine/src/tests/pixelalign.rs b/crates/engine/src/tests/pixelalign.rs index b70098d9c9..1258ae58da 100644 --- a/crates/engine/src/tests/pixelalign.rs +++ b/crates/engine/src/tests/pixelalign.rs @@ -1436,6 +1436,40 @@ fn an_instance_in_an_opacity_mask_snaps_with_its_symbol() { assert!(whole(&[(e, f)]), "{e} {f}"); } +/// An instance snapped to whole points takes the art of its linked opacity mask along by the same +/// amount, as a move does; the art of an unlinked mask stays where it is. +#[test] +fn an_instance_snapped_to_the_grid_moves_its_linked_mask() { + let mut s = new_doc(); + path(&mut s, "M10.3 20.6 L40.7 20.6 L40.7 30.3 L10.3 30.3 Z", 2.0); + s.execute("symbol.new", &json!({"name": "Px"})).unwrap(); + let place = |s: &mut Session, x: f64, linked: bool| { + let inst = s.execute("symbol.place", &json!({"name": "Px", "x": x, "y": 200.7})).unwrap()["id"].as_u64().unwrap(); + let m = path(s, "M80.25 180.5 L160.25 180.5 L160.25 240.5 L80.25 240.5 Z", 1.0); + let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc); + let art = d.remove(NodeId(m)).unwrap(); + let mask = vectorcraft_doc::OpacityMask { linked, ..vectorcraft_doc::OpacityMask::new((*art).clone(), true) }; + d.node_mut(NodeId(inst)).unwrap().extras_mut().mask = Some(Box::new(mask)); + inst + }; + let (linked, unlinked) = (place(&mut s, 100.3, true), place(&mut s, 300.3, false)); + let mask_points = |s: &Session, inst: u64| { + let d = &s.doc().unwrap().doc; + let mask = d.node(NodeId(inst)).unwrap().extras().mask.clone().unwrap(); + mask.art.path_data().unwrap().anchors().map(|(_, _, a)| (a.p.x, a.p.y)).collect::>() + }; + let (xf_before, mask_before, unlinked_before) = (instance_xf(&s, linked), mask_points(&s, linked), mask_points(&s, unlinked)); + s.execute("symbol.options", &json!({"name": "Px", "alignToPixelGrid": true})).unwrap(); + let [.., e0, f0] = xf_before.as_coeffs(); + let [.., e, f] = instance_xf(&s, linked).as_coeffs(); + assert!(whole(&[(e, f)]) && (e, f) != (e0, f0), "{e} {f}"); + let moved: Vec<_> = mask_before.iter().map(|(x, y)| (x + e - e0, y + f - f0)).collect(); + let after = mask_points(&s, linked); + assert!(moved.iter().zip(&after).all(|(a, b)| close(*a, *b)), "{after:?} != {moved:?}"); + assert!(whole(&placed_points(&s, unlinked))); + assert_eq!(mask_points(&s, unlinked), unlinked_before); +} + /// While a pixel-aligned symbol is edited, the art written back from the editing layer is stored /// on the pixel grid, so its instances stay on it. #[test] From fa42ea6dc8bff86d70d7179c357a00d3f8e67a2c Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 16:49:19 -0800 Subject: [PATCH 3/4] Symbols: snap a pixel-aligned symbol's instances again only when its editing mode ends While a pixel-aligned symbol was open in symbol editing mode, every edit snapped its art and walked the whole document for its instances, even when the art did not change. That pass now runs when editing mode for the symbol ends; edits that change the art still snap it and its instances. --- crates/engine/src/cmd/object/pixelgrid.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/crates/engine/src/cmd/object/pixelgrid.rs b/crates/engine/src/cmd/object/pixelgrid.rs index ba95db0d69..5cfc22b7f8 100644 --- a/crates/engine/src/cmd/object/pixelgrid.rs +++ b/crates/engine/src/cmd/object/pixelgrid.rs @@ -174,7 +174,10 @@ fn refresh_symbols(before: &Document, doc: &mut Document) { return; } let was = before.pixel_aligned_symbols(); + // The symbol whose editing mode this edit ended, if any. let edited_before = before.symbol_edit.as_ref().map(|e| e.symbol.as_str()); + let edited_now = doc.symbol_edit.as_ref().map(|e| e.symbol.as_str()); + let edit_ended = edited_before.filter(|b| edited_now != Some(*b)).map(str::to_owned); let mut every = false; for name in &aligned { let art_before = before.symbols.iter().find(|s| &s.name == name).map(|s| &s.art); @@ -184,7 +187,7 @@ fn refresh_symbols(before: &Document, doc: &mut Document) { _ => true, }; let size_changed = before.symbol_natural_xf(name) != doc.symbol_natural_xf(name); - if !was.contains(name) || edited_before == Some(name.as_str()) || art_changed || size_changed { + if !was.contains(name) || edit_ended.as_deref() == Some(name.as_str()) || art_changed || size_changed { snap_symbol_art(doc, name); every = true; } From 2a973becbc8723d2fa7253e5dcbf35d30bfc10ca Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sun, 15 Nov 2026 17:15:50 -0800 Subject: [PATCH 4/4] Symbols: Align to Pixel Grid leaves symbol editing layers to their symbol - An instance of a pixel-aligned symbol on another symbol's editing layer is part of that symbol's art, so it is no longer snapped and written into that art. - Turning Align to Pixel Grid on for the symbol being edited now writes its art back and shows it snapped on the editing layer at once, instead of after the next edit. --- crates/engine/src/cmd/object/pixelgrid.rs | 15 ++++++-- crates/engine/src/cmd/symboledit.rs | 3 +- crates/engine/src/tests/pixelalign.rs | 46 +++++++++++++++++++++++ 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/crates/engine/src/cmd/object/pixelgrid.rs b/crates/engine/src/cmd/object/pixelgrid.rs index 5cfc22b7f8..8d2a344ffe 100644 --- a/crates/engine/src/cmd/object/pixelgrid.rs +++ b/crates/engine/src/cmd/object/pixelgrid.rs @@ -166,8 +166,8 @@ const ACTUAL_SIZE_TOLERANCE: f64 = 1e-9; /// (while it is edited, the art snaps as the editing layer is written back to it). Every instance /// of such a symbol then goes to whole points ([`snap_instance`]), and so does each instance of a /// pixel-aligned symbol in an object the edit changed or added, the art of opacity masks included. -/// An instance in another symbol's art is placed by that symbol's instances and is left as it is. -/// A document without pixel-aligned symbols is not walked. +/// An instance in another symbol's art, the art on the symbol editing layer included, is placed by +/// that symbol's instances and is left as it is. A document without pixel-aligned symbols is not walked. fn refresh_symbols(before: &Document, doc: &mut Document) { let aligned = doc.pixel_aligned_symbols(); if aligned.is_empty() { @@ -193,16 +193,23 @@ fn refresh_symbols(before: &Document, doc: &mut Document) { } } let natural: HashMap = aligned.iter().map(|name| (name.clone(), doc.symbol_natural_xf(name))).collect(); + // The symbol editing layer holds another symbol's art. + let editing = doc.symbol_edit.as_ref().map(|e| e.layer); if every { for layer in doc.layers.iter_mut() { - if holds_instance(layer, &natural) { + if Some(layer.id) != editing && holds_instance(layer, &natural) { snap_instances_in(Arc::make_mut(layer), &natural); } } return; } let (mut ids, mut masked) = (vec![], vec![]); - changed_instances(&before.layers, &doc.layers, &natural, &mut ids, &mut masked); + if let Some(layer) = editing { + let outside = |layers: &[Arc]| layers.iter().filter(|l| l.id != layer).cloned().collect::>(); + changed_instances(&outside(&before.layers), &outside(&doc.layers), &natural, &mut ids, &mut masked); + } else { + changed_instances(&before.layers, &doc.layers, &natural, &mut ids, &mut masked); + } for id in ids { if let Some(n) = doc.node_mut(id) { snap_instance(n, &natural); diff --git a/crates/engine/src/cmd/symboledit.rs b/crates/engine/src/cmd/symboledit.rs index c3fc9a4392..77266b5aaa 100644 --- a/crates/engine/src/cmd/symboledit.rs +++ b/crates/engine/src/cmd/symboledit.rs @@ -495,7 +495,8 @@ pub(crate) fn sync(before: &Document, d: &mut Document) -> Result<()> { let (old, old_group) = match before.symbol_edit.as_ref().filter(|b| b.layer == se.layer) { None => return Ok(()), Some(b) => match art_of(before) { - Some(old) if same(&old) => return Ok(()), + // Turning on Align to Pixel Grid writes the art back too, so the layer shows it snapped. + Some(old) if same(&old) && (before.symbol_pixel_aligned(&se.symbol) || !d.symbol_pixel_aligned(&se.symbol)) => return Ok(()), old => (old.unwrap_or_default(), b.group), }, }; diff --git a/crates/engine/src/tests/pixelalign.rs b/crates/engine/src/tests/pixelalign.rs index 1258ae58da..00b4cce694 100644 --- a/crates/engine/src/tests/pixelalign.rs +++ b/crates/engine/src/tests/pixelalign.rs @@ -1493,3 +1493,49 @@ fn art_edited_in_symbol_editing_mode_stays_on_the_pixel_grid() { let pts = placed_points(&s, inst); assert!(whole(&pts), "{pts:?}"); } + +/// Turning it on while the symbol is open in symbol editing mode shows its art on the pixel grid +/// on the editing layer at once, and its instance stays on it after editing ends. +#[test] +fn turning_it_on_in_symbol_editing_mode_snaps_the_editing_layer() { + let mut s = new_doc(); + path(&mut s, "M10.3 20.6 L40.7 20.6 L40.7 30.3 L10.3 30.3 Z", 2.0); + let inst = s.execute("symbol.new", &json!({"name": "Px"})).unwrap()["id"].as_u64().unwrap(); + s.execute("symbol.edit", &json!({"ids": [inst]})).unwrap(); + let st = s.doc().unwrap(); + let layer = st.doc.symbol_edit.as_ref().unwrap().layer; + let part = st.doc.node(layer).unwrap().children().unwrap()[0].id.0; + let before = points(&s, part); + s.execute("symbol.options", &json!({"name": "Px", "alignToPixelGrid": true})).unwrap(); + let d = &s.doc().unwrap().doc; + let xf = d.symbol_edit.as_ref().unwrap().xf; + let art = &d.symbols.iter().find(|x| x.name == "Px").unwrap().art; + let stored: Vec<_> = art.path_data().unwrap().anchors().map(|(_, _, a)| xf * a.p).map(|p| (p.x, p.y)).collect(); + let shown = points(&s, part); + assert!(shown.iter().zip(&stored).all(|(a, b)| close(*a, *b)) && shown != before, "{shown:?} != {stored:?}"); + s.execute("symbol.exitEditing", &json!({})).unwrap(); + let pts = placed_points(&s, inst); + assert!(whole(&pts), "{pts:?}"); +} + +/// An instance of a pixel-aligned symbol on the editing layer of another symbol is part of that +/// symbol's art, so turning it on leaves the instance and the other symbol's art where they are. +#[test] +fn an_instance_on_another_symbols_editing_layer_is_left_as_it_is() { + let mut s = new_doc(); + path(&mut s, "M10.3 20.6 L40.7 20.6 L40.7 30.3 L10.3 30.3 Z", 2.0); + let a = s.execute("symbol.new", &json!({"name": "Px"})).unwrap()["id"].as_u64().unwrap(); + s.execute("select.set", &json!({"ids": [a]})).unwrap(); + let b = s.execute("symbol.new", &json!({"name": "Outer"})).unwrap()["id"].as_u64().unwrap(); + s.execute("symbol.edit", &json!({"ids": [b]})).unwrap(); + let st = s.doc().unwrap(); + let layer = st.doc.symbol_edit.as_ref().unwrap().layer; + let inner = st.doc.node(layer).unwrap().children().unwrap()[0].id.0; + let outer_art = st.doc.symbols.iter().find(|x| x.name == "Outer").unwrap().art.clone(); + let shown = instance_xf(&s, inner); + assert!(!whole(&placed_points(&s, inner))); + s.execute("symbol.options", &json!({"name": "Px", "alignToPixelGrid": true})).unwrap(); + assert_eq!(instance_xf(&s, inner), shown); + let d = &s.doc().unwrap().doc; + assert!(std::sync::Arc::ptr_eq(&d.symbols.iter().find(|x| x.name == "Outer").unwrap().art, &outer_art)); +}