Merge remote-tracking branch 'origin/main' into german/hal-641-it

# Conflicts:
#	docs/CURRENT-STATE.md
#	docs/TRANSLATORS.md
#	src/i18n/index.js
#	src/i18n/locale.js
#	src/ui/localePicker.test.mjs

src/i18n/i18n.test.mjs

@@ -33,6 +33,8 @@ function memoryStorage(initial = {}) {
 test('normalizeLocale folds regional variants and rejects unshipped tags', () => {
   assert.equal(normalizeLocale('ru-RU'), 'ru');
   assert.equal(normalizeLocale(' RU '), 'ru');
+  assert.equal(normalizeLocale('uk'), 'uk');
+  assert.equal(normalizeLocale('uk-UA'), 'uk');
   assert.equal(normalizeLocale('en_GB'), 'en');
   assert.equal(normalizeLocale('xx'), null);
   assert.equal(normalizeLocale('it-IT'), 'it');
@@ -144,6 +146,22 @@ test('tn() picks English and Russian plural forms', () => {
   assert.match(label(21), / 21 КЛЮЧ(?![А-ЯЁ])/);
 });
 
+test('tn() picks the four Ukrainian plural forms', () => {
+  const label = (count) =>
+    tn(
+      count,
+      'POWER UP · {count} KEY WAITING',
+      'POWER UP · {count} KEYS WAITING',
+    );
+  setLocale('uk');
+  assert.match(label(1), / 1 КЛЮЧ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(3), / 3 КЛЮЧІ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(5), / 5 КЛЮЧІВ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(11), / 11 КЛЮЧІВ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(21), / 21 КЛЮЧ(?![А-ЯҐЄІЇ])/);
+  assert.match(label(1.5), / 1\.5 КЛЮЧА(?![А-ЯҐЄІЇ])/);
+});
+
 test('t() context separates identical English with different meanings', () => {
   assert.equal(t('CLEAR', { context: 'action' }), 'CLEAR');
   setLocale('ru');

src/i18n/index.js

@@ -19,6 +19,7 @@ import {
 import es from './locales/es.json' with { type: 'json' };
 import it from './locales/it.json' with { type: 'json' };
 import ru from './locales/ru.json' with { type: 'json' };
+import uk from './locales/uk.json' with { type: 'json' };
 import zhCN from './locales/zh-CN.json' with { type: 'json' };
 import zhHant from './locales/zh-Hant.json' with { type: 'json' };
 
@@ -26,6 +27,7 @@ const CATALOGS = Object.freeze({
   es,
   it,
   ru,
+  uk,
   'zh-CN': zhCN,
   'zh-Hant': zhHant,
 });

src/i18n/locale.js

@@ -13,6 +13,7 @@ export const LOCALES = Object.freeze([
   'es',
   'it',
   'ru',
+  'uk',
   'zh-CN',
   'zh-Hant',
 ]);
@@ -23,6 +24,7 @@ export const LOCALE_NAMES = Object.freeze({
   es: 'Español',
   it: 'Italiano',
   ru: 'Русский',
+  uk: 'Українська',
   'zh-CN': '中文（简体）',
   'zh-Hant': '中文（繁體）',
 });

src/i18n/same-as-english.json

@@ -311,6 +311,19 @@
     "VS",
     "WHOT/BHOT"
   ],
+  "uk": [
+    "AIS: --",
+    "AIS: {name}",
+    "CCTV",
+    "CRT",
+    "FLIR",
+    "Ironbow",
+    "Landsat 8/9",
+    "NVG",
+    "REC",
+    "S2 GhostMaps",
+    "WHOT/BHOT"
+  ],
   "zh-CN": [
     "1090 MHz",
     "978 MHz UAT",

src/ui/localePicker.test.mjs

@@ -40,7 +40,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['ru', 'en', 'es', 'it', 'zh-CN', 'zh-Hant'],
+    ['ru', 'uk', 'en', 'es', 'it', 'zh-CN', 'zh-Hant'],
   );
   assert.deepEqual(
     codes(
@@ -50,7 +50,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['es', 'en', 'it', 'ru', 'zh-CN', 'zh-Hant'],
+    ['es', 'en', 'it', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
   );
   assert.deepEqual(
     codes(
@@ -60,7 +60,7 @@ test('the current language comes first, the rest by their own names', () => {
         nativeNames: LOCALE_NAMES,
       }),
     ),
-    ['en', 'es', 'it', 'ru', 'zh-CN', 'zh-Hant'],
+    ['en', 'es', 'it', 'ru', 'uk', 'zh-CN', 'zh-Hant'],
   );
   const rows = buildLocaleOptions({
     locales: MANY,
@@ -261,7 +261,8 @@ test('keyboard model: open on the current language, move, choose, close', () =>
   model.openList();
   assert.equal(model.activeOption.code, 'ru');
   assert.deepEqual(model.keydown({ key: 'ArrowDown' }), { handled: true });
-  assert.equal(model.activeOption.code, 'en');
+  // Russian collation puts the other Cyrillic name next.
+  assert.equal(model.activeOption.code, 'uk');
   model.keydown({ key: 'End' });
   assert.equal(model.activeOption.code, 'zh-Hant');
   model.keydown({ key: 'Home' });
@@ -275,7 +276,7 @@ test('keyboard model: open on the current language, move, choose, close', () =>
   model.keydown({ key: 'ArrowDown' });
   assert.deepEqual(model.keydown({ key: ' ' }), {
     handled: true,
-    choose: 'en',
+    choose: 'uk',
   });
   assert.deepEqual(model.keydown({ key: 'Escape' }), {
     handled: true,

src/ui/styles/cockpit.css

@@ -730,7 +730,8 @@ html:not([lang='en']) .cockpit-roll-token.is-separator {
 }
 .cockpit-vision-controls {
   display: grid;
-  grid-template-columns: 48px 58px 48px;
+  /* The current style grows for a long translated name (ЗВИЧАЙНИЙ). */
+  grid-template-columns: 48px minmax(58px, max-content) 48px;
   align-items: stretch;
   gap: 2px;
   margin-top: 2px;