From 35d011fccd0898f70675c5d2ba3899e89fdd146b Mon Sep 17 00:00:00 2001 From: aiongg Date: Sat, 10 Oct 2026 00:00:40 +0000 Subject: [PATCH] Integration: one "Tint:" entry for #144 and #263 #144 (Character Style Options) and #263 (Paragraph Rules) each add a "Tint:" row to the shared table and to the Arabic and Portuguese tables, which the i18n tests reject as duplicates. One row stays in each table, at #144's position, with #263's German, French, Spanish and Japanese translations (#144's row kept those as English). --- crates/ui-egui/src/i18n.rs | 3 +-- crates/ui-egui/src/i18n/ar.rs | 1 - crates/ui-egui/src/i18n/pt_br.rs | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs index 07ffa11db..e6de3dbd3 100644 --- a/crates/ui-egui/src/i18n.rs +++ b/crates/ui-egui/src/i18n.rs @@ -2307,7 +2307,7 @@ const TABLE: &[(&str, [&str; 5])] = &[ ("Baseline Shift:", ["Baseline Shift:", "Baseline Shift:", "Baseline Shift:", "Baseline Shift:", "基线偏移:"]), ("Skew:", ["Skew:", "Skew:", "Skew:", "Skew:", "倾斜:"]), ("Language:", ["Language:", "Language:", "Language:", "Language:", "语言:"]), - ("Tint:", ["Tint:", "Tint:", "Tint:", "Tint:", "色调:"]), + ("Tint:", ["Farbton:", "Teinte:", "Matiz:", "濃淡:", "色调:"]), ("Figure Style:", ["Figure Style:", "Figure Style:", "Figure Style:", "Figure Style:", "数字样式:"]), ("Underline On", ["Underline On", "Underline On", "Underline On", "Underline On", "启用下划线"]), ("Strikethrough On", ["Strikethrough On", "Strikethrough On", "Strikethrough On", "Strikethrough On", "启用删除线"]), @@ -2787,7 +2787,6 @@ const TABLE: &[(&str, [&str; 5])] = &[ ("Paragraph Rules…", ["Absatzlinien …", "Filets de paragraphe…", "Filetes de párrafo…", "段落境界線…", "段落线…"]), ("Paragraph Rules", ["Absatzlinien", "Filets de paragraphe", "Filetes de párrafo", "段落境界線", "段落线"]), ("Rule Below", ["Linie unterhalb", "Filet après", "Filete después", "後境界線", "下方横线"]), - ("Tint:", ["Farbton:", "Teinte:", "Matiz:", "濃淡:", "色调:"]), ("Column", ["Spalte", "Colonne", "Columna", "段", "栏"]), ]; diff --git a/crates/ui-egui/src/i18n/ar.rs b/crates/ui-egui/src/i18n/ar.rs index 329ff6221..c9dc01552 100644 --- a/crates/ui-egui/src/i18n/ar.rs +++ b/crates/ui-egui/src/i18n/ar.rs @@ -1450,5 +1450,4 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("Paragraph Rules…", "خطوط الفقرة…"), ("Paragraph Rules", "خطوط الفقرة"), ("Rule Below", "خط سفلي"), - ("Tint:", "الصبغة:"), ]; diff --git a/crates/ui-egui/src/i18n/pt_br.rs b/crates/ui-egui/src/i18n/pt_br.rs index ea0bec660..7ca1fa985 100644 --- a/crates/ui-egui/src/i18n/pt_br.rs +++ b/crates/ui-egui/src/i18n/pt_br.rs @@ -1047,5 +1047,4 @@ pub(super) const TABLE: &[(&str, &str)] = &[ ("Paragraph Rules…", "Linhas de parágrafo…"), ("Paragraph Rules", "Linhas de parágrafo"), ("Rule Below", "Linha abaixo"), - ("Tint:", "Matiz:"), ];