From f6b74fbcd47d5de14493233cfa4f8a36fc3ea8b1 Mon Sep 17 00:00:00 2001 From: aiongg Date: Fri, 16 Oct 2026 04:00:03 +0000 Subject: [PATCH] Integration: #1060 the Alt-click hint and Apply "name", Clear Overrides are translated in every UI language --- crates/ui-egui/src/i18n.rs | 14 ++++++++++++-- crates/ui-egui/src/i18n/ar.rs | 2 ++ crates/ui-egui/src/i18n/cs.rs | 2 ++ crates/ui-egui/src/i18n/de.rs | 2 ++ crates/ui-egui/src/i18n/it.rs | 2 ++ crates/ui-egui/src/i18n/ja.rs | 2 ++ crates/ui-egui/src/i18n/ka.rs | 2 ++ crates/ui-egui/src/i18n/pl.rs | 2 ++ crates/ui-egui/src/i18n/pt_br.rs | 2 ++ crates/ui-egui/src/i18n/ru.rs | 2 ++ crates/ui-egui/src/i18n/uk.rs | 2 ++ 11 files changed, 32 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs index 0d75a95c3..bd6b9e293 100644 --- a/crates/ui-egui/src/i18n.rs +++ b/crates/ui-egui/src/i18n.rs @@ -2806,6 +2806,14 @@ const TABLE: &[(&str, [&str; 5])] = &[ "⌥-click clears overrides", ["⌥-click clears overrides", "⌥-clic efface les remplacements", "⌥-click clears overrides", "⌥-click clears overrides", "⌥-单击清除覆盖"], ), + ( + "Alt-click clears overrides", + ["Alt-Klick entfernt Abweichungen", "Alt-clic efface les remplacements", "Alt-clic borra las modificaciones", "Alt を押しながらクリックするとオーバーライドを消去します", "Alt-单击清除覆盖"], + ), + ( + "Apply \"{name}\", Clear Overrides", + ["„{name}“ anwenden, Abweichungen löschen", "Appliquer « {name} », effacer les remplacements", "Aplicar \"{name}\", borrar modificaciones", "\"{name}\" を適用、オーバーライドを消去", "应用\"{name}\"，清除覆盖"], + ), ("⚠ out of date", ["⚠ out of date", "⚠ obsolète", "⚠ out of date", "⚠ out of date", "⚠ 已过期"]), ("General", ["General", "Général", "General", "General", "常规"]), ( @@ -5015,9 +5023,11 @@ mod tests { } #[test] - fn redefine_style_is_translated_in_every_language() { + fn style_row_menu_strings_are_translated_in_every_language() { for (code, _) in LANGUAGES.iter().filter(|(c, _)| !c.is_empty()) { - assert_ne!(tr(code, "Redefine Style"), "Redefine Style", "{code}"); + for key in ["Redefine Style", "Alt-click clears overrides", "Apply \"{name}\", Clear Overrides"] { + assert_ne!(tr(code, key), key, "{code}: {key}"); + } } } } diff --git a/crates/ui-egui/src/i18n/ar.rs b/crates/ui-egui/src/i18n/ar.rs index baf1e82e6..674805b98 100644 --- a/crates/ui-egui/src/i18n/ar.rs +++ b/crates/ui-egui/src/i18n/ar.rs @@ -1177,6 +1177,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[No Group]", "[بلا مجموعة]"), ("[None] — choose a colour on the ramp.", "[بلا] — اختر لونًا على شريط التدرج."), ("⌥-click clears overrides", "النقر مع ⌥ يمسح التجاوزات"), + ("Alt-click clears overrides", "النقر مع Alt يمسح التجاوزات"), + ("Apply \"{name}\", Clear Overrides", "تطبيق \"{name}\" ومسح التجاوزات"), ("⚠ out of date", "⚠ غير محدّث"), ("Interface", "الواجهة"), ("Advanced Type", "كتابة متقدمة"), diff --git a/crates/ui-egui/src/i18n/cs.rs b/crates/ui-egui/src/i18n/cs.rs index e81156b4f..6b329db45 100644 --- a/crates/ui-egui/src/i18n/cs.rs +++ b/crates/ui-egui/src/i18n/cs.rs @@ -952,6 +952,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[Žádný] — vyberte barvu na spektru."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — pomoc, zpětná vazba a ukázky prací"), ("⌥-click clears overrides", "⌥-kliknutí zruší přepsání"), + ("Alt-click clears overrides", "Alt-kliknutí zruší přepsání"), + ("Apply \"{name}\", Clear Overrides", "Použít „{name}“, zrušit přepsání"), ("⚠ out of date", "⚠ zastaralé"), ("General", "Obecné"), ("Basic Character Formats", "Základní formáty znaků"), diff --git a/crates/ui-egui/src/i18n/de.rs b/crates/ui-egui/src/i18n/de.rs index e9def8d41..26df93b91 100644 --- a/crates/ui-egui/src/i18n/de.rs +++ b/crates/ui-egui/src/i18n/de.rs @@ -986,6 +986,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[Ohne] – eine Farbe auf dem Farbbalken wählen."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft – Hilfe, Feedback und Arbeiten zeigen"), ("⌥-click clears overrides", "⌥-Klick entfernt Abweichungen"), + ("Alt-click clears overrides", "Alt-Klick entfernt Abweichungen"), + ("Apply \"{name}\", Clear Overrides", "„{name}“ anwenden, Abweichungen löschen"), ("⚠ out of date", "⚠ veraltet"), ("General", "Allgemein"), ("Basic Character Formats", "Grundlegende Zeichenformate"), diff --git a/crates/ui-egui/src/i18n/it.rs b/crates/ui-egui/src/i18n/it.rs index 650f91f06..ad9ec1b7e 100644 --- a/crates/ui-egui/src/i18n/it.rs +++ b/crates/ui-egui/src/i18n/it.rs @@ -1068,6 +1068,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[Nessuno] — scegli un colore sulla barra dei colori."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — aiuto, feedback e condivisione dei lavori"), ("⌥-click clears overrides", "⌥-clic cancella le modifiche locali"), + ("Alt-click clears overrides", "Alt-clic cancella le modifiche locali"), + ("Apply \"{name}\", Clear Overrides", "Applica \"{name}\", cancella modifiche locali"), ("⚠ out of date", "⚠ non aggiornato"), ("General", "Generale"), ("Basic Character Formats", "Formati carattere di base"), diff --git a/crates/ui-egui/src/i18n/ja.rs b/crates/ui-egui/src/i18n/ja.rs index 72e0ecab0..6752c08ed 100644 --- a/crates/ui-egui/src/i18n/ja.rs +++ b/crates/ui-egui/src/i18n/ja.rs @@ -1184,6 +1184,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[なし] — カラーバーでカラーを選択してください。"), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — サポート・ご意見・作品紹介"), ("⌥-click clears overrides", "⌥ を押しながらクリックするとオーバーライドを消去します"), + ("Alt-click clears overrides", "Alt を押しながらクリックするとオーバーライドを消去します"), + ("Apply \"{name}\", Clear Overrides", "\"{name}\" を適用、オーバーライドを消去"), ("⚠ out of date", "⚠ 要更新"), ("General", "一般"), ("Basic Character Formats", "文字の基本書式"), diff --git a/crates/ui-egui/src/i18n/ka.rs b/crates/ui-egui/src/i18n/ka.rs index 3645d39a0..b5ec7b260 100644 --- a/crates/ui-egui/src/i18n/ka.rs +++ b/crates/ui-egui/src/i18n/ka.rs @@ -996,6 +996,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[არცერთი] — აირჩიეთ ფერი სკალაზე."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — დახმარება, გამოხმაურება და ნამუშევრების ჩვენება"), ("⌥-click clears overrides", "⌥-დაწკაპუნება ასუფთავებს გადაფარვებს"), + ("Alt-click clears overrides", "Alt-დაწკაპუნება ასუფთავებს გადაფარვებს"), + ("Apply \"{name}\", Clear Overrides", "„{name}“-ის გამოყენება, გადაფარვების გასუფთავება"), ("⚠ out of date", "⚠ მოძველებულია"), ("General", "ზოგადი"), ("Basic Character Formats", "სიმბოლოს საბაზო ფორმატები"), diff --git a/crates/ui-egui/src/i18n/pl.rs b/crates/ui-egui/src/i18n/pl.rs index b57928b0a..ef41e6929 100644 --- a/crates/ui-egui/src/i18n/pl.rs +++ b/crates/ui-egui/src/i18n/pl.rs @@ -962,6 +962,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[Brak] — wybierz kolor na pasku."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — pomoc, opinie i prezentacje prac"), ("⌥-click clears overrides", "⌥-klik usuwa zastąpienia"), + ("Alt-click clears overrides", "Alt-klik usuwa zastąpienia"), + ("Apply \"{name}\", Clear Overrides", "Zastosuj „{name}”, usuń zastąpienia"), ("⚠ out of date", "⚠ nieaktualne"), ("General", "Ogólne"), ("Basic Character Formats", "Podstawowe formaty znaków"), diff --git a/crates/ui-egui/src/i18n/pt_br.rs b/crates/ui-egui/src/i18n/pt_br.rs index 6eeb07cce..52cb2c554 100644 --- a/crates/ui-egui/src/i18n/pt_br.rs +++ b/crates/ui-egui/src/i18n/pt_br.rs @@ -1185,6 +1185,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[No Group]", "[Sem grupo]"), ("[None] — choose a colour on the ramp.", "[Nenhum] — escolha uma cor na rampa."), ("⌥-click clears overrides", "⌥-clique limpa substituições"), + ("Alt-click clears overrides", "Alt-clique limpa substituições"), + ("Apply \"{name}\", Clear Overrides", "Aplicar \"{name}\", limpar substituições"), ("⚠ out of date", "⚠ desatualizado"), ("Interface", "Interface"), ("Advanced Type", "Tipo avançado"), diff --git a/crates/ui-egui/src/i18n/ru.rs b/crates/ui-egui/src/i18n/ru.rs index 2c5fa3119..dd52bb83e 100644 --- a/crates/ui-egui/src/i18n/ru.rs +++ b/crates/ui-egui/src/i18n/ru.rs @@ -939,6 +939,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[Нет] — выберите цвет на шкале."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — помощь, отзывы и обмен работами"), ("⌥-click clears overrides", "⌥-щелчок сбрасывает переопределения"), + ("Alt-click clears overrides", "Alt-щелчок сбрасывает переопределения"), + ("Apply \"{name}\", Clear Overrides", "Применить «{name}», сбросить переопределения"), ("⚠ out of date", "⚠ устарело"), ("General", "Основные"), ("Basic Character Formats", "Основные атрибуты символов"), diff --git a/crates/ui-egui/src/i18n/uk.rs b/crates/ui-egui/src/i18n/uk.rs index f975ab0ff..8e48e74f4 100644 --- a/crates/ui-egui/src/i18n/uk.rs +++ b/crates/ui-egui/src/i18n/uk.rs @@ -1065,6 +1065,8 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("[None] — choose a colour on the ramp.", "[Немає] — виберіть колір на шкалі."), ("discord.gg/artcraft — help, feedback and show-and-tell", "discord.gg/artcraft — допомога, відгуки та обмін роботами"), ("⌥-click clears overrides", "⌥-клацання скидає перевизначення"), + ("Alt-click clears overrides", "Alt-клацання скидає перевизначення"), + ("Apply \"{name}\", Clear Overrides", "Застосувати «{name}», скинути перевизначення"), ("⚠ out of date", "⚠ застаріле"), ("General", "Загальні"), ("Basic Character Formats", "Основне форматування символів"),