Merge branch 'main' of https://github.com/TriliumNext/Trilium into feat/ui-improvements

apps/client/package.json

@@ -55,7 +55,7 @@
     "mark.js": "8.11.1",
     "marked": "16.4.1",
     "mermaid": "11.12.1",
-    "mind-elixir": "5.3.4",
+    "mind-elixir": "5.3.5",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
     "preact": "10.27.2",

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

@@ -1914,7 +1914,7 @@
   },
   "custom_date_time_format": {
     "title": "自定义日期/时间格式",
-    "description": "通过<shortcut />或工具栏的方式可自定义日期和时间格式，有关日期/时间格式字符串中各个字符的含义，请参阅<doc>Day.js docs</doc>。",
+    "description": "自定义通过 <shortcut /> 或工具栏插入的日期和时间格式。有关日期/时间格式字符串中各个字符的含义，请参阅<doc>Day.js docs</doc>。",
     "format_string": "日期/时间格式字符串：",
     "formatted_time": "格式化后日期/时间："
   },

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

@@ -1589,7 +1589,7 @@
   "tree-context-menu": {
     "open-in-a-new-tab": "Abrir en nueva pestaña",
     "open-in-a-new-split": "Abrir en nueva división",
-    "insert-note-after": "Insertar nota después de",
+    "insert-note-after": "Insertar nota contigua",
     "insert-child-note": "Insertar subnota",
     "delete": "Eliminar",
     "search-in-subtree": "Buscar en subárbol",

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

@@ -39,7 +39,10 @@
     "edit_branch_prefix": "ブランチ接頭辞の編集",
     "help_on_tree_prefix": "ツリー接頭辞に関するヘルプ",
     "prefix": "接頭辞: ",
-    "branch_prefix_saved": "ブランチの接頭辞が保存されました。"
+    "branch_prefix_saved": "ブランチの接頭辞が保存されました。",
+    "edit_branch_prefix_multiple": "{{count}} ブランチのブランチ接頭辞を編集",
+    "branch_prefix_saved_multiple": "{{count}} 個のブランチのブランチ接頭辞が保存されました。",
+    "affected_branches": "影響を受けるブランチ {{count}}:"
   },
   "global_menu": {
     "menu": "メニュー",
@@ -2076,5 +2079,8 @@
     "edit-slide": "このスライドを編集",
     "start-presentation": "プレゼンテーションを開始",
     "slide-overview": "スライドの概要を切り替え"
+  },
+  "calendar_view": {
+    "delete_note": "ノートを削除..."
   }
 }

apps/server/package.json

@@ -110,7 +110,7 @@
     "multer": "2.0.2",
     "normalize-strings": "1.1.1",
     "ollama": "0.6.2",
-    "openai": "6.8.0",
+    "openai": "6.8.1",
     "rand-token": "1.0.1",
     "safe-compare": "1.1.4",
     "sanitize-filename": "1.6.3",
@@ -126,7 +126,7 @@
     "tmp": "0.2.5",
     "turndown": "7.2.2",
     "unescape": "1.0.1",
-    "vite": "7.1.12",
+    "vite": "7.2.1",
     "ws": "8.18.3",
     "xml2js": "0.6.2",
     "yauzl": "3.2.0"

apps/website/package.json

@@ -22,7 +22,7 @@
 		"eslint-config-preact": "2.0.0",
 		"typescript": "5.9.3",
 		"user-agent-data-types": "0.4.2",
-		"vite": "7.1.12"
+		"vite": "7.2.1"
 	},
 	"eslintConfig": {
 		"extends": "preact"

package.json

@@ -65,7 +65,7 @@
     "typescript": "~5.9.0",
     "typescript-eslint": "8.46.3",
     "upath": "2.0.1",
-    "vite": "7.1.12",
+    "vite": "7.2.1",
     "vite-plugin-dts": "~4.5.0",
     "vitest": "3.2.4"
   },

packages/ckeditor5-admonition/package.json

@@ -28,7 +28,7 @@
     "@typescript-eslint/parser": "8.46.3",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-istanbul": "3.2.4",
-    "ckeditor5": "47.1.0",
+    "ckeditor5": "47.2.0",
     "eslint": "9.39.1",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
@@ -42,7 +42,7 @@
     "webdriverio": "9.20.0"
   },
   "peerDependencies": {
-    "ckeditor5": "47.1.0"
+    "ckeditor5": "47.2.0"
   },
   "author": "Elian Doran <contact@eliandoran.me>",
   "license": "GPL-2.0-or-later",

packages/ckeditor5-footnotes/package.json

@@ -29,7 +29,7 @@
     "@typescript-eslint/parser": "8.46.3",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-istanbul": "3.2.4",
-    "ckeditor5": "47.1.0",
+    "ckeditor5": "47.2.0",
     "eslint": "9.39.1",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
@@ -43,7 +43,7 @@
     "webdriverio": "9.20.0"
   },
   "peerDependencies": {
-    "ckeditor5": "47.1.0"
+    "ckeditor5": "47.2.0"
   },
   "scripts": {
     "build": "node ./scripts/build-dist.mjs",

packages/ckeditor5-keyboard-marker/package.json

@@ -31,7 +31,7 @@
     "@typescript-eslint/parser": "8.46.3",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-istanbul": "3.2.4",
-    "ckeditor5": "47.1.0",
+    "ckeditor5": "47.2.0",
     "eslint": "9.39.1",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
@@ -45,7 +45,7 @@
     "webdriverio": "9.20.0"
   },
   "peerDependencies": {
-    "ckeditor5": "47.1.0"
+    "ckeditor5": "47.2.0"
   },
   "scripts": {
     "build": "node ./scripts/build-dist.mjs",

packages/ckeditor5-math/package.json

@@ -32,7 +32,7 @@
     "@typescript-eslint/parser": "8.46.3",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-istanbul": "3.2.4",
-    "ckeditor5": "47.1.0",
+    "ckeditor5": "47.2.0",
     "eslint": "9.39.1",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
@@ -46,7 +46,7 @@
     "webdriverio": "9.20.0"
   },
   "peerDependencies": {
-    "ckeditor5": "47.1.0"
+    "ckeditor5": "47.2.0"
   },
   "scripts": {
     "build": "node ./scripts/build-dist.mjs",
@@ -71,6 +71,6 @@
     ]
   },
   "dependencies": {
-    "@ckeditor/ckeditor5-icons": "47.1.0"
+    "@ckeditor/ckeditor5-icons": "47.2.0"
   }
 }

packages/ckeditor5-mermaid/package.json

@@ -31,7 +31,7 @@
     "@typescript-eslint/parser": "8.46.3",
     "@vitest/browser": "3.2.4",
     "@vitest/coverage-istanbul": "3.2.4",
-    "ckeditor5": "47.1.0",
+    "ckeditor5": "47.2.0",
     "eslint": "9.39.1",
     "eslint-config-ckeditor5": ">=9.1.0",
     "http-server": "14.1.1",
@@ -45,7 +45,7 @@
     "webdriverio": "9.20.0"
   },
   "peerDependencies": {
-    "ckeditor5": "47.1.0"
+    "ckeditor5": "47.2.0"
   },
   "scripts": {
     "build": "node ./scripts/build-dist.mjs",

packages/ckeditor5/package.json

@@ -11,8 +11,8 @@
     "@triliumnext/ckeditor5-keyboard-marker": "workspace:*",
     "@triliumnext/ckeditor5-math": "workspace:*",
     "@triliumnext/ckeditor5-mermaid": "workspace:*",
-    "ckeditor5": "47.1.0",
+    "ckeditor5": "47.2.0",
-    "ckeditor5-premium-features": "47.1.0"
+    "ckeditor5-premium-features": "47.2.0"
   },
   "devDependencies": {
     "@smithy/middleware-retry": "4.4.6",