From 8add42bc17719f5757085a00eb5ecc964880b3e3 Mon Sep 17 00:00:00 2001 From: t8y2 Date: Thu, 8 Oct 2026 18:35:09 +0800 Subject: [PATCH] fix(graph): re-resolve locale merge seams after rebase --- apps/desktop/src/i18n/locales/en.ts | 1 + apps/desktop/src/i18n/locales/es.ts | 1 + apps/desktop/src/i18n/locales/it.ts | 1 + apps/desktop/src/i18n/locales/ja.ts | 1 + apps/desktop/src/i18n/locales/ko.ts | 1 + apps/desktop/src/i18n/locales/pt-BR.ts | 1 + apps/desktop/src/i18n/locales/ru.ts | 1 + apps/desktop/src/i18n/locales/zh-CN.ts | 1 + apps/desktop/src/i18n/locales/zh-TW.ts | 1 + 9 files changed, 9 insertions(+) diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts index a5ddbd929c..8d03ae5bf8 100644 --- a/apps/desktop/src/i18n/locales/en.ts +++ b/apps/desktop/src/i18n/locales/en.ts @@ -82,6 +82,7 @@ export default { unknownTypes: "Some database types are unknown. Review their generated types before use.", templateHelp: "Variables: table.name, table.schema, table.comment, class.name; inside a columns section: column.name, column.type, column.originalType, column.comment, column.defaultValue, column.nullable, column.primaryKey. Use double braces for variables, #columns and /columns for loops, #column.nullable and /column.nullable for conditional sections.", + }, graph: { title: "Graph", search: "Search graph", diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts index a2c236e97c..5cfd2a7b7e 100644 --- a/apps/desktop/src/i18n/locales/es.ts +++ b/apps/desktop/src/i18n/locales/es.ts @@ -84,6 +84,7 @@ export default withEnglishFallback({ unknownTypes: "Algunos tipos de base de datos no se reconocen. Revisa los tipos generados antes de usarlos.", templateHelp: "Variables: table.name, table.schema, table.comment, class.name; dentro de una sección de columnas: column.name, column.type, column.originalType, column.comment, column.defaultValue, column.nullable, column.primaryKey. Usa llaves dobles para las variables, #columns y /columns para los bucles, y #column.nullable y /column.nullable para las condiciones.", + }, graph: { title: "Grafo", search: "Buscar en el grafo", diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts index c5439129e0..2f2d688bab 100644 --- a/apps/desktop/src/i18n/locales/it.ts +++ b/apps/desktop/src/i18n/locales/it.ts @@ -82,6 +82,7 @@ export default withEnglishFallback({ unknownTypes: "Alcuni tipi di database non sono riconosciuti. Controlla i tipi generati prima dell'uso.", templateHelp: "Variabili: table.name, table.schema, table.comment, class.name; all'interno di una sezione columns: column.name, column.type, column.originalType, column.comment, column.defaultValue, column.nullable, column.primaryKey. Usa doppie parentesi graffe per le variabili, #columns e /columns per i cicli, #column.nullable e /column.nullable per le condizioni.", + }, graph: { title: "Grafo", search: "Cerca nel grafo", diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts index 825bad83a7..e0c5643e9b 100644 --- a/apps/desktop/src/i18n/locales/ja.ts +++ b/apps/desktop/src/i18n/locales/ja.ts @@ -83,6 +83,7 @@ export default withEnglishFallback({ unknownTypes: "認識できないデータベース型があります。生成された型を確認してから使用してください。", templateHelp: "変数: table.name、table.schema、table.comment、class.name。columns セクション内では column.name、column.type、column.originalType、column.comment、column.defaultValue、column.nullable、column.primaryKey を使用できます。変数は二重中括弧で囲み、#columns と /columns はループ、#column.nullable と /column.nullable は条件ブロックを表します。", + }, graph: { title: "グラフ", search: "グラフを検索", diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts index 3183e7c8f0..8c6827b8b9 100644 --- a/apps/desktop/src/i18n/locales/ko.ts +++ b/apps/desktop/src/i18n/locales/ko.ts @@ -82,6 +82,7 @@ export default withEnglishFallback({ unknownTypes: "일부 데이터베이스 유형을 인식할 수 없습니다. 생성된 유형을 사용하기 전에 확인하세요.", templateHelp: "변수: table.name, table.schema, table.comment, class.name. columns 섹션 안에서는 column.name, column.type, column.originalType, column.comment, column.defaultValue, column.nullable, column.primaryKey를 사용할 수 있습니다. 변수는 중괄호 두 개로 감싸고, #columns와 /columns는 반복, #column.nullable와 /column.nullable는 조건 블록을 나타냅니다.", + }, graph: { title: "그래프", search: "그래프 검색", diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts index fd2e95e810..5567c291c5 100644 --- a/apps/desktop/src/i18n/locales/pt-BR.ts +++ b/apps/desktop/src/i18n/locales/pt-BR.ts @@ -83,6 +83,7 @@ export default withEnglishFallback({ unknownTypes: "Alguns tipos de banco de dados não foram reconhecidos. Revise os tipos gerados antes de usá-los.", templateHelp: "Variáveis: table.name, table.schema, table.comment, class.name; dentro de uma seção columns: column.name, column.type, column.originalType, column.comment, column.defaultValue, column.nullable, column.primaryKey. Use chaves duplas para variáveis, #columns e /columns para loops, e #column.nullable e /column.nullable para blocos condicionais.", + }, graph: { title: "Grafo", search: "Pesquisar no grafo", diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts index 49180f42ce..7efed72d5a 100644 --- a/apps/desktop/src/i18n/locales/ru.ts +++ b/apps/desktop/src/i18n/locales/ru.ts @@ -26,6 +26,7 @@ export default withEnglishFallback({ unknownTypes: "Некоторые типы базы данных не распознаны. Проверьте сгенерированные типы перед использованием.", templateHelp: "Переменные: table.name, table.schema, table.comment, class.name; внутри секции columns доступны column.name, column.type, column.originalType, column.comment, column.defaultValue, column.nullable, column.primaryKey. Используйте двойные фигурные скобки для переменных, #columns и /columns для циклов, а #column.nullable и /column.nullable для условных блоков.", + }, graph: { title: "Граф", search: "Поиск по графу", diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts index db39954095..a57d9048d7 100644 --- a/apps/desktop/src/i18n/locales/zh-CN.ts +++ b/apps/desktop/src/i18n/locales/zh-CN.ts @@ -28,6 +28,7 @@ export default withEnglishFallback({ unknownTypes: "部分数据库类型未识别，请检查生成的字段类型。", templateHelp: "变量：table.name、table.schema、table.comment、class.name；字段循环内可用 column.name、column.type、column.originalType、column.comment、column.defaultValue、column.nullable、column.primaryKey。变量用双花括号包围，#columns 与 /columns 表示循环，#column.nullable 与 /column.nullable 表示条件块。", + }, graph: { title: "图谱", search: "搜索图谱", diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts index e6e86345d9..172036282c 100644 --- a/apps/desktop/src/i18n/locales/zh-TW.ts +++ b/apps/desktop/src/i18n/locales/zh-TW.ts @@ -84,6 +84,7 @@ export default withEnglishFallback({ unknownTypes: "部分資料庫類型未識別，請檢查產生的欄位類型。", templateHelp: "變數：table.name、table.schema、table.comment、class.name；欄位迴圈內可用 column.name、column.type、column.originalType、column.comment、column.defaultValue、column.nullable、column.primaryKey。變數使用雙大括號，#columns 與 /columns 表示迴圈，#column.nullable 與 /column.nullable 表示條件區塊。", + }, graph: { title: "圖譜", search: "搜尋圖譜",