Merge branch 'develop' of https://github.com/TriliumNext/Notes into develop

_regroup/package.json

@@ -38,7 +38,7 @@
     "@playwright/test": "1.52.0",
     "@stylistic/eslint-plugin": "4.4.0",        
     "@types/express": "5.0.1",    
-    "@types/node": "22.15.24",    
+    "@types/node": "22.15.29",    
     "@types/yargs": "17.0.33",
     "@vitest/coverage-v8": "3.1.4",
     "eslint": "9.27.0",

apps/client/src/translations/cn/translation.json

@@ -274,15 +274,15 @@
     "revision_last_edited": "此修订版本上次编辑于 {{date}}",
     "confirm_delete_all": "您是否要删除此笔记的所有修订版本？",
     "no_revisions": "此笔记暂无修订版本...",
-    "restore_button": "",
+    "restore_button": "恢复",
     "confirm_restore": "您是否要恢复此修订版本？这将使用此修订版本覆盖笔记的当前标题和内容。",
-    "delete_button": "",
+    "delete_button": "删除",
     "confirm_delete": "您是否要删除此修订版本？",
     "revisions_deleted": "笔记修订版本已删除。",
     "revision_restored": "笔记修订版本已恢复。",
     "revision_deleted": "笔记修订版本已删除。",
     "snapshot_interval": "笔记快照保存间隔: {{seconds}}秒。",
-    "maximum_revisions": "当前笔记的最历史数量: {{number}}。",
+    "maximum_revisions": "当前笔记的最大历史数量: {{number}}。",
     "settings": "笔记修订设置",
     "download_button": "下载",
     "mime": "MIME 类型：",
@@ -806,7 +806,7 @@
     "open_full": "展开显示",
     "collapse": "折叠到正常大小",
     "title": "笔记地图",
-    "fix-nodes": "修复节点",
+    "fix-nodes": "固定节点",
     "link-distance": "链接距离"
   },
   "note_paths": {
@@ -1213,7 +1213,7 @@
     "color": "字体颜色",
     "bg_color": "背景颜色",
     "visibility_title": "高亮列表可见性",
-    "visibility_description": "您可以通过添加 #hideHighlightWidget 标签来隐藏每个笔记的高亮小部件。",
+    "visibility_description": "您可以通过添加 #hideHighlightWidget 标签来隐藏单个笔记的高亮小部件。",
     "shortcut_info": "您可以在选项 -> 快捷键中为快速切换右侧面板（包括高亮列表）配置键盘快捷键（名称为 'toggleRightPane'）。"
   },
   "table_of_contents": {
@@ -1547,7 +1547,7 @@
     "close_other_tabs": "关闭其他标签页",
     "close_right_tabs": "关闭右侧标签页",
     "close_all_tabs": "关闭所有标签页",
-    "reopen_last_tab": "重新打开最后一个关闭的标签页",
+    "reopen_last_tab": "重新打开关闭的标签页",
     "move_tab_to_new_window": "将此标签页移动到新窗口",
     "copy_tab_to_new_window": "将此标签页复制到新窗口",
     "new_tab": "新标签页"
@@ -1616,7 +1616,7 @@
     "auto-detect-language": "自动检测"
   },
   "highlighting": {
-    "title": "",
+    "title": "代码块",
     "description": "控制文本笔记中代码块的语法高亮，代码笔记不会受到影响。",
     "color-scheme": "颜色方案"
   },
@@ -1627,21 +1627,21 @@
     "theme_group_dark": "深色主题"
   },
   "classic_editor_toolbar": {
-    "title": "格式化"
+    "title": "格式"
   },
   "editor": {
     "title": "编辑器"
   },
   "editing": {
     "editor_type": {
-      "label": "格式化工具栏",
+      "label": "格式工具栏",
       "floating": {
         "title": "浮动",
         "description": "编辑工具出现在光标附近;"
       },
       "fixed": {
         "title": "固定",
-        "description": "编辑工具出现在 \"格式化\" 功能区标签中。"
+        "description": "编辑工具出现在 \"格式\" 功能区标签中。"
       },
       "multiline-toolbar": "如果工具栏无法完全显示，则分多行显示。"
     }

apps/server/package.json

@@ -87,8 +87,8 @@
     "mime-types": "3.0.1",
     "multer": "2.0.0",
     "normalize-strings": "1.1.1",
-    "ollama": "0.5.15",
-    "openai": "4.103.0",
+    "ollama": "0.5.16",
+    "openai": "4.104.0",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",

package.json

@@ -40,7 +40,7 @@
     "@playwright/test": "^1.36.0",
     "@triliumnext/server": "workspace:*",
     "@types/express": "^4.17.21",
-    "@types/node": "22.15.24",
+    "@types/node": "22.15.29",
     "@vitest/coverage-v8": "^3.0.5",
     "@vitest/ui": "^3.0.0",
     "chalk": "5.4.1",

packages/codemirror/package.json

@@ -30,7 +30,7 @@
     "@codemirror/lang-xml": "6.1.0",
     "@codemirror/legacy-modes": "6.5.1",
     "@codemirror/search": "6.5.11",
-    "@codemirror/view": "6.37.0",
+    "@codemirror/view": "6.37.1",
     "@fsegurai/codemirror-theme-abcdef": "6.1.4",
     "@fsegurai/codemirror-theme-abyss": "6.1.4",
     "@fsegurai/codemirror-theme-android-studio": "6.1.4",