From 315c561a7bab64e9f816f3370caa7e7011904874 Mon Sep 17 00:00:00 2001
From: Said Turksever <asturksever@gmail.com>
Date: Tue, 3 Nov 2026 14:49:54 +0000
Subject: [PATCH] Restore main's catalog strings and re-pin the voice schema
 after the main merges

The two Update-branch merges resolved the locale conflicts by keeping
this branch's side, which dropped nine strings main had added (Utilities
panel, drawing colours, cockpit exit). Rebuild each catalog as main's copy
plus Sea Marks and Ski Pistes, and re-pin the voice tool schema length and
digests on top of main's Utilities target.
---
 src/firstRunExperience.test.mjs  | 7 ++++---
 src/i18n/locales/ar.json         | 9 +++++++++
 src/i18n/locales/de.json         | 9 +++++++++
 src/i18n/locales/es.json         | 3 +++
 src/i18n/locales/fr.json         | 9 +++++++++
 src/i18n/locales/it.json         | 9 +++++++++
 src/i18n/locales/ja.json         | 9 +++++++++
 src/i18n/locales/pt.json         | 9 +++++++++
 src/i18n/locales/ru.json         | 3 +++
 src/i18n/locales/uk.json         | 9 +++++++++
 src/i18n/locales/zh-CN.json      | 3 +++
 src/i18n/locales/zh-Hant.json    | 3 +++
 src/voice/actionSchemas.test.mjs | 2 +-
 13 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/firstRunExperience.test.mjs b/src/firstRunExperience.test.mjs
index 463936d2a..2b65334c3 100644
--- a/src/firstRunExperience.test.mjs
+++ b/src/firstRunExperience.test.mjs
@@ -1030,11 +1030,12 @@ test('the voice TOOL SCHEMA matches the pinned contract — the mission mapping
   // preserves the mission mapping and globe-rotation arguments.
   // S2 GhostMaps extends the generated layer enums; both feature contracts remain.
   // The layer alias hint leaves out aliases the layer id already spells.
-  // Sea Marks and Ski Pistes extend the generated layer enums and alias hint.
-  assert.equal(block.length, 31008, 'serialized tool schema length drifted');
+  // The Utilities panel adds one set_panel_open target; Sea Marks and Ski
+  // Pistes extend the generated layer enums and alias hint.
+  assert.equal(block.length, 31026, 'serialized tool schema length drifted');
   assert.equal(
     crypto.createHash('sha256').update(block).digest('hex'),
-    'da1674545ab9380fb86d387f6e8513aa271e0afe539b69b6a6d09add6c710b0c',
+    '5f5275cd6e320afef4fd224b235f3e0f191ec06599b257ffe1f60b703a255199',
     'the first-run missions must ride EXISTING tools: no schema edit, no cache bust',
   );
   const instructions = fs.readFileSync(
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index f2c434aa9..002d73ab5 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -3214,6 +3214,15 @@
   "Download the timing log of the last play": "تنزيل سجل توقيت آخر تشغيل",
   "Edit anchors, data packs and shot details": "تعديل نقاط الارتكاز وحزم البيانات وتفاصيل اللقطة",
   "Download this scene as JSON or an asset bundle": "تنزيل هذا المشهد بصيغة JSON أو حزمة موارد",
+  "Name of {name}": "اسم {name}",
+  "Change the colour of {name}": "تغيير لون {name}",
+  "Colour of {name}": "لون {name}",
+  "Colour of the next shape": "لون الشكل التالي",
+  "Drawn shapes": "الأشكال المرسومة",
+  "Audio": "الصوت",
+  "UTILITIES": "الأدوات",
+  "Exit cockpit to fly to a drawing": "اخرج من القمرة للانتقال إلى رسم",
+  "Directions, drawing and your own files": "الاتجاهات والرسم وملفاتك الخاصة",
   "Sea Marks": "علامات بحرية",
   "Ski Pistes": "مسارات التزلج"
 }
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 83b6c77a3..95641870a 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -2934,6 +2934,15 @@
   "Right panels": "Rechte Panels",
   "CONFIRMED": "BESTÄTIGT",
   "PAD / RTLS": "STARTPLATZ / RTLS",
+  "Name of {name}": "Name von {name}",
+  "Change the colour of {name}": "Farbe von {name} ändern",
+  "Colour of {name}": "Farbe von {name}",
+  "Colour of the next shape": "Farbe der nächsten Form",
+  "Drawn shapes": "Gezeichnete Formen",
+  "Audio": "Audio",
+  "UTILITIES": "WERKZEUGE",
+  "Exit cockpit to fly to a drawing": "Cockpit verlassen, um zu einer Zeichnung zu fliegen",
+  "Directions, drawing and your own files": "Route, Zeichnen und eigene Dateien",
   "Sea Marks": "Seezeichen",
   "Ski Pistes": "Skipisten"
 }
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index b35124d33..412a9c26a 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -3010,6 +3010,9 @@
   "Download this scene as JSON or an asset bundle": "Descarga esta escena como JSON o como paquete de recursos",
   "Left panels": "Paneles izquierdos",
   "Right panels": "Paneles derechos",
+  "UTILITIES": "UTILIDADES",
+  "Exit cockpit to fly to a drawing": "Sal de la cabina para volar a un dibujo",
+  "Directions, drawing and your own files": "Indicaciones, dibujo y tus propios archivos",
   "Sea Marks": "Señales marítimas",
   "Ski Pistes": "Pistas de esquí"
 }
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 1d587c67d..48386ed15 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -3004,6 +3004,15 @@
   "Right panels": "Panneaux de droite",
   "CONFIRMED": "CONFIRMÉE",
   "PAD / RTLS": "PAS DE TIR / RTLS",
+  "Name of {name}": "Nom de {name}",
+  "Change the colour of {name}": "Changer la couleur de {name}",
+  "Colour of {name}": "Couleur de {name}",
+  "Colour of the next shape": "Couleur de la prochaine forme",
+  "Drawn shapes": "Formes dessinées",
+  "Audio": "Audio",
+  "UTILITIES": "OUTILS",
+  "Exit cockpit to fly to a drawing": "Quittez le cockpit pour rejoindre un dessin",
+  "Directions, drawing and your own files": "Itinéraire, dessin et vos propres fichiers",
   "Sea Marks": "Balisage maritime",
   "Ski Pistes": "Pistes de ski"
 }
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 4af7be819..437f6586d 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -3004,6 +3004,15 @@
   "Right panels": "Pannelli a destra",
   "CONFIRMED": "CONFERMATA",
   "PAD / RTLS": "SITO DI LANCIO / RTLS",
+  "Name of {name}": "Nome di {name}",
+  "Change the colour of {name}": "Cambia il colore di {name}",
+  "Colour of {name}": "Colore di {name}",
+  "Colour of the next shape": "Colore della prossima forma",
+  "Drawn shapes": "Forme disegnate",
+  "Audio": "Audio",
+  "UTILITIES": "STRUMENTI",
+  "Exit cockpit to fly to a drawing": "Esci dal cockpit per volare a un disegno",
+  "Directions, drawing and your own files": "Indicazioni, disegno e i tuoi file",
   "Sea Marks": "Segnalamenti marittimi",
   "Ski Pistes": "Piste da sci"
 }
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 1ae2cbd8f..3a70a77ad 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -2864,6 +2864,15 @@
   "Right panels": "右パネル",
   "CONFIRMED": "確認済み",
   "PAD / RTLS": "射場 / RTLS",
+  "Name of {name}": "{name}の名前",
+  "Change the colour of {name}": "{name}の色を変更",
+  "Colour of {name}": "{name}の色",
+  "Colour of the next shape": "次の図形の色",
+  "Drawn shapes": "描いた図形",
+  "Audio": "オーディオ",
+  "UTILITIES": "ユーティリティ",
+  "Exit cockpit to fly to a drawing": "描画の位置へ移動するにはコックピットを終了してください",
+  "Directions, drawing and your own files": "ルート案内、描画、自分のファイル",
   "Sea Marks": "航路標識",
   "Ski Pistes": "スキーゲレンデ"
 }
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 778239c86..6c7117bd4 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -3004,6 +3004,15 @@
   "Right panels": "Painéis à direita",
   "CONFIRMED": "CONFIRMADA",
   "PAD / RTLS": "PLATAFORMA / RTLS",
+  "Name of {name}": "Nome de {name}",
+  "Change the colour of {name}": "Mudar a cor de {name}",
+  "Colour of {name}": "Cor de {name}",
+  "Colour of the next shape": "Cor da próxima forma",
+  "Drawn shapes": "Formas desenhadas",
+  "Audio": "Áudio",
+  "UTILITIES": "UTILITÁRIOS",
+  "Exit cockpit to fly to a drawing": "Saia da cabine para voar até um desenho",
+  "Directions, drawing and your own files": "Rotas, desenho e seus próprios arquivos",
   "Sea Marks": "Sinais marítimos",
   "Ski Pistes": "Pistas de esqui"
 }
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index c8ae233c9..0557bb53c 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -3080,6 +3080,9 @@
   "Download this scene as JSON or an asset bundle": "Скачать эту сцену в формате JSON или архивом ресурсов",
   "Left panels": "Левые панели",
   "Right panels": "Правые панели",
+  "UTILITIES": "ИНСТРУМЕНТЫ",
+  "Exit cockpit to fly to a drawing": "Выйдите из кабины, чтобы перелететь к рисунку",
+  "Directions, drawing and your own files": "Маршруты, рисование и ваши файлы",
   "Sea Marks": "Морские знаки",
   "Ski Pistes": "Горнолыжные трассы"
 }
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 53db119d7..2be54c891 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -3074,6 +3074,15 @@
   "Right panels": "Праві панелі",
   "CONFIRMED": "ПІДТВЕРДЖЕНО",
   "PAD / RTLS": "МІСЦЕ ЗАПУСКУ / RTLS",
+  "Name of {name}": "Назва: {name}",
+  "Change the colour of {name}": "Змінити колір: {name}",
+  "Colour of {name}": "Колір: {name}",
+  "Colour of the next shape": "Колір наступної фігури",
+  "Drawn shapes": "Намальовані фігури",
+  "Audio": "Аудіо",
+  "UTILITIES": "ІНСТРУМЕНТИ",
+  "Exit cockpit to fly to a drawing": "Вийдіть із кабіни, щоб перелетіти до малюнка",
+  "Directions, drawing and your own files": "Маршрути, малювання та ваші файли",
   "Sea Marks": "Морські знаки",
   "Ski Pistes": "Гірськолижні траси"
 }
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 20677c4f5..e2595e778 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -2870,6 +2870,9 @@
   "Download this scene as JSON or an asset bundle": "将此场景下载为 JSON 或资源包",
   "Left panels": "左侧面板",
   "Right panels": "右侧面板",
+  "UTILITIES": "工具",
+  "Exit cockpit to fly to a drawing": "请先退出座舱，再飞往绘制位置",
+  "Directions, drawing and your own files": "路线导航、绘制和你自己的文件",
   "Sea Marks": "航标",
   "Ski Pistes": "滑雪道"
 }
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
index fa07c7d5d..f2550b955 100644
--- a/src/i18n/locales/zh-Hant.json
+++ b/src/i18n/locales/zh-Hant.json
@@ -2870,6 +2870,9 @@
   "Download this scene as JSON or an asset bundle": "將此場景下載為 JSON 或資源包",
   "Left panels": "左側面板",
   "Right panels": "右側面板",
+  "UTILITIES": "工具",
+  "Exit cockpit to fly to a drawing": "請先退出座艙，再飛往繪製位置",
+  "Directions, drawing and your own files": "路線導航、繪製和你自己的文件",
   "Sea Marks": "航標",
   "Ski Pistes": "滑雪道"
 }
diff --git a/src/voice/actionSchemas.test.mjs b/src/voice/actionSchemas.test.mjs
index ff0bb6a8a..0cc178013 100644
--- a/src/voice/actionSchemas.test.mjs
+++ b/src/voice/actionSchemas.test.mjs
@@ -49,7 +49,7 @@ test('the complete Realtime tool payload pins the manifest-generated layer relea
     // Snow leaves the set_visual_style enum.
     // The Operator HUD layout leaves set_hud's layout enum.
     // The layer alias hint leaves out aliases the layer id already spells.
-    'c13f59886cce3780e7b27462df19659242fdac98928289dce74cf61a1f74054a',
+    '7f113854cdfe3114b9edd69f49995502276c718ce8878320161a68bafb63ebe2',
   );
 });