i18n: Keyboard Shortcuts rows have names of their own in every language

With #7378's rows in place, Keyboard Shortcuts still showed 21 names on
two rows each, in 10 languages. A catalog translated two English names
the same way: the Scale and Zoom tools, the Column and Bar Graph tools
and their stacked forms, the Pucker and Wrinkle tools, the Shear and
Warp tools, Edit › Copy and Duplicate, and Pathfinder Unite and Merge.
These rows now read differently in bs, fi, fr, ru, sv, uk, vi, zh-hans
and zh-hant. The French Shear rows (Shear, Shear Tool, Shear… and
Shear:) all use the new word, and the Bulgarian Revolve (Classic)… row
uses the same words as Revolve and Revolve….

The Catalan rows for Saved View, Saved Selection and Open Recent File 2
and above had numbers out of order ("Saved View 10" read "Vista desada
2", and "Open Recent File 2" read "Obre el fitxer recent 12"). Each row
now has its own number, and this removes the last 8 shared names.

The ru and uk Line Graph Tool rows read as a bar graph and now read as
a line graph. The uk Stacked Column Graph Tool and Perspective
Selection Tool rows use «» quotes like the other tool rows.

Tests: Keyboard Shortcuts shows no two rows with the same name in any
language, and a plain row whose English ends with a number keeps that
number in every catalog.
This commit is contained in:
dotCooCoo committed 2026-11-13 20:22:39 -08:00
1 parent 485ca12524
commit 73ee0d79a6
14 files changed
+124 -83

No files matched your search

+1 -1
View File
@@ -1140,7 +1140,7 @@ font-technology Variable Променливи
Extrude & Bevel… Избутване и фасетка…
3D (Classic) 3D (класически)
Extrude & Bevel (Classic)… Избутване и фасетка (класически)…
Revolve (Classic)… Завъртане (класическо)…
Revolve (Classic)… Завъртане около ос (класическо)…
Rotate (Classic)… Ротация (класическа)…
Surface Повърхност
Wireframe Телена рамка
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1 -1
View File
@@ -1450,7 +1450,7 @@ lighting Light Svjetlo
Vertical Type Okomiti tekst
Warp Tool Alat za iskrivljenje
Width Tool Alat širina
Wrinkle Tool Alat za nabiranje
Wrinkle Tool Alat za nabore
Zoom Tool Alat za zumiranje
Action {n} Akcija {n}
Begin Recording Započni snimanje
Can't render this file because it contains an unexpected character in line 2 and column 73.
+62 -62
View File
@@ -2930,35 +2930,35 @@ digits Malayalam Malaiàlam
Open password: Contrasenya d’obertura:
Open Paths Traçats oberts
Open Recent File 1 Obre el fitxer recent 1
Open Recent File 10 Obre el fitxer recent 2
Open Recent File 11 Obre el fitxer recent 3
Open Recent File 12 Obre el fitxer recent 4
Open Recent File 13 Obre el fitxer recent 5
Open Recent File 14 Obre el fitxer recent 6
Open Recent File 15 Obre el fitxer recent 7
Open Recent File 16 Obre el fitxer recent 8
Open Recent File 17 Obre el fitxer recent 9
Open Recent File 18 Obre el fitxer recent 10
Open Recent File 19 Obre el fitxer recent 11
Open Recent File 2 Obre el fitxer recent 12
Open Recent File 20 Obre el fitxer recent 13
Open Recent File 21 Obre el fitxer recent 14
Open Recent File 22 Obre el fitxer recent 15
Open Recent File 23 Obre el fitxer recent 16
Open Recent File 24 Obre el fitxer recent 17
Open Recent File 25 Obre el fitxer recent 18
Open Recent File 26 Obre el fitxer recent 19
Open Recent File 27 Obre el fitxer recent 20
Open Recent File 28 Obre el fitxer recent 21
Open Recent File 29 Obre el fitxer recent 22
Open Recent File 3 Obre el fitxer recent 23
Open Recent File 30 Obre el fitxer recent 24
Open Recent File 4 Obre el fitxer recent 25
Open Recent File 5 Obre el fitxer recent 26
Open Recent File 6 Obre el fitxer recent 27
Open Recent File 7 Obre el fitxer recent 28
Open Recent File 8 Obre el fitxer recent 29
Open Recent File 9 Obre el fitxer recent 30
Open Recent File 10 Obre el fitxer recent 10
Open Recent File 11 Obre el fitxer recent 11
Open Recent File 12 Obre el fitxer recent 12
Open Recent File 13 Obre el fitxer recent 13
Open Recent File 14 Obre el fitxer recent 14
Open Recent File 15 Obre el fitxer recent 15
Open Recent File 16 Obre el fitxer recent 16
Open Recent File 17 Obre el fitxer recent 17
Open Recent File 18 Obre el fitxer recent 18
Open Recent File 19 Obre el fitxer recent 19
Open Recent File 2 Obre el fitxer recent 2
Open Recent File 20 Obre el fitxer recent 20
Open Recent File 21 Obre el fitxer recent 21
Open Recent File 22 Obre el fitxer recent 22
Open Recent File 23 Obre el fitxer recent 23
Open Recent File 24 Obre el fitxer recent 24
Open Recent File 25 Obre el fitxer recent 25
Open Recent File 26 Obre el fitxer recent 26
Open Recent File 27 Obre el fitxer recent 27
Open Recent File 28 Obre el fitxer recent 28
Open Recent File 29 Obre el fitxer recent 29
Open Recent File 3 Obre el fitxer recent 3
Open Recent File 30 Obre el fitxer recent 30
Open Recent File 4 Obre el fitxer recent 4
Open Recent File 5 Obre el fitxer recent 5
Open Recent File 6 Obre el fitxer recent 6
Open Recent File 7 Obre el fitxer recent 7
Open Recent File 8 Obre el fitxer recent 8
Open Recent File 9 Obre el fitxer recent 9
Open Recent Files Obre fitxers recents
Open Swatch Library Obre la biblioteca de mostres
Open Symbol Library Obre la biblioteca de símbols
@@ -3865,42 +3865,42 @@ digits Malayalam Malaiàlam
Saved Desat
Saved recovery data for {title} S’han desat les dades de recuperació de {title}
Saved Selection 1 Selecció desada 1
Saved Selection 10 Selecció desada 2
Saved Selection 11 Selecció desada 3
Saved Selection 12 Selecció desada 4
Saved Selection 13 Selecció desada 5
Saved Selection 14 Selecció desada 6
Saved Selection 15 Selecció desada 7
Saved Selection 16 Selecció desada 8
Saved Selection 17 Selecció desada 9
Saved Selection 18 Selecció desada 10
Saved Selection 19 Selecció desada 11
Saved Selection 2 Selecció desada 12
Saved Selection 20 Selecció desada 13
Saved Selection 21 Selecció desada 14
Saved Selection 22 Selecció desada 15
Saved Selection 23 Selecció desada 16
Saved Selection 24 Selecció desada 17
Saved Selection 25 Selecció desada 18
Saved Selection 3 Selecció desada 19
Saved Selection 4 Selecció desada 20
Saved Selection 5 Selecció desada 21
Saved Selection 6 Selecció desada 22
Saved Selection 7 Selecció desada 23
Saved Selection 8 Selecció desada 24
Saved Selection 9 Selecció desada 25
Saved Selection 10 Selecció desada 10
Saved Selection 11 Selecció desada 11
Saved Selection 12 Selecció desada 12
Saved Selection 13 Selecció desada 13
Saved Selection 14 Selecció desada 14
Saved Selection 15 Selecció desada 15
Saved Selection 16 Selecció desada 16
Saved Selection 17 Selecció desada 17
Saved Selection 18 Selecció desada 18
Saved Selection 19 Selecció desada 19
Saved Selection 2 Selecció desada 2
Saved Selection 20 Selecció desada 20
Saved Selection 21 Selecció desada 21
Saved Selection 22 Selecció desada 22
Saved Selection 23 Selecció desada 23
Saved Selection 24 Selecció desada 24
Saved Selection 25 Selecció desada 25
Saved Selection 3 Selecció desada 3
Saved Selection 4 Selecció desada 4
Saved Selection 5 Selecció desada 5
Saved Selection 6 Selecció desada 6
Saved Selection 7 Selecció desada 7
Saved Selection 8 Selecció desada 8
Saved Selection 9 Selecció desada 9
Saved Selections Seleccions desades
Saved to User Defined: {} Desat a Definit per l’usuari: {}
Saved View 1 Vista desada 1
Saved View 10 Vista desada 2
Saved View 11 Vista desada 3
Saved View 12 Vista desada 4
Saved View 13 Vista desada 5
Saved View 14 Vista desada 6
Saved View 15 Vista desada 7
Saved View 16 Vista desada 8
Saved View 17 Vista desada 9
Saved View 18 Vista desada 10
Saved View 10 Vista desada 10
Saved View 11 Vista desada 11
Saved View 12 Vista desada 12
Saved View 13 Vista desada 13
Saved View 14 Vista desada 14
Saved View 15 Vista desada 15
Saved View 16 Vista desada 16
Saved View 17 Vista desada 17
Saved View 18 Vista desada 18
Saved View 19 Vista desada 19
Saved View 2 Vista desada 2
Saved View 20 Vista desada 20
Can't render this file because it contains an unexpected character in line 2 and column 73.
+1 -1
View File
@@ -296,7 +296,7 @@
Move Plane to Match Object Siirrä taso objektin mukaan
Edit Text Muokkaa tekstiä
Live Paint Elävä maalaus
Merge Yhdistä
Merge Sulauta
Gap Options… Aukkojen asetukset…
Gap Options Aukkojen asetukset
Gap Detection Aukkojen tunnistus
Can't render this file because it contains an unexpected character in line 2 and column 73.
+4 -4
View File
@@ -3294,9 +3294,9 @@ digits Malayalam Malayalam
Shape Properties: Propriétés de la forme :
Shaper Tool Outil Shaper
Shapes Formes
Shear Déformation
Shear Tool Outil Déformation
Shear… Déformation…
Shear Cisaillement
Shear Tool Outil Cisaillement
Shear… Cisaillement…
Shell Lower… Coquillage inférieur…
Shell Upper… Coquillage supérieur…
Shift Maj
@@ -5916,7 +5916,7 @@ lighting Light Lumière
Set: Jeu :
Shades Tons foncés
Shades of Gray Nuances de gris
Shear: Déformation :
Shear: Cisaillement :
Shift+Click Maj+clic
Shift+Drag Maj+glisser
Shortcut Raccourci
Can't render this file because it contains an unexpected character in line 2 and column 73.
+4 -4
View File
@@ -299,7 +299,7 @@ font-technology Variable Вариативные
Background Contents Содержимое фона
Background: Фон:
Backspace Backspace
Bar Graph Tool Инструмент «Гистограмма»
Bar Graph Tool Инструмент «Линейчатая диаграмма»
Baseline Базовая линия
Baseline Shift Смещение базовой линии
Basic Latin Основная латиница
@@ -1914,7 +1914,7 @@ file-filter Templates Шаблоны
Line Cut Разрезание линий
Line Cut Tool Инструмент «Разрезание линий»
Line Endings: Окончания линий:
Line Graph Tool Инструмент «Линейчатая диаграмма»
Line Graph Tool Инструмент «График»
Line Segment Отрезок
Line Segment Tool Инструмент «Отрезок»
Line Segment Tool Options Параметры инструмента «Отрезок»
@@ -3547,7 +3547,7 @@ digits Malayalam Малаялам
Spread: Разворот:
Square Квадрат
Squeeze… Сжатие…
Stacked Bar Graph Tool Инструмент «Гистограмма с накоплением»
Stacked Bar Graph Tool Инструмент «Линейчатая диаграмма с накоплением»
Stacked Column Graph Tool Инструмент «Гистограмма с накоплением»
Stair Step Ступенчатый
Standard Ligatures Стандартные лигатуры
@@ -4067,7 +4067,7 @@ digits Malayalam Малаялам
Zoom In Увеличить
Zoom Out Уменьшить
Zoom to Selection Масштаб по выделению
Zoom Tool Инструмент «Масштаб»
Zoom Tool Инструмент «Лупа»
Zoom with Mouse Wheel Масштабировать колесом мыши
Scroll Sideways with Cmd/Ctrl + Wheel Прокручивать по горизонтали колесом с Cmd/Ctrl
Scrub Numeric Fields by Dragging Изменять числовые поля перетаскиванием
Can't render this file because it is too large.
+1 -1
View File
@@ -290,7 +290,7 @@ font-technology Variable Variabla
Background Contents Bakgrundsinnehåll
Background: Bakgrund:
Backspace Backspace
Bar Graph Tool Stapeldiagramverktyg
Bar Graph Tool Verktyg för liggande stapeldiagram
Baseline Baseline
Baseline Shift Baslinjeförskjutning
Basic Latin Grundläggande latin
Can't render this file because it is too large.
+20
View File
@@ -1001,6 +1001,26 @@ fn leading_term_agrees_within_each_catalog() {
assert!(bad.is_empty(), "rows that name leading differently from the Leading field:\n{}", bad.join("\n"));
}
/// A plain row whose English ends with a number, such as "Saved View 10", has that number in its
/// translation as a number of its own, so the rows of a numbered list do not swap or repeat names.
/// Messages are left out: "index must be ≥ 0" can be translated as "index must not be negative".
#[test]
fn numbered_rows_keep_their_number() {
let mut bad = Vec::new();
for l in LANGUAGES.iter().filter(|l| !l.source.is_empty()) {
let (entries, _) = parse_entries(l.source);
for (_, src, tr) in entries.into_iter().filter(|(ctx, _, _)| ctx.is_empty()) {
let Some((_, n)) = src.rsplit_once(' ').filter(|(_, n)| !n.is_empty() && n.chars().all(|c| c.is_ascii_digit())) else {
continue;
};
if !tr.split(|c: char| !c.is_ascii_digit()).any(|run| run == n) {
bad.push(format!("{}: {src:?} → {tr:?}", l.code));
}
}
}
assert!(bad.is_empty(), "numbered rows without their number:\n{}", bad.join("\n"));
}
/// No translated word mixes Latin, Cyrillic and Greek letters, such as a Latin "A" typed in place
/// of a Cyrillic "А". A word written in one script, such as "PDF" or "X" in a Russian row, is
/// allowed.
+6 -6
View File
@@ -295,7 +295,7 @@ font-technology Variable Варіативні
Background Contents Вміст фону
Background: Фон:
Backspace Backspace
Bar Graph Tool Інструмент «Гістограма»
Bar Graph Tool Інструмент «Лінійчата діаграма»
Baseline Базова лінія
Baseline Shift Зміщення базової лінії
Basic Latin Основна латиниця
@@ -1919,7 +1919,7 @@ file-filter Templates Шаблони
Line Cut Розрізання ліній
Line Cut Tool Інструмент «Розрізання ліній»
Line Endings: Закінчення ліній:
Line Graph Tool Інструмент «Лінійчаста діаграма»
Line Graph Tool Інструмент «Графік»
Line Segment Відрізок
Line Segment Tool Інструмент «Відрізок»
Line Segment Tool Options Параметри інструменту «Відрізок»
@@ -2584,7 +2584,7 @@ diagnostics ui інтерфейс
Perspective Grid Settings Параметри сітки перспективи
Perspective Grid Tool Інструмент «Сітка перспективи»
Perspective Plane Options… Параметри площини перспективи…
Perspective Selection Tool Інструмент "Виділення в перспективі"
Perspective Selection Tool Інструмент «Виділення в перспективі»
Phone 390×844 Телефон 390×844
Picas Піки
Pie Graph Tool Інструмент «Кругова діаграма»
@@ -3554,8 +3554,8 @@ effect Points Точки
Spread: Розворот:
Square Квадрат
Squeeze… Стиснення…
Stacked Bar Graph Tool Інструмент "Гістограма з накопиченням"
Stacked Column Graph Tool Інструмент "Гістограма з накопиченням"
Stacked Bar Graph Tool Інструмент «Лінійчата діаграма з накопиченням»
Stacked Column Graph Tool Інструмент «Гістограма з накопиченням»
Stair Step Ступінчастий
Standard Ligatures Стандартні лігатури
Standard Vertical Roman Alignment Стандартне римське вертикальне вирівнювання
@@ -4075,7 +4075,7 @@ effect Points Точки
Zoom In Збільшити
Zoom Out Зменшити
Zoom to Selection Масштаб виділення
Zoom Tool Інструмент «Масштаб»
Zoom Tool Інструмент «Лупа»
Zoom with Mouse Wheel Масштабувати колесом миші
Scroll Sideways with Cmd/Ctrl + Wheel Прокручувати по горизонталі колесом із Cmd/Ctrl
Scrub Numeric Fields by Dragging Змінювати числові поля перетягуванням
Can't render this file because it is too large.
+1 -1
View File
@@ -2343,7 +2343,7 @@ digits Hindi Hindi
Medium Thumbnail View Chế độ hình thu nhỏ vừa
Medium Thumbnails Hình thu nhỏ vừa
Menu Dialog Hộp thoại menu
Merge Hợp nhất
Merge Gộp
Merge colors into one row Hợp nhất màu vào một hàng
Merge Graphic Styles Hợp nhất kiểu đồ họa
Merge Graphic Styles… Hợp nhất kiểu đồ họa…
Can't render this file because it contains an unexpected character in line 204 and column 5.
+1 -1
View File
@@ -876,7 +876,7 @@ antiAlias Sharp 锐利
Drop Shadow 制作阴影
Drop Shadow… 阴影…
Duotone Gradients 双色调渐变
Duplicate 复制
Duplicate 创建副本
Duplicate and Offset 10 pt 复制并偏移 10 pt
Duplicate Artboard 复制画板
Copy Artboard 拷贝画板
Can't render this file because it is too large.
+1 -1
View File
@@ -5173,7 +5173,7 @@ digits Malayalam 馬來亞拉姆數字
Zoom In 放大顯示
Zoom Out 縮小顯示
Zoom to Selection 縮放至選取範圍
Zoom Tool 縮放工具
Zoom Tool 縮放顯示工具
Zoom with Mouse Wheel 使用滑鼠滾輪縮放
Scroll Sideways with Cmd/Ctrl + Wheel 使用 Cmd/Ctrl + 滾輪水平捲動
Scrub Numeric Fields by Dragging 拖曳以調整數值欄位
Can't render this file because it contains an unexpected character in line 6 and column 47.
+20
View File
@@ -2680,6 +2680,26 @@ mod tests {
assert!(d.str("__message").contains("was already used by Type › Fit Headline (type.fitHeadline) "), "{}", d.str("__message"));
}
/// No two entries of Keyboard Shortcuts have the same name in any UI language: each catalog
/// translates two different English names two different ways.
#[test]
fn no_two_entries_have_the_same_name_in_any_language() {
let all = entries();
let mut shared = vec![];
let previous = crate::i18n::current();
for lang in crate::i18n::Lang::all() {
crate::i18n::set_current(lang);
let mut by_name: HashMap<String, Vec<&str>> = HashMap::new();
for e in all.iter() {
by_name.entry(shown_name(e)).or_default().push(e.key.as_str());
}
shared.extend(by_name.into_iter().filter(|(_, keys)| keys.len() > 1).map(|(name, keys)| (lang.code(), name, keys)));
}
crate::i18n::set_current(previous);
shared.sort();
assert!(shared.is_empty(), "{} names: {shared:#?}", shared.len());
}
/// Two filter plug-ins with the same name in the same menu show their ids, and a third whose
/// name is one of those names with the id stays apart from it. A filter with that name in
/// another menu, or with a label that differs by its "…", shows no id.
+1
View File
@@ -920,6 +920,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
- The errors of the blend spine commands (Move Spine Point, Reshape Spine Segment, Add Spine Point and Delete Spine Point) show in the status bar in the interface language: each has a row in every catalog that translates all status and error messages and in Bulgarian (`blend_spine_param_errors_are_translated`).
- The errors of the 3D effects (Extrude & Bevel, Revolve, Inflate, Rotate and their Classic forms) show in the status bar in the interface language: the art a 3D effect cannot build a solid from, invalid light, graphics and surface settings, and the notes for an object that draws no 3D faces or more wireframe edges than the limit. Each has a row in every catalog that translates all status and error messages, and the effect's name and the values in the message are translated or kept as written (`three_d_refusals_are_translated_in_every_complete_catalog`, `three_d_refusals_translate_with_their_values`).
- The errors of an SVG filter that the New or Edit button of Apply SVG Filter or an `svg.filter` effect refuses show in the status bar in the interface language: XML that cannot be read, a missing or too long id, an element or event attribute a filter does not take, an image that is not a `data:` URL, and the limits on primitives, `numOctaves`, `order`, `radius`, `stdDeviation`, `kernelUnitLength`, image pixels, nesting and size. Each has a row in every catalog that translates all status and error messages, and the limits, element and attribute names and the XML parser's position are kept as written (`svg_filter_refusals_are_translated_in_every_complete_catalog`, `svg_filter_refusals_translate_with_their_values`). Items side by side in a menu show different labels in every interface language (Effect › 3D and Materials › Revolve… and Rotate… in Turkish and Bulgarian, Effect › Warp and Distort, the Pathfinder effects, the Warp styles, Window › Attributes and Properties, and the whitespace characters), and no menu item shows a command id in place of its label (`menu_items_side_by_side_have_different_labels`, `menu_items_never_show_an_id`).
- Keyboard Shortcuts shows each entry under a name of its own in every interface language: the Scale and Zoom tools, the Column and Bar Graph tools and their stacked forms, the Pucker and Wrinkle tools, the Shear and Warp tools, Edit › Copy and Duplicate, Pathfinder Unite and Merge, and View › Saved View 2 to 17 have different names in every catalog (`no_two_entries_have_the_same_name_in_any_language`). The Line Graph tool reads as a line graph in Russian and Ukrainian, and in every catalog a row whose English name ends with a number keeps that number (`numbered_rows_keep_their_number`).
- The errors of the parameter checks that many commands share show in the status bar in the interface language: a value that is not a number where a number goes (`object.move` with `"dx": "60 mm"`, and `object.rotate`, `object.setBounds` and the other commands that call `check_numbers`), a missing number or index, `ids` that are not a list of object ids, an object id that is not a non-negative integer or names no object, and a date that is not Unix seconds. Each has a row in every catalog that translates all status and error messages, and in Bulgarian, Danish, Indonesian and Dutch (`shared_param_check_errors_are_translated`).
- A parameter schema's errors show in the status bar with what the value must be in the interface language, for every type a schema has (a number with each kind of range and with a unit, an integer and its range, true or false, a string, a list of names, an object id, a list of object ids, a color, a point, an object and a list), in every catalog that translates all status and error messages; the path, the refused value, the bounds, the unit and the names stay as the English gives them. The error for a value that is not one of its names is also translated in Bulgarian, Bosnian, Danish, Indonesian and Dutch (`parameter_schema_expected_phrases_are_translated`, `bracketed_message_parts_translate_only_as_exact_messages`).
- The untranslated report lists the status and error messages of the effects, swatch libraries, raster sizes and encoders, 3D solids and path operations that a catalog lacks, the messages that a `.map_err` closure or a named error handler returns, and the phrases a parameter schema's error builds for what a value must be (`untranslated_report_checks_every_message_crate_and_schema_phrase`, `message_scan_reads_map_err_closures`, `message_scan_reads_named_map_err_handlers`).