Merge remote-tracking branch 'origin/main' into react/settings

; Conflicts: ; apps/client/package.json ; apps/client/src/translations/en/translation.json ; apps/client/src/translations/tw/translation.json ; pnpm-lock.yaml
2025-10-20 15:19:01 +02:00 · 2025-08-19 13:50:27 +03:00 · 2025-08-19 13:50:27 +03:00 · cddf9f0242
commit cddf9f0242
parent 3e17ff5e7b c5ec928aac
53 changed files with 2330 additions and 972 deletions
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 # Trilium Notes

 ![GitHub Sponsors](https://img.shields.io/github/sponsors/eliandoran) ![LiberaPay patrons](https://img.shields.io/liberapay/patrons/ElianDoran)  
-![Docker Pulls](https://img.shields.io/docker/pulls/triliumnext/notes)
-![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/triliumnext/notes/total)  
+![Docker Pulls](https://img.shields.io/docker/pulls/triliumnext/trilium)
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/triliumnext/trilium/total)  
 [![RelativeCI](https://badges.relative-ci.com/badges/Di5q7dz9daNDZ9UXi0Bp?branch=develop)](https://app.relative-ci.com/projects/Di5q7dz9daNDZ9UXi0Bp) [![Translation status](https://hosted.weblate.org/widget/trilium/svg-badge.svg)](https://hosted.weblate.org/engage/trilium/)

 [English](./README.md) | [Chinese (Simplified)](./docs/README-ZH_CN.md) | [Chinese (Traditional)](./docs/README-ZH_TW.md) | [Russian](./docs/README.ru.md) | [Japanese](./docs/README.ja.md) | [Italian](./docs/README.it.md) | [Spanish](./docs/README.es.md)
@ -46,15 +46,15 @@ See [screenshots](https://triliumnext.github.io/Docs/Wiki/screenshot-tour) for q
 - [awesome-trilium](https://github.com/Nriver/awesome-trilium) for 3rd party themes, scripts, plugins and more.
 - [TriliumRocks!](https://trilium.rocks/) for tutorials, guides, and much more.

-## ⚠️ Why TriliumNext?
+## ❓Why TriliumNext?

-[The original Trilium project is in maintenance mode](https://github.com/zadam/trilium/issues/4620).
+The original Trilium developer ([Zadam](https://github.com/zadam)) has graciously given the Trilium repository to the community project which resides at https://github.com/TriliumNext

-### Migrating from Trilium?
+### ⬆️Migrating from Zadam/Trilium?

-There are no special migration steps to migrate from a zadam/Trilium instance to a TriliumNext/Notes instance. Simply [install TriliumNext/Notes](#-installation) as usual and it will use your existing database.
+There are no special migration steps to migrate from a zadam/Trilium instance to a TriliumNext/Trilium instance. Simply [install TriliumNext/Trilium](#-installation) as usual and it will use your existing database.

-Versions up to and including [v0.90.4](https://github.com/TriliumNext/Notes/releases/tag/v0.90.4) are compatible with the latest zadam/trilium version of [v0.63.7](https://github.com/zadam/trilium/releases/tag/v0.63.7). Any later versions of TriliumNext have their sync versions incremented.
+Versions up to and including [v0.90.4](https://github.com/TriliumNext/Trilium/releases/tag/v0.90.4) are compatible with the latest zadam/trilium version of [v0.63.7](https://github.com/zadam/trilium/releases/tag/v0.63.7). Any later versions of TriliumNext/Trilium have their sync versions incremented which prevents direct migration.

 ## 📖 Documentation

@ -75,8 +75,8 @@ Feel free to join our official conversations. We would love to hear what feature

 - [Matrix](https://matrix.to/#/#triliumnext:matrix.org) (For synchronous discussions.)
  - The `General` Matrix room is also bridged to [XMPP](xmpp:discuss@trilium.thisgreat.party?join)
- [Github Discussions](https://github.com/TriliumNext/Notes/discussions) (For asynchronous discussions.)
- [Github Issues](https://github.com/TriliumNext/Notes/issues) (For bug reports and feature requests.)
+- [Github Discussions](https://github.com/TriliumNext/Trilium/discussions) (For asynchronous discussions.)
+- [Github Issues](https://github.com/TriliumNext/Trilium/issues) (For bug reports and feature requests.)

 ## 🏗 Installation

@ -104,9 +104,11 @@ Currently only the latest versions of Chrome & Firefox are supported (and tested

 To use TriliumNext on a mobile device, you can use a mobile web browser to access the mobile interface of a server installation (see below).

-If you prefer a native Android app, you can use [TriliumDroid](https://apt.izzysoft.de/fdroid/index/apk/eu.fliegendewurst.triliumdroid). Report bugs and missing features at [their repository](https://github.com/FliegendeWurst/TriliumDroid).
+See issue https://github.com/TriliumNext/Trilium/issues/4962 for more information on mobile app support.

-See issue https://github.com/TriliumNext/Notes/issues/72 for more information on mobile app support.
+If you prefer a native Android app, you can use [TriliumDroid](https://apt.izzysoft.de/fdroid/index/apk/eu.fliegendewurst.triliumdroid).
+Report bugs and missing features at [their repository](https://github.com/FliegendeWurst/TriliumDroid).
+Note: It is best to disable automatic updates on your server installation (see below) when using TriliumDroid since the sync version must match between Trilium and TriliumDroid.

 ### Server

@ -152,11 +154,11 @@ pnpm install
 pnpm nx --project=desktop electron-forge:make -- --arch=x64 --platform=win32
 ```

-For more details, see the [development docs](https://github.com/TriliumNext/Notes/blob/develop/docs/Developer%20Guide/Developer%20Guide/Building%20and%20deployment/Running%20a%20development%20build.md).
+For more details, see the [development docs](https://github.com/TriliumNext/Trilium/tree/main/docs/Developer%20Guide/Developer%20Guide).

 ### Developer Documentation

-Please view the [documentation guide](./docs/Developer%20Guide/Developer%20Guide/Environment%20Setup.md) for details. If you have more questions, feel free to reach out via the links described in the "Discuss with us" section above.
+Please view the [documentation guide](https://github.com/TriliumNext/Trilium/blob/main/docs/Developer%20Guide/Developer%20Guide/Environment%20Setup.md) for details. If you have more questions, feel free to reach out via the links described in the "Discuss with us" section above.

 ## 👏 Shoutouts

@ -168,7 +170,7 @@ Please view the [documentation guide](./docs/Developer%20Guide/Developer%20Guide
 ## 🤝 Support

 Support for the TriliumNext organization will be possible in the near future. For now, you can:
- Support continued development on TriliumNext by supporting our developers: [eliandoran](https://github.com/sponsors/eliandoran) (See the [repository insights]([developers]([url](https://github.com/TriliumNext/Notes/graphs/contributors))) for a full list)
+- Support continued development on TriliumNext by supporting our developers: [eliandoran](https://github.com/sponsors/eliandoran) (See the [repository insights]([developers]([url](https://github.com/TriliumNext/trilium/graphs/contributors))) for a full list)
 - Show a token of gratitude to the original Trilium developer ([zadam](https://github.com/sponsors/zadam)) via [PayPal](https://paypal.me/za4am) or Bitcoin (bitcoin:bc1qv3svjn40v89mnkre5vyvs2xw6y8phaltl385d2).


--- a/_regroup/package.json
+++ b/_regroup/package.json
@ -38,7 +38,7 @@
    "@playwright/test": "1.54.2",
    "@stylistic/eslint-plugin": "5.2.3",        
    "@types/express": "5.0.3",    
-    "@types/node": "22.17.1",    
+    "@types/node": "22.17.2",    
    "@types/yargs": "17.0.33",
    "@vitest/coverage-v8": "3.2.4",
    "eslint": "9.33.0",
--- a/apps/client/package.json
+++ b/apps/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@triliumnext/client",
-  "version": "0.97.2",
+  "version": "0.98.0",
  "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
  "private": true,
  "license": "AGPL-3.0-only",
@ -36,7 +36,7 @@
    "draggabilly": "3.0.0",
    "force-graph": "1.50.1",
    "globals": "16.3.0",
-    "i18next": "25.3.4",
+    "i18next": "25.3.6",
    "i18next-http-backend": "3.0.2",
    "jquery": "3.7.1",
    "jquery.fancytree": "2.38.5",
@ -46,12 +46,12 @@
    "leaflet": "1.9.4",
    "leaflet-gpx": "2.2.0",
    "mark.js": "8.11.1",
-    "marked": "16.1.2",
+    "marked": "16.2.0",
    "mermaid": "11.9.0",
-    "mind-elixir": "5.0.5",
+    "mind-elixir": "5.0.6",
    "normalize.css": "8.0.1",
    "panzoom": "9.4.3",
-    "preact": "10.27.0",
+    "preact": "10.27.1",
    "react-i18next": "15.6.1",
    "split.js": "1.6.5",
    "svg-pan-zoom": "3.6.2",
--- a/apps/client/src/services/shortcuts.ts
+++ b/apps/client/src/services/shortcuts.ts
@ -14,6 +14,32 @@ interface ShortcutBinding {
 // Store all active shortcut bindings for management
 const activeBindings: Map<string, ShortcutBinding[]> = new Map();

+// Handle special key mappings and aliases
+const keyMap: { [key: string]: string[] } = {
+    'return': ['Enter'],
+    'enter': ['Enter'],  // alias for return
+    'del': ['Delete'],
+    'delete': ['Delete'], // alias for del
+    'esc': ['Escape'],
+    'escape': ['Escape'], // alias for esc
+    'space': [' ', 'Space'],
+    'tab': ['Tab'],
+    'backspace': ['Backspace'],
+    'home': ['Home'],
+    'end': ['End'],
+    'pageup': ['PageUp'],
+    'pagedown': ['PageDown'],
+    'up': ['ArrowUp'],
+    'down': ['ArrowDown'],
+    'left': ['ArrowLeft'],
+    'right': ['ArrowRight']
+};
+
+// Function keys
+for (let i = 1; i <= 19; i++) {
+    keyMap[`f${i}`] = [`F${i}`];
+}
+
 function removeGlobalShortcut(namespace: string) {
    bindGlobalShortcut("", null, namespace);
 }
@ -124,32 +150,6 @@ export function keyMatches(e: KeyboardEvent, key: string): boolean {
        return false;
    }

-    // Handle special key mappings and aliases
-    const keyMap: { [key: string]: string[] } = {
-        'return': ['Enter'],
-        'enter': ['Enter'],  // alias for return
-        'del': ['Delete'],
-        'delete': ['Delete'], // alias for del
-        'esc': ['Escape'],
-        'escape': ['Escape'], // alias for esc
-        'space': [' ', 'Space'],
-        'tab': ['Tab'],
-        'backspace': ['Backspace'],
-        'home': ['Home'],
-        'end': ['End'],
-        'pageup': ['PageUp'],
-        'pagedown': ['PageDown'],
-        'up': ['ArrowUp'],
-        'down': ['ArrowDown'],
-        'left': ['ArrowLeft'],
-        'right': ['ArrowRight']
-    };
-
-    // Function keys
-    for (let i = 1; i <= 19; i++) {
-        keyMap[`f${i}`] = [`F${i}`];
-    }
-
    const mappedKeys = keyMap[key.toLowerCase()];
    if (mappedKeys) {
        return mappedKeys.includes(e.key) || mappedKeys.includes(e.code);
@ -163,7 +163,7 @@ export function keyMatches(e: KeyboardEvent, key: string): boolean {

    // For letter keys, use the physical key code for consistency
    if (key.length === 1 && key >= 'a' && key <= 'z') {
-        return e.code === `Key${key.toUpperCase()}`;
+        return e.key.toLowerCase() === key.toLowerCase();
    }

    // For regular keys, check both key and code as fallback
--- a/apps/client/src/translations/cn/translation.json
+++ b/apps/client/src/translations/cn/translation.json
@ -1992,11 +1992,12 @@
    "help_title": "显示关于此画面的更多信息"
  },
  "call_to_action": {
-    "next_theme_title": "新的 Trilium 主题已进入稳定版",
-    "next_theme_message": "有一段时间，我们一直在设计新的主题，为了让应用程序看起来更加现代。",
-    "next_theme_button": "切换至新的 Trilium 主题",
    "background_effects_title": "背景效果现已推出稳定版本",
    "background_effects_message": "在 Windows 装置上，背景效果现在已完全稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。此技术也用于其他应用程序，例如 Windows 资源管理器。",
-    "background_effects_button": "启用背景效果"
+    "background_effects_button": "启用背景效果",
+    "next_theme_title": "试用新 Trilium 主题",
+    "next_theme_message": "当前使用旧版主题，要试用新主题吗？",
+    "next_theme_button": "试用新主题",
+    "dismiss": "关闭"
  }
 }
--- a/apps/client/src/translations/en/translation.json
+++ b/apps/client/src/translations/en/translation.json
@ -1999,12 +1999,13 @@
    "help_title": "Display more information about this screen"
  },
  "call_to_action": {
-    "next_theme_title": "The new Trilium theme is now stable",
-    "next_theme_message": "For a while now, we've been working on a new theme to give the application a more modern look.",
-    "next_theme_button": "Switch to the new Trilium theme",
+    "next_theme_title": "Try the new Trilium theme",
+    "next_theme_message": "You are currently using the legacy theme, would you like to try the new theme?",
+    "next_theme_button": "Try the new theme",
    "background_effects_title": "Background effects are now stable",
    "background_effects_message": "On Windows devices, background effects are now fully stable. The background effects adds a touch of color to the user interface by blurring the background behind it. This technique is also used in other applications such as Windows Explorer.",
-    "background_effects_button": "Enable background effects"
+    "background_effects_button": "Enable background effects",
+    "dismiss": "Dismiss"
  },
  "settings": {
    "related_settings": "Related settings"
--- a/apps/client/src/translations/fa/translation.json
+++ b/apps/client/src/translations/fa/translation.json
@ -0,0 +1,22 @@
+{
+  "about": {
+    "title": "درباره Trilium Notes",
+    "homepage": "صفحه اصلی:",
+    "app_version": "نسخه برنامه:",
+    "db_version": "نسخه پایگاه داده:",
+    "sync_version": "نسخه منطبق:",
+    "build_date": "تاریخ ساخت:",
+    "build_revision": "نسخه بازنگری شده:",
+    "data_directory": "دایرکتوری داده:"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "خطای بحرانی",
+      "message": "خطای بحرانی رخ داده که مانع از اجرای برنامه می شود\n\n {{message}}\n\nبه احتمال زیاد ناشی از خطای غیرمنتظره در اجرای ناموفق یک اسکریپت است. برنامه را در مد ایمن اجرا کنید و خطا را بررسی نمایید."
+    }
+  },
+  "add_link": {
+    "add_link": "افزودن لینک",
+    "note": "یادداشت"
+  }
+}
--- a/apps/client/src/translations/fi/translation.json
+++ b/apps/client/src/translations/fi/translation.json
@ -0,0 +1,147 @@
+{
+  "about": {
+    "title": "Lisätietoja Trilium Notes:ista",
+    "homepage": "Kotisivu:",
+    "app_version": "Sovelluksen versio:",
+    "db_version": "Tietokannan versio:",
+    "build_date": "Koontipäivämäärä:",
+    "data_directory": "Datakansio:",
+    "sync_version": "Synkronoinnin versio:",
+    "build_revision": "Sovelluksen versio:"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "Kriittinen virhe"
+    },
+    "widget-error": {
+      "title": "Widgetin luonti epäonnistui"
+    }
+  },
+  "add_link": {
+    "add_link": "Lisää linkki",
+    "link_title": "Linkin otsikko",
+    "button_add_link": "Lisää linkki",
+    "note": "Muistio",
+    "search_note": "etsi muistiota sen nimellä"
+  },
+  "branch_prefix": {
+    "prefix": "Etuliite: ",
+    "save": "Tallenna"
+  },
+  "bulk_actions": {
+    "bulk_actions": "Massatoiminnot",
+    "available_actions": "Saatavilla olevat toiminnot",
+    "chosen_actions": "Valitut toiminnot",
+    "execute_bulk_actions": "Toteuta massatoiminnot",
+    "bulk_actions_executed": "Massatoiminnot on toteutettu onnistuneesti.",
+    "none_yet": "Ei vielä... lisää toiminto klikkaamalla jotiain yllä saatavilla olevaa yltä.",
+    "labels": "Merkit",
+    "relations": "Suhteet",
+    "notes": "Muistiot",
+    "other": "Muut",
+    "affected_notes": "Vaikuttaa muistioihin"
+  },
+  "clone_to": {
+    "clone_notes_to": "Kopioi muistiot...",
+    "help_on_links": "Apua linkkeihin",
+    "notes_to_clone": "Kopioitavat muistiot",
+    "target_parent_note": "Kohteen päämuistio",
+    "search_for_note_by_its_name": "ensi muistiota sen nimellä",
+    "cloned_note_prefix_title": "Kopioitu muistia näytetään puussa annetulla etuliitteellä",
+    "prefix_optional": "Etuliite (valinnainen)",
+    "clone_to_selected_note": "Kopioi valittuun muistioon",
+    "note_cloned": "Muistio \"{{clonedTitle}}\" on kopioitu \"{{targetTitle}}\""
+  },
+  "confirm": {
+    "confirmation": "Vahvistus",
+    "cancel": "Peruuta",
+    "ok": "OK",
+    "also_delete_note": "Poista myös muistio"
+  },
+  "delete_notes": {
+    "delete_notes_preview": "Poista muistion esikatselu",
+    "close": "Sulje",
+    "notes_to_be_deleted": "Seuraavat muistiot tullaan poistamaan ({{notesCount}})",
+    "no_note_to_delete": "Muistioita ei poisteta (vain kopiot).",
+    "cancel": "Peruuta",
+    "ok": "OK"
+  },
+  "export": {
+    "export_note_title": "Vie muistio",
+    "close": "Sulje",
+    "format_html": "HTML - suositeltu, sillä se säilyttää kaikki formatoinnit",
+    "format_markdown": "Markdown - tämä säilyttää suurimman osan formatoinneista.",
+    "opml_version_1": "OPML v1.0 - pelkkä teksti",
+    "opml_version_2": "OPML v2.0 - sallii myös HTML:n",
+    "export": "Vie",
+    "choose_export_type": "Valitse ensin viennin tyyppi",
+    "export_status": "Viennin tila",
+    "export_in_progress": "Vienti käynnissä: {{progressCount}}",
+    "export_finished_successfully": "Vienti valmistui onnistuneesti.",
+    "format_pdf": "PDF - tulostukseen ja jakamiseen."
+  },
+  "help": {
+    "title": "Lunttilappu",
+    "noteNavigation": "Muistion navigointi",
+    "goUpDown": "mene ylös/alas muistioiden listassa",
+    "collapseExpand": "pienennä/suurenna solmu",
+    "notSet": "ei asetettu",
+    "goBackForwards": "mene taaksepäin/eteenpäin historiassa",
+    "jumpToParentNote": "Hyppää ylempään muistioon",
+    "collapseWholeTree": "pienennä koko muistio puu",
+    "onlyInDesktop": "Vain työpöytänäkymässä (Electron build)",
+    "openEmptyTab": "Avaa tyhjä välilehti",
+    "closeActiveTab": "sulje aktiivinen välilehti",
+    "activateNextTab": "aktivoi seuraava välilehti",
+    "activatePreviousTab": "aktivoi edellinen välilehti",
+    "creatingNotes": "Luo muistiota",
+    "movingCloningNotes": "Siirrä / kopioi muistioita",
+    "moveNoteUpHierarchy": "siirrä muistio ylöspäin listassa",
+    "selectNote": "valitse muistio",
+    "editingNotes": "Muokkaa solmua",
+    "createEditLink": "luo / muokkaa ulkoista linkkiä",
+    "createInternalLink": "luo sisäinen linkki",
+    "insertDateTime": "lisää nykyinen päivämäärä ja aika hiiren kohdalle",
+    "troubleshooting": "Vianmääritys",
+    "reloadFrontend": "lataa Trilium:in käyttöliittymä",
+    "showDevTools": "näytä kehittäjätyökalut",
+    "showSQLConsole": "näytä SQL konsoli",
+    "other": "Muut"
+  },
+  "import": {
+    "importIntoNote": "Tuo muistioon",
+    "chooseImportFile": "Valitse tuonnin tiedosto",
+    "options": "Valinnat",
+    "safeImport": "Turvallinen tuonti",
+    "shrinkImages": "Kutista kuvat",
+    "replaceUnderscoresWithSpaces": "Korvaa alaviivat väleillä tuotujen muistioiden tiedostonimissä",
+    "import": "Tuo",
+    "failed": "Tuonti epäonnistui: {{message}}.",
+    "html_import_tags": {
+      "title": "HTML Tuonnin Tunnisteet",
+      "placeholder": "Lisää HTML tunnisteet, yksi per rivi"
+    },
+    "import-status": "Tuonnin tila",
+    "in-progress": "Tuonti vaiheessa: {{progress}}",
+    "successful": "Tuonti valmistui onnistuneesti."
+  },
+  "include_note": {
+    "dialog_title": "Sisällytä muistio",
+    "label_note": "Muistio",
+    "placeholder_search": "etsi muistiota sen nimellä",
+    "box_size_small": "pieni (~ 10 riviä)",
+    "box_size_medium": "keskisuuri (~ 30 riviä)",
+    "button_include": "Sisällytä muistio"
+  },
+  "info": {
+    "modalTitle": "Info viesti",
+    "closeButton": "Sulje",
+    "okButton": "OK"
+  },
+  "jump_to_note": {
+    "search_button": "Etsi koko tekstistä"
+  },
+  "call_to_action": {
+    "dismiss": "Hylkää"
+  }
+}
--- a/apps/client/src/translations/fr/translation.json
+++ b/apps/client/src/translations/fr/translation.json
@ -202,7 +202,8 @@
    "okButton": "OK"
  },
  "jump_to_note": {
-    "search_button": "Rechercher dans le texte intégral"
+    "search_button": "Rechercher dans le texte intégral",
+    "search_placeholder": "Rechercher une note par son nom ou saisir ‘>’ pour les commandes…"
  },
  "markdown_import": {
    "dialog_title": "Importation Markdown",
@ -222,11 +223,16 @@
  "note_type_chooser": {
    "modal_title": "Choisissez le type de note",
    "modal_body": "Choisissez le type de note/le modèle de la nouvelle note :",
-    "templates": "Modèles"
+    "templates": "Modèles",
+    "change_path_prompt": "Modifier l’emplacement de création de la nouvelle note :",
+    "search_placeholder": "Rechercher le chemin par nom (par défaut si vide)",
+    "builtin_templates": "Modèles intégrés"
  },
  "password_not_set": {
    "title": "Le mot de passe n'est pas défini",
-    "body1": "Les notes protégées sont cryptées à l'aide d'un mot de passe utilisateur, mais le mot de passe n'a pas encore été défini."
+    "body1": "Les notes protégées sont cryptées à l'aide d'un mot de passe utilisateur, mais le mot de passe n'a pas encore été défini.",
+    "body2": "Pour pouvoir protéger les notes, cliquez sur le bouton ci-dessous pour ouvrir la boîte de dialogue Options et définir votre mot de passe.",
+    "go_to_password_options": "Accéder aux options de mot de passe"
  },
  "prompt": {
    "title": "Prompt",
@ -268,7 +274,9 @@
    "mime": "MIME : ",
    "file_size": "Taille du fichier :",
    "preview": "Aperçu :",
-    "preview_not_available": "L'aperçu n'est pas disponible pour ce type de note."
+    "preview_not_available": "L'aperçu n'est pas disponible pour ce type de note.",
+    "restore_button": "Restaurer",
+    "delete_button": "Supprimer"
  },
  "sort_child_notes": {
    "sort_children_by": "Trier les enfants par...",
@ -384,7 +392,7 @@
    "share_index": "la note avec ce label listera toutes les racines des notes partagées",
    "display_relations": "noms des relations délimités par des virgules qui doivent être affichés. Tous les autres seront masqués.",
    "hide_relations": "noms de relations délimités par des virgules qui doivent être masqués. Tous les autres seront affichés.",
-    "title_template": "titre par défaut des notes créées en tant qu'enfants de cette note. La valeur est évaluée sous forme de chaîne JavaScript \n                        et peut ainsi être enrichi de contenu dynamique via les variables injectées <code>now</code> et <code>parentNote</code>. Exemples :\n                        \n                        <ul>\n                            <li><code>Œuvres littéraires de ${parentNote.getLabelValue('authorName')}</code></li>\n                            <li><code>Connectez-vous pour ${now.format('YYYY-MM-DD HH:mm:ss')}</code></li>\n                        </ul>\n                        \n                        Consultez le <a href=\"https://triliumnext.github.io/Docs/Wiki/default-note-title.html\">wiki avec plus de détails</a>, la documentation sur l'API pour <a href=\"https://zadam.github.io/trilium/backend_api/Note.html\">parentNote</a> et <a href=\"https://day.js.org/docs/en/display/format\">maintenant< /a> pour plus de détails.",
+    "title_template": "titre par défaut des notes créées en tant qu'enfants de cette note. La valeur est évaluée sous forme de chaîne JavaScript \n                                                et peut ainsi être enrichi de contenu dynamique via les variables injectées <code>now</code> et <code>parentNote</code>. Exemples :\n                                                \n                                                <ul>\n                                                        <li><code>Œuvres littéraires de ${parentNote.getLabelValue('authorName')}</code></li>\n                                                        <li><code>Connectez-vous pour ${now.format('YYYY-MM-DD HH:mm:ss')}</code></li>\n                                                </ul>\n                                                \n                                                Consultez le <a href=\"https://triliumnext.github.io/Docs/Wiki/default-note-title.html\">wiki avec plus de détails</a>, la documentation sur l'API pour <a href=\"https://zadam.github.io/trilium/backend_api/Note.html\">parentNote</a> et <a href=\"https://day.js.org/docs/en/display/format\">maintenant</a> pour plus de détails.",
    "template": "Cette note apparaîtra parmi les modèles disponibles lors de la création d'une nouvelle note",
    "toc": "<code>#toc</code> ou <code>#toc=show</code> forcera l'affichage de la table des matières, <code>#toc=hide</code> force qu'elle soit masquée. Si le label n'existe pas, le paramètre global est utilisé",
    "color": "définit la couleur de la note dans l'arborescence des notes, les liens, etc. Utilisez n'importe quelle valeur de couleur CSS valide comme « rouge » ou #a13d5f",
@ -418,7 +426,8 @@
    "other_notes_with_name": "Autres notes portant le nom {{attributeType}} \"{{attributeName}}\"",
    "and_more": "... et {{count}} plus.",
    "print_landscape": "Lors de l'exportation en PDF, change l'orientation de la page en paysage au lieu de portrait.",
-    "print_page_size": "Lors de l'exportation en PDF, change la taille de la page. Valeurs supportées : <code>A0</code>, <code>A1</code>, <code>A2</code>, <code>A3</code>, <code>A4</code>, <code>A5</code>, <code>A6</code>, <code>Legal</code>, <code>Letter</code>, <code>Tabloid</code>, <code>Ledger</code>."
+    "print_page_size": "Lors de l'exportation en PDF, change la taille de la page. Valeurs supportées : <code>A0</code>, <code>A1</code>, <code>A2</code>, <code>A3</code>, <code>A4</code>, <code>A5</code>, <code>A6</code>, <code>Legal</code>, <code>Letter</code>, <code>Tabloid</code>, <code>Ledger</code>.",
+    "color_type": "Couleur"
  },
  "attribute_editor": {
    "help_text_body1": "Pour ajouter un label, tapez simplement par ex. <code>#rock</code>, ou si vous souhaitez également ajouter une valeur, tapez par ex. <code>#année = 2020</code>",
@ -577,7 +586,8 @@
    "september": "Septembre",
    "october": "Octobre",
    "november": "Novembre",
-    "december": "Décembre"
+    "december": "Décembre",
+    "cannot_find_week_note": "Impossible de trouver la note de la semaine"
  },
  "close_pane_button": {
    "close_this_pane": "Fermer ce volet"
@ -721,7 +731,8 @@
  "basic_properties": {
    "note_type": "Type de note",
    "editable": "Modifiable",
-    "basic_properties": "Propriétés de base"
+    "basic_properties": "Propriétés de base",
+    "language": "Langage"
  },
  "book_properties": {
    "view_type": "Type d'affichage",
@ -732,7 +743,11 @@
    "collapse": "Réduire",
    "expand": "Développer",
    "invalid_view_type": "Type de vue non valide '{{type}}'",
-    "calendar": "Calendrier"
+    "calendar": "Calendrier",
+    "book_properties": "Propriétés de la collection",
+    "table": "Tableau",
+    "geo-map": "Carte géographique",
+    "board": "Tableau de bord"
  },
  "edited_notes": {
    "no_edited_notes_found": "Aucune note modifiée ce jour-là...",
@ -809,7 +824,8 @@
    "unknown_label_type": "Type de label inconnu '{{type}}'",
    "unknown_attribute_type": "Type d'attribut inconnu '{{type}}'",
    "add_new_attribute": "Ajouter un nouvel attribut",
-    "remove_this_attribute": "Supprimer cet attribut"
+    "remove_this_attribute": "Supprimer cet attribut",
+    "remove_color": "Supprimer l’étiquette de couleur"
  },
  "script_executor": {
    "query": "Requête",
@ -899,7 +915,7 @@
    "description1": "Le script de recherche permet de définir les résultats de la recherche en exécutant un script. Cela offre une flexibilité maximale lorsque la recherche standard ne suffit pas.",
    "description2": "Le script de recherche doit être de type \"code\" et sous-type \"backend JavaScript\". Le script doit retourner un tableau de noteIds ou de notes.",
    "example_title": "Voir cet exemple :",
-    "example_code": "// 1. préfiltrage à l'aide de la recherche standard\nconst candidateNotes = api.searchForNotes(\"#journal\"); \n\n// 2. application de critères de recherche personnalisés\nconst matchedNotes = candidateNotes\n    .filter(note => note.title.match(/[0-9]{1,2}\\. ?[0-9]{1,2}\\. ?[0-9]{4}/));\n\nreturn matchedNotes;",
+    "example_code": "// 1. préfiltrage à l'aide de la recherche standard\nconst candidateNotes = api.searchForNotes(\"#journal\"); \n\n// 2. application de critères de recherche personnalisés\nconst matchedNotes = candidateNotes\n        .filter(note => note.title.match(/[0-9]{1,2}\\. ?[0-9]{1,2}\\. ?[0-9]{4}/));\n\nreturn matchedNotes;",
    "note": "Notez que le script de recherche et la l'expression à rechercher standard ne peuvent pas être combinés."
  },
  "search_string": {
@ -1068,7 +1084,8 @@
    "max_width_label": "Largeur maximale du contenu en pixels",
    "apply_changes_description": "Pour appliquer les modifications de largeur du contenu, cliquez sur",
    "reload_button": "recharger l'interface",
-    "reload_description": "changements par rapport aux options d'apparence"
+    "reload_description": "changements par rapport aux options d'apparence",
+    "max_width_unit": "Pixels"
  },
  "native_title_bar": {
    "title": "Barre de titre native (nécessite le redémarrage de l'application)",
@ -1091,7 +1108,10 @@
    "layout-vertical-title": "Vertical",
    "layout-horizontal-title": "Horizontal",
    "layout-vertical-description": "la barre de raccourcis est à gauche (défaut)",
-    "layout-horizontal-description": "la barre de raccourcis est sous la barre des onglets, cette-dernière est s'affiche en pleine largeur."
+    "layout-horizontal-description": "la barre de raccourcis est sous la barre des onglets, cette-dernière est s'affiche en pleine largeur.",
+    "auto_theme": "Hérité (suivre le schéma de couleurs du système)",
+    "light_theme": "Hérité (clair)",
+    "dark_theme": "Hérité (foncé)"
  },
  "zoom_factor": {
    "title": "Facteur de zoom (version bureau uniquement)",
@ -1136,7 +1156,7 @@
  "note_erasure_timeout": {
    "note_erasure_timeout_title": "Délai d'effacement des notes",
    "note_erasure_description": "Les notes supprimées (et les attributs, versions...) sont seulement marquées comme supprimées et il est possible de les récupérer à partir de la boîte de dialogue Notes récentes. Après un certain temps, les notes supprimées sont « effacées », ce qui signifie que leur contenu n'est plus récupérable. Ce paramètre vous permet de configurer la durée entre la suppression et l'effacement de la note.",
-    "erase_notes_after": "Effacer les notes après:",
+    "erase_notes_after": "Effacer les notes après :",
    "manual_erasing_description": "Vous pouvez également déclencher l'effacement manuellement (sans tenir compte de la durée définie ci-dessus) :",
    "erase_deleted_notes_now": "Effacer les notes supprimées maintenant",
    "deleted_notes_erased": "Les notes supprimées ont été effacées."
@ -1650,5 +1670,16 @@
  },
  "modal": {
    "close": "Fermer"
+  },
+  "ai_llm": {
+    "not_started": "Non démarré",
+    "title": "Paramètres IA",
+    "processed_notes": "Notes traitées",
+    "n_notes_queued_0": "{{ count }} note en attente d’indexation",
+    "n_notes_queued_1": "{{ count }} notes en attente d’indexation",
+    "n_notes_queued_2": "",
+    "notes_indexed_0": "{{ count }} note indexée",
+    "notes_indexed_1": "{{ count }} notes indexées",
+    "notes_indexed_2": ""
  }
 }
--- a/apps/client/src/translations/hu/translation.json
+++ b/apps/client/src/translations/hu/translation.json
@ -0,0 +1 @@
+{}
--- a/apps/client/src/translations/ja/translation.json
+++ b/apps/client/src/translations/ja/translation.json
@ -35,7 +35,11 @@
    "link_title_arbitrary": "リンクタイトルは自由に変更可能"
  },
  "branch_prefix": {
-    "save": "保存"
+    "save": "保存",
+    "edit_branch_prefix": "ブランチ接頭辞の編集",
+    "help_on_tree_prefix": "ツリー接頭辞に関するヘルプ",
+    "prefix": "接頭辞： ",
+    "branch_prefix_saved": "ブランチ接頭辞が保存されました。"
  },
  "global_menu": {
    "menu": "メニュー",
@ -59,7 +63,10 @@
    "zoom_out": "ズームアウト",
    "zoom_in": "ズームイン",
    "advanced": "高度",
-    "toggle-zen-mode": "禅モード"
+    "toggle-zen-mode": "禅モード",
+    "switch_to_mobile_version": "モバイル版に切り替え",
+    "switch_to_desktop_version": "デスクトップ版に切り替え",
+    "configure_launchbar": "ランチャーバーの設定"
  },
  "left_pane_toggle": {
    "show_panel": "パネルを表示",
@ -82,14 +89,15 @@
    "help_on_links": "ヘルプへのリンク"
  },
  "delete_notes": {
-    "delete_all_clones_description": "すべてのクローンも削除する（最近の変更では元に戻すことができる）",
+    "delete_all_clones_description": "すべてのクローンも削除（最近の変更では元に戻すことができる）",
    "erase_notes_description": "通常の（ソフト）削除では、ノートは削除されたものとしてマークされ、一定期間内に（最近の変更で）削除を取り消すことができます。このオプションをオンにすると、ノートは即座に削除され、削除を取り消すことはできません。",
    "erase_notes_warning": "すべてのクローンを含め、ノートを完全に消去します（元に戻せません）。これにより、アプリケーションは強制的にリロードされます。",
    "notes_to_be_deleted": "以下のノートが削除されます ({{notesCount}})",
    "no_note_to_delete": "ノートは削除されません（クローンのみ）。",
    "cancel": "キャンセル",
    "ok": "OK",
-    "close": "閉じる"
+    "close": "閉じる",
+    "delete_notes_preview": "ノートのプレビューを削除"
  },
  "calendar": {
    "mon": "月",
@ -141,14 +149,15 @@
  },
  "tab_row": {
    "close_tab": "タブを閉じる",
-    "add_new_tab": "新しいタブ",
+    "add_new_tab": "新しいタブを追加",
    "close": "閉じる",
    "close_other_tabs": "他のタブを閉じる",
    "close_right_tabs": "右側のタブをすべて閉じる",
    "close_all_tabs": "すべてのタブを閉じる",
    "reopen_last_tab": "最後に閉じたタブを開く",
-    "move_tab_to_new_window": "このタブを新しいウィンドウに移動する",
-    "copy_tab_to_new_window": "このタブを新しいウィンドウにコピーする"
+    "move_tab_to_new_window": "このタブを新しいウィンドウに移動",
+    "copy_tab_to_new_window": "このタブを新しいウィンドウにコピーする",
+    "new_tab": "新しいタブ"
  },
  "tasks": {
    "due": {
@ -198,7 +207,8 @@
  "confirm": {
    "confirmation": "確認",
    "cancel": "キャンセル",
-    "ok": "OK"
+    "ok": "OK",
+    "also_delete_note": "同時にノートを削除"
  },
  "export": {
    "export_note_title": "ノートをエクスポート",
@ -265,7 +275,10 @@
    "showSQLConsole": "SQLコンソールを表示",
    "other": "その他",
    "quickSearch": "クイックサーチにフォーカス",
-    "inPageSearch": "ページ内検索"
+    "inPageSearch": "ページ内検索",
+    "showJumpToNoteDialog": "<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">「ジャンプ先」ダイアログ</a>を表示",
+    "moveNoteUpDown": "ノートリストでノートを上/下に移動",
+    "notSet": "未設定"
  },
  "import": {
    "importIntoNote": "ノートにインポート",
@ -340,7 +353,9 @@
  },
  "relation_map_buttons": {
    "zoom_out_title": "ズームアウト",
-    "zoom_in_title": "ズームイン"
+    "zoom_in_title": "ズームイン",
+    "create_child_note_title": "新しい子ノートを作成し、関連マップに追加",
+    "reset_pan_zoom_title": "パンとズームを初期座標と倍率にリセット"
  },
  "tree-context-menu": {
    "advanced": "高度",
@ -392,19 +407,38 @@
    "open_note_custom": "プログラムからノートを開く",
    "import_files": "ファイルをインポート",
    "export_note": "ノートをエクスポート",
-    "delete_note": "ノートを削除する",
+    "delete_note": "ノートを削除",
    "print_note": "ノートを印刷",
-    "print_pdf": "PDFとしてエクスポート..."
+    "print_pdf": "PDFとしてエクスポート...",
+    "convert_into_attachment": "添付ファイルに変換",
+    "save_revision": "変更履歴を保存",
+    "convert_into_attachment_failed": "ノート '{{title}}' の変換に失敗しました。",
+    "convert_into_attachment_successful": "ノート '{{title}}' は添付ファイルに変換されました。",
+    "convert_into_attachment_prompt": "本当にノート '{{title}}' を親ノートの添付ファイルに変換しますか？",
+    "note_attachments": "ノートの添付ファイル"
  },
  "command_palette": {
    "export_note_title": "ノートをエクスポート",
-    "search_subtree_title": "サブツリー内を検索"
+    "search_subtree_title": "サブツリー内を検索",
+    "tree-action-name": "ツリー: {{name}}",
+    "export_note_description": "現在のノートをエクスポート",
+    "search_notes_title": "ノートを検索",
+    "search_notes_description": "高度な検索を開く",
+    "search_subtree_description": "現在のサブツリー内を検索",
+    "search_history_title": "検索履歴を表示",
+    "search_history_description": "過去の検索結果を見る"
  },
  "delete_note": {
-    "delete_note": "ノートを削除する"
+    "delete_note": "ノートを削除"
  },
  "board_view": {
-    "delete-note": "ノートを削除する"
+    "delete-note": "ノートを削除",
+    "insert-above": "上に挿入",
+    "insert-below": "下に挿入",
+    "delete-column": "列を削除",
+    "delete-column-confirmation": "本当にこの列を削除しますか？対応する属性は、この列の下のノートでも削除されます。",
+    "new-item": "新しいアイテム",
+    "add-column": "列を追加"
  },
  "code_buttons": {
    "execute_button_title": "スクリプトを実行",
@ -482,7 +516,8 @@
    "file_size": "ファイルサイズ",
    "download": "ダウンロード",
    "open": "開く",
-    "title": "ファイル"
+    "title": "ファイル",
+    "upload_new_revision": "編集履歴をアップロード"
  },
  "note_info_widget": {
    "note_id": "ノート ID",
@ -492,21 +527,54 @@
    "note_size": "ノートサイズ",
    "calculate": "計算",
    "subtree_size": "（サブツリーサイズ: {{size}}、ノード数: {{count}}）",
-    "title": "ノート情報"
+    "title": "ノート情報",
+    "note_size_info": "ノートのサイズは、このノートに必要なストレージの概算を示します。これは、ノートの内容とそのノートの編集履歴の内容を考慮したものです。"
  },
  "image_properties": {
    "file_type": "ファイルタイプ",
    "file_size": "ファイルサイズ",
    "download": "ダウンロード",
    "open": "開く",
-    "title": "画像"
+    "title": "画像",
+    "upload_new_revision": "編集履歴をアップロード"
  },
  "revisions": {
    "download_button": "ダウンロード",
-    "delete_button": "削除"
+    "delete_button": "削除",
+    "note_revisions": "ノートの変更履歴",
+    "delete_all_revisions": "このノートの変更履歴をすべて削除",
+    "delete_all_button": "変更履歴をすべて削除",
+    "help_title": "変更履歴のヘルプ",
+    "revision_last_edited": "この変更は{{date}}に行われました",
+    "confirm_delete_all": "このノートのすべての変更履歴を削除しますか？",
+    "no_revisions": "このノートに変更履歴はまだありません...",
+    "restore_button": "復元",
+    "confirm_restore": "この変更を復元しますか？現在のノートのタイトルとコンテンツはこの変更で上書きされます。",
+    "confirm_delete": "この変更履歴を削除しますか？",
+    "revisions_deleted": "ノートの変更履歴は削除されました。",
+    "revision_restored": "ノートの変更が復元されました。",
+    "revision_deleted": "ノートの変更履歴は削除されました。",
+    "settings": "ノートの変更履歴の設定",
+    "file_size": "ファイルサイズ:",
+    "preview": "プレビュー:",
+    "preview_not_available": "このノートタイプではプレビューは利用できません。"
  },
  "attachments_actions": {
-    "download": "ダウンロード"
+    "download": "ダウンロード",
+    "open_externally": "外部で開く",
+    "open_externally_title": "ファイルを外部アプリケーションで開き、変更を監視します。その後、変更されたバージョンをTriliumにアップロードできるようになります。",
+    "open_custom": "プログラムから開く",
+    "open_custom_title": "ファイルを外部アプリケーションで開き、変更を監視します。その後、変更されたバージョンをTriliumにアップロードできるようになります。",
+    "rename_attachment": "添付ファイルの名前を変更",
+    "copy_link_to_clipboard": "リンクをクリップボードにコピー",
+    "convert_attachment_into_note": "添付ファイルをノートに変換",
+    "delete_attachment": "添付ファイルを削除",
+    "open_externally_detail_page": "添付ファイルを外部で開くは、詳細ページからのみ可能です。まず添付ファイル詳細をクリックしてから、再度操作を行ってください。",
+    "open_custom_client_only": "添付ファイルをプログラムから開くは、デスクトップクライアントからのみ可能です。",
+    "delete_confirm": "本当に添付ファイル '{{title}}' を削除しますか？",
+    "delete_success": "添付ファイル '{{title}}' は削除されました。",
+    "enter_new_name": "新しい添付ファイルの名前を入力してください",
+    "upload_new_revision": "編集履歴をアップロード"
  },
  "etapi": {
    "created": "作成日時",
@ -578,15 +646,41 @@
    "parent_count": "クローンの数",
    "random": "ランダムな順番",
    "asc": "昇順（デフォルト）",
-    "desc": "降順"
+    "desc": "降順",
+    "content_and_attachments_size": "添付ファイルを含むノート内容のサイズ",
+    "content_and_attachments_and_revisions_size": "添付ファイルと編集履歴を含むノート内容のサイズ",
+    "revision_count": "編集履歴の回数",
+    "owned_label_count": "ラベルの数",
+    "owned_relation_count": "関係の数"
  },
  "table_view": {
    "sort-column-descending": "降順",
-    "sort-column-ascending": "昇順"
+    "sort-column-ascending": "昇順",
+    "new-row": "新しい行",
+    "new-column": "新しい列",
+    "sort-column-by": "\"{{title}}\" で並べ替え",
+    "sort-column-clear": "並べ替えをクリア",
+    "hide-column": "列 \"{{title}}\" を隠す",
+    "show-hide-columns": "列を表示/非表示",
+    "row-insert-above": "上に行を挿入",
+    "row-insert-below": "下に行を挿入",
+    "row-insert-child": "子ノートを挿入",
+    "add-column-to-the-left": "列を左に追加",
+    "add-column-to-the-right": "列を右に追加",
+    "edit-column": "列を編集",
+    "delete_column_confirmation": "この列を本当に削除してもよろしいですか？対応する属性はすべてのノートから削除されます。",
+    "delete-column": "列を削除",
+    "new-column-label": "ラベル",
+    "new-column-relation": "関係"
  },
  "search_script": {
    "title": "検索スクリプト:",
-    "placeholder": "ノート名で検索"
+    "placeholder": "ノート名で検索",
+    "description1": "検索スクリプトは、スクリプトを実行することによって検索結果を定義することができます。標準の検索では不十分な場合に、最大限の柔軟性を提供します。",
+    "description2": "検索スクリプトはノートタイプが \"code\" かつ \"JavaScript backend\" でなければならない。スクリプトは、 noteIds または note の配列を返す必要があります。",
+    "example_title": "例は以下です:",
+    "example_code": "// 1. 標準検索によるプレフィルタリング\nconst candidateNotes = api.searchForNotes(\"#journal\"); \n\n// 2. カスタム検索条件の適用\nconst matchedNotes = candidateNotes\n    .filter(note => note.title.match(/[0-9]{1,2}\\. ?[0-9]{1,2}\\. ?[0-9]{4}/));\n\nreturn matchedNotes;",
+    "note": "検索スクリプトと文字列検索は、互いに組み合わせることはできません。"
  },
  "include_note": {
    "placeholder_search": "ノート名で検索",
@ -713,7 +807,8 @@
    "shortcut_info": "オプション -> ショートカット（'右ペイン切り替え'）で、右ペイン（目次を含む）を素早く切り替えるキーボードショートカットを設定できます。"
  },
  "toc": {
-    "table_of_contents": "目次"
+    "table_of_contents": "目次",
+    "options": "オプション"
  },
  "text_auto_read_only_size": {
    "title": "自動読み取り専用のサイズ",
@ -724,7 +819,8 @@
  "code_auto_read_only_size": {
    "title": "自動読み取り専用のサイズ",
    "description": "自動読み取り専用のノートサイズは、ノートが読み取り専用モード（パフォーマンス上の理由）で表示されるようになるサイズです。",
-    "unit": "文字"
+    "unit": "文字",
+    "label": "自動読み取り専用のサイズ（コードノート）"
  },
  "custom_date_time_format": {
    "title": "日付/時刻フォーマットのカスタム",
@ -804,7 +900,8 @@
    "close_label": "閉じる"
  },
  "modal": {
-    "close": "閉じる"
+    "close": "閉じる",
+    "help_title": "この画面に関する詳細情報を表示"
  },
  "bookmark_switch": {
    "bookmark": "ブックマーク",
@ -812,10 +909,39 @@
    "remove_bookmark": "ブックマークを削除"
  },
  "attribute_detail": {
-    "delete": "削除"
+    "delete": "削除",
+    "close_button_title": "変更を破棄して閉じる",
+    "attr_is_owned_by": "属性の所有者",
+    "attr_name_title": "属性の名前は英数字、コロン、アンダーバーのみで構成します",
+    "name": "名前",
+    "value": "値",
+    "promoted_alias": "エイリアス",
+    "multiplicity_title": "多重性とは、同じ名前を持つ属性をいくつ作成できるかを定義するもので、1つまたはそれ以上です。",
+    "multiplicity": "多重性",
+    "single_value": "単一の値",
+    "multi_value": "複数の値",
+    "label_type_title": "ラベルのタイプは、Triliumがラベルの値を入力するのに適したインターフェースを選択するのに役立ちます。",
+    "label_type": "タイプ",
+    "text": "テキスト",
+    "number": "数値",
+    "boolean": "真偽値",
+    "date": "日付",
+    "date_time": "日付と時間",
+    "time": "時間",
+    "url": "URL",
+    "save_and_close": "保存して閉じる <kbd>Ctrl+Enter</kbd>",
+    "precision_title": "値設定インターフェースで、小数点以下何桁まで利用可能にするか。",
+    "precision": "精度",
+    "digits": "桁",
+    "inheritable_title": "継承属性は、このツリー配下のすべての子孫に継承されます。",
+    "inheritable": "継承",
+    "related_notes_title": "このラベルが付いた他のノート"
  },
  "link_context_menu": {
-    "open_note_in_popup": "クイックエディット"
+    "open_note_in_popup": "クイックエディット",
+    "open_note_in_new_tab": "新しいタブでノートを開く",
+    "open_note_in_new_split": "新しく分割してノートを開く",
+    "open_note_in_new_window": "新しいウィンドウでノートを開く"
  },
  "note_tooltip": {
    "quick-edit": "クイックエディット"
@ -861,6 +987,386 @@
    "hide-archived-notes": "アーカイブノートを隠す",
    "automatically-collapse-notes": "ノートを自動的に折りたたむ",
    "automatically-collapse-notes-title": "一定期間使用されないと、ツリーを整理するためにノートは折りたたまれます。",
-    "save-changes": "変更を保存して適用"
+    "save-changes": "変更を保存して適用",
+    "auto-collapsing-notes-after-inactivity": "非アクティブ状態が続いたためノートが自動で折りたたまれます...",
+    "create-child-note": "子ノートを作成"
+  },
+  "bulk_actions": {
+    "bulk_actions": "一括操作",
+    "affected_notes": "影響されたノート",
+    "include_descendants": "選択したノートの子ノートを含む",
+    "available_actions": "利用可能なアクション",
+    "chosen_actions": "選択されたアクション",
+    "execute_bulk_actions": "一括操作を実行",
+    "bulk_actions_executed": "一括操作が成功に実行されました。",
+    "labels": "ラベル",
+    "relations": "関係",
+    "notes": "ノート",
+    "other": "その他"
+  },
+  "note_title": {
+    "placeholder": "ここにノートのタイトルを入力..."
+  },
+  "search_result": {
+    "no_notes_found": "指定された検索パラメータに該当するノートは見つかりませんでした。",
+    "search_not_executed": "検索はまだ実行されていません。上の「検索」ボタンをクリックすると、検索結果が表示されます。"
+  },
+  "sql_result": {
+    "no_rows": "このクエリでは行が返されませんでした"
+  },
+  "sql_table_schemas": {
+    "tables": "テーブル"
+  },
+  "app_context": {
+    "please_wait_for_save": "保存が完了するまで数秒お待ちください。その後、もう一度お試しいただけます。"
+  },
+  "note_create": {
+    "duplicated": "ノート \"{{title}}\" は複製されました。"
+  },
+  "clipboard": {
+    "cut": "ノートはクリップボードにカットされました。",
+    "copied": "ノートはクリップボードにコピーされました。",
+    "copy_failed": "権限の問題で、クリップボードにコピーできません。",
+    "copy_success": "クリップボードにコピーしました。"
+  },
+  "launcher_context_menu": {
+    "add-note-launcher": "ノートランチャーを追加",
+    "add-script-launcher": "スクリプトランチャーを追加",
+    "add-custom-widget": "カスタムウィジェットを追加",
+    "add-spacer": "スペーサーを追加",
+    "delete": "削除 <kbd data-command=\"deleteNotes\"></kbd>",
+    "reset": "リセット",
+    "move-to-visible-launchers": "可視ランチャーに移動",
+    "move-to-available-launchers": "利用可能なランチャーに移動",
+    "duplicate-launcher": "ランチャーの複製 <kbd data-command=\"duplicateSubtree\">"
+  },
+  "editable-text": {
+    "auto-detect-language": "自動検出"
+  },
+  "highlighting": {
+    "title": "コードブロック",
+    "description": "テキストノート内のコードブロックのシンタックスハイライトを制御します。コードノートには影響しません。",
+    "color-scheme": "カラースキーム"
+  },
+  "code_block": {
+    "word_wrapping": "単語の折り返し",
+    "theme_none": "シンタックスハイライトなし",
+    "theme_group_light": "ライトテーマ",
+    "theme_group_dark": "ダークテーマ",
+    "copy_title": "クリップボードにコピー"
+  },
+  "editor": {
+    "title": "エディター"
+  },
+  "editing": {
+    "editor_type": {
+      "label": "書式設定ツールバー",
+      "floating": {
+        "description": "編集ツールがカーソル付近に表示されます;"
+      },
+      "fixed": {
+        "title": "固定",
+        "description": "編集ツールは「書式設定」のリボンタブに表示されます。"
+      },
+      "multiline-toolbar": "ツールバーが収まりきらない場合は、複数行で表示する。"
+    }
+  },
+  "electron_context_menu": {
+    "add-term-to-dictionary": "辞書に \"{{term}}\" を追加",
+    "cut": "カット",
+    "copy": "コピー",
+    "copy-link": "リンクをコピー",
+    "paste": "ペースト",
+    "paste-as-plain-text": "プレーンテキストで貼り付け",
+    "search_online": "{{searchEngine}} で \"{{term}}\" を検索"
+  },
+  "duration": {
+    "seconds": "秒",
+    "minutes": "分",
+    "hours": "時間",
+    "days": "日"
+  },
+  "share": {
+    "title": "共有設定",
+    "redirect_bare_domain": "ネイキッドドメインを共有ページにリダイレクト",
+    "redirect_bare_domain_description": "匿名のユーザーをログイン画面ではなく共有ページにリダイレクトします",
+    "show_login_link_description": "共有ページの下部にログインリンクを追加",
+    "share_root_found": "共有ルートノート '{{noteTitle}}' の準備が完了",
+    "share_root_not_found": "#shareRoot のラベルが付いたノートが見つかりません",
+    "share_root_not_shared": "ノート '{{noteTitle}}' は #shareRoot のラベルを持っていますが、共有されていません"
+  },
+  "time_selector": {
+    "invalid_input": "入力された時間値が有効な数値ではありません。",
+    "minimum_input": "入力された時間値は {{minimumSeconds}} 秒以上である必要があります。"
+  },
+  "note_language": {
+    "not_set": "未設定",
+    "configure-languages": "言語を設定..."
+  },
+  "content_language": {
+    "title": "コンテンツの言語",
+    "description": "読み取り専用または編集可能なテキストノートの基本プロパティセクションの言語選択に表示する言語を 1 つ以上選択します。これにより、スペルチェックや右から左へのサポートなどの機能が利用できるようになります。"
+  },
+  "png_export_button": {
+    "button_title": "図をPNG形式でエクスポート"
+  },
+  "svg": {
+    "export_to_png": "図をPNG形式でエクスポートできませんでした。"
+  },
+  "code_theme": {
+    "title": "外観",
+    "word_wrapping": "単語の折り返し",
+    "color-scheme": "カラースキーム"
+  },
+  "cpu_arch_warning": {
+    "title": "ARM64版をダウンロードしてください",
+    "dont_show_again": "この警告を二度と表示しない",
+    "continue_anyway": "とにかく続ける"
+  },
+  "editorfeatures": {
+    "emoji_completion_enabled": "絵文字のオートコンプリートを有効",
+    "note_completion_enabled": "ノートのオートコンプリートを有効"
+  },
+  "table_context_menu": {
+    "delete_row": "行を削除"
+  },
+  "content_renderer": {
+    "open_externally": "外部で開く"
+  },
+  "ai_llm": {
+    "title": "AI 設定",
+    "enable_ai_features": "AI/LLM 機能を有効化",
+    "enable_ai_description": "ノートの要約、コンテンツ生成、その他のLLM機能などのAI機能を有効にする",
+    "openai_tab": "OpenAI",
+    "anthropic_tab": "Anthropic",
+    "voyage_tab": "Voyage AI",
+    "ollama_tab": "Ollama",
+    "enable_ai": "AI/LLM 機能を有効化",
+    "enable_ai_desc": "ノートの要約、コンテンツ生成、その他のLLM機能などのAI機能を有効にする",
+    "provider_configuration": "AI プロバイダーの設定",
+    "provider_precedence": "プロバイダーの優先順位",
+    "provider_precedence_description": "カンマで区切られたプロバイダーの優先順位リスト（例: 'openai,anthropic,ollama'）",
+    "temperature_description": "応答のランダム性を制御する（0 = 決定的、2 = 最大ランダム性）",
+    "system_prompt_description": "すべてのAIとの対話に使用されるデフォルトのシステムプロンプト",
+    "system_prompt": "システムプロンプト",
+    "openai_configuration": "OpenAIの設定",
+    "openai_settings": "OpenAIの設定",
+    "api_key": "APIキー",
+    "model": "モデル",
+    "openai_api_key_description": "OpenAIのAIサービスにアクセスするためのAPIキー",
+    "anthropic_api_key_description": "AnthropicのClaudeモデルにアクセスするためのAPIキー",
+    "default_model": "デフォルトモデル",
+    "openai_model_description": "例: gpt-4o, gpt-4-turbo, gpt-3.5-turbo",
+    "openai_url_description": "デフォルト: https://api.openai.com/v1",
+    "anthropic_settings": "Anthropicの設定",
+    "anthropic_model_description": "チャット補完用のAnthropic Claudeモデル",
+    "voyage_settings": "Voyage AIの設定",
+    "ollama_settings": "Ollamaの設定",
+    "ollama_url_description": "Ollama API の URL（デフォルト: http://localhost:11434）",
+    "anthropic_url_description": "Anthropic APIのベースURL（デフォルト: https://api.anthropic.com）",
+    "ollama_model_description": "チャット補完用のOllamaモデル",
+    "anthropic_configuration": "Anthropicの設定",
+    "voyage_configuration": "Voyage AIの設定",
+    "voyage_url_description": "デフォルト: https://api.voyageai.com/v1",
+    "ollama_configuration": "Ollamaの設定",
+    "enable_ollama": "Ollamaを有効",
+    "enable_ollama_description": "ローカルAIモデルを利用するためOllamaを有効にする",
+    "ollama_url": "Ollama URL",
+    "ollama_model": "Ollamaモデル",
+    "refresh_models": "モデルを更新",
+    "refreshing_models": "更新中...",
+    "error": "エラー",
+    "retry": "再試行",
+    "partial": "{{ percentage }}%完了",
+    "processing": "処理中（{{percentage}}%）",
+    "complete": "完了（100%）",
+    "refreshing": "更新中...",
+    "auto_refresh_notice": "{{seconds}}秒ごとに自動更新",
+    "ai_settings": "AI 設定",
+    "api_key_tooltip": "サービスにアクセスするためのAPIキー",
+    "empty_key_warning": {
+      "anthropic": "Anthropic APIキーが空です。有効な APIキーを入力してください。",
+      "openai": "OpenAI APIキーが空です。有効なAPIキーを入力してください。",
+      "voyage": "Voyage APIキーが空です。有効なAPIキーを入力してください。",
+      "ollama": "Ollama APIキーが空です。有効なAPIキーを入力してください。"
+    },
+    "agent": {
+      "processing": "処理中...",
+      "loading": "読み込み中...",
+      "generating": "生成中..."
+    },
+    "name": "AI",
+    "openai": "OpenAI",
+    "error_contacting_provider": "AIプロバイダーへの接続中にエラーが発生しました。設定とインターネット接続をご確認ください。",
+    "ollama_no_url": "Ollamaは設定されていません。有効なURLを入力してください。",
+    "chat": {
+      "root_note_title": "AIチャット",
+      "root_note_content": "このメモには、保存されたAIチャットの会話が含まれています。",
+      "new_chat_title": "新しいチャット",
+      "create_new_ai_chat": "新しいAIチャットを作成"
+    },
+    "create_new_ai_chat": "新しいAIチャットを作成",
+    "configuration_warnings": "AIの設定に問題があります。設定を確認してください。",
+    "experimental_warning": "LLM機能は現在実験的です - ご注意ください。",
+    "selected_provider_description": "チャットおよび補完機能のAIプロバイダーを選択する",
+    "selected_provider": "プロバイダーを選択",
+    "select_model": "モデルを選択...",
+    "select_provider": "プロバイダーを選択..."
+  },
+  "add_label": {
+    "add_label": "ラベルを追加",
+    "label_name_placeholder": "ラベル名",
+    "label_name_title": "英数字、アンダーバー、コロンが使用可能な文字です。",
+    "new_value_placeholder": "新しい値"
+  },
+  "delete_label": {
+    "delete_label": "ラベルを削除",
+    "label_name_placeholder": "ラベル名",
+    "label_name_title": "英数字、アンダーバー、コロンが使用可能な文字です。"
+  },
+  "rename_label": {
+    "rename_label": "ラベル名の変更",
+    "rename_label_from": "ラベル名を",
+    "old_name_placeholder": "古い名前",
+    "to": "から",
+    "new_name_placeholder": "新しい名前",
+    "name_title": "英数字、アンダーバー、コロンが使用可能な文字です。"
+  },
+  "update_label_value": {
+    "update_label_value": "ラベルの値を更新",
+    "label_name_placeholder": "ラベル名",
+    "label_name_title": "英数字、アンダーバー、コロンが使用可能な文字です。",
+    "new_value_placeholder": "新しい値",
+    "help_text_note": "このメソッドは値なしで呼び出すこともできます。その場合、値なしでラベルがノートに割り当てられます。"
+  },
+  "add_relation": {
+    "add_relation": "関係を追加",
+    "relation_name": "関係の名前",
+    "allowed_characters": "英数字、アンダーバー、コロンが使用可能な文字です。"
+  },
+  "delete_relation": {
+    "delete_relation": "関係を削除",
+    "relation_name": "関係の名前",
+    "allowed_characters": "英数字、アンダーバー、コロンが使用可能な文字です。"
+  },
+  "rename_relation": {
+    "rename_relation": "関係の名前を変更",
+    "rename_relation_from": "関係の名前を",
+    "old_name": "古い名前",
+    "to": "から",
+    "new_name": "新しい名前",
+    "allowed_characters": "英数字、アンダーバー、コロンが使用可能な文字です。"
+  },
+  "update_relation_target": {
+    "update_relation": "関係の更新",
+    "relation_name": "関係の名前",
+    "allowed_characters": "英数字、アンダーバー、コロンが使用可能な文字です。"
+  },
+  "revisions_button": {
+    "note_revisions": "ノートの変更履歴"
+  },
+  "note_launcher": {
+    "this_launcher_doesnt_define_target_note": "このランチャーはターゲットノートを定義していません。"
+  },
+  "zpetne_odkazy": {
+    "backlink": "{{count}} バックリンク",
+    "backlinks": "{{count}} バックリンク",
+    "relation": "関係"
+  },
+  "mobile_detail_menu": {
+    "delete_this_note": "このノートを削除",
+    "error_unrecognized_command": "認識されないコマンド {{command}}"
+  },
+  "inherited_attribute_list": {
+    "title": "継承属性",
+    "no_inherited_attributes": "継承属性ではありません。"
+  },
+  "note_map": {
+    "open_full": "拡大表示",
+    "collapse": "通常サイズに折りたたむ",
+    "title": "ノートマップ",
+    "link-distance": "リンク距離"
+  },
+  "owned_attribute_list": {
+    "owned_attributes": "所有属性"
+  },
+  "promoted_attributes": {
+    "unset-field-placeholder": "未設定",
+    "open_external_link": "外部でリンクを開く",
+    "unknown_label_type": "不明なラベルタイプ '{{type}}'",
+    "unknown_attribute_type": "不明な属性タイプ '{{type}}'",
+    "add_new_attribute": "新しい属性を追加",
+    "remove_this_attribute": "この属性を削除",
+    "remove_color": "このカラーラベルを削除"
+  },
+  "relation_map": {
+    "open_in_new_tab": "新しいタブで開く",
+    "remove_note": "ノートを削除",
+    "edit_title": "タイトルを編集",
+    "rename_note": "ノート名を変更",
+    "enter_new_title": "新しいノート名を入力:",
+    "remove_relation": "関係を削除",
+    "confirm_remove_relation": "本当にこの関係を削除しますか？",
+    "specify_new_relation_name": "新しい関係の名前（使用可能な文字: 英数字、コロン、アンダースコア）を指定:",
+    "note_not_found": "ノート {{noteId}} が見つかりません！",
+    "enter_title_of_new_note": "新しいノートのタイトルを入力",
+    "default_new_note_title": "新しいノート"
+  },
+  "database_anonymization": {
+    "title": "データベースの匿名化",
+    "full_anonymization": "完全匿名化",
+    "full_anonymization_description": "この操作により、データベースの新しいコピーが作成され、匿名化されます（すべてのノートの内容を削除し、構造と一部の非機密メタデータのみを残します）。これにより、個人データが漏洩する心配なく、デバッグ目的でオンライン共有できます。",
+    "save_fully_anonymized_database": "完全に匿名化されたデータベースを保存",
+    "light_anonymization": "軽い匿名化",
+    "light_anonymization_description": "この操作により、データベースの新しいコピーが作成され、軽い匿名化が適用されます。具体的には、すべてのノートの内容のみが削除され、タイトルと属性はそのまま残ります。さらに、カスタムJSフロントエンド/バックエンドスクリプトノートとカスタムウィジェットもそのまま残ります。これにより、問題のデバッグのためのコンテキストがより多く提供されます。",
+    "choose_anonymization": "完全に匿名化したデータベースを提供するか、軽く匿名化したデータベースを提供するかは、あなた自身が決めることができます。完全に匿名化されたDBであっても非常に有用ですが、場合によっては軽く匿名化されたDBの方がバグの特定と修正のプロセスを速めることができます。",
+    "save_lightly_anonymized_database": "軽く匿名化されたデータベースを保存",
+    "existing_anonymized_databases": "既存の匿名化データベース",
+    "creating_fully_anonymized_database": "完全に匿名化されたデータベースを作成中...",
+    "creating_lightly_anonymized_database": "軽く匿名化されたデータベースを作成中...",
+    "error_creating_anonymized_database": "匿名化データベースの作成に失敗しました。詳細はバックエンドログを確認してください",
+    "successfully_created_fully_anonymized_database": "完全に匿名化されたデータベースを {{anonymizedFilePath}} に作成",
+    "successfully_created_lightly_anonymized_database": "軽く匿名化されたデータベースを {{anonymizedFilePath}} に作成",
+    "no_anonymized_database_yet": "匿名化されたデータベースはまだありません。"
+  },
+  "database_integrity_check": {
+    "title": "データベースの整合性チェック",
+    "description": "これは、データベースがSQLiteレベルで破損がないかをチェックします。DBのサイズによっては時間がかかる場合があります。",
+    "check_button": "データベースの整合性をチェック",
+    "checking_integrity": "データベースの整合性をチェックしています...",
+    "integrity_check_succeeded": "整合性チェックに成功 - 問題は見つかりませんでした。",
+    "integrity_check_failed": "整合性チェックに失敗: {{results}}"
+  },
+  "code-editor-options": {
+    "title": "エディター"
+  },
+  "search_string": {
+    "title_column": "文字列検索:",
+    "search_syntax": "検索構文",
+    "also_see": "詳しくは",
+    "complete_help": "検索構文に関する完全なヘルプ",
+    "full_text_search": "テキストを入力すると全文検索が可能",
+    "label_abc": "ラベルabcを持つノートを返す",
+    "label_year": "ラベル「year」の値が「2019」と一致するノート",
+    "label_rock_pop": "rock と pop のラベルを持つノート",
+    "label_rock_or_pop": "どれかのラベルが存在すること",
+    "label_year_comparison": "数値比較（>、>=、<も含む）。",
+    "label_date_created": "過去1ヶ月以内に作成されたノート",
+    "error": "検索エラー: {{error}}",
+    "search_prefix": "検索:"
+  },
+  "delete_revisions": {
+    "delete_note_revisions": "ノートの変更履歴を削除",
+    "all_past_note_revisions": "一致したノートの過去の変更履歴がすべて削除されます。ノート自体は完全に保持されます。言い換えると、ノートのリビジョンが削除されます。"
+  },
+  "rename_note": {
+    "rename_note": "ノート名を変更",
+    "new_note_title": "新しいノート名",
+    "rename_note_title_to": "ノート名を変更",
+    "example_note": "<code>Note</code> - マッチしたノートの名前はすべて'Note'に変更",
+    "example_new_title": "<code>NEW: ${note.title}</code> - 一致したノートの名前の前に 'NEW: ' を付ける",
+    "example_date_prefix": "<code>${note.dateCreatedObj.format('MM-DD:')}: ${note.title}</code> - マッチしたノートの前にノートの作成月日を付ける",
+    "api_docs": "詳細については、 <a href='https://zadam.github.io/trilium/backend_api/Note.html'>note</a> および <a href='https://day.js.org/docs/en/display/format'>dateCreatedObj / utcDateCreatedObj properties</a> の API ドキュメントを参照してください。",
+    "evaluated_as_js_string": "与えられた値はJavaScript文字列として評価されるため、注入された<code>note</code>変数（noteは名前が変更されます）を介して動的なコンテンツで強化できます。例:"
  }
 }
--- a/apps/client/src/translations/pl/translation.json
+++ b/apps/client/src/translations/pl/translation.json
@ -0,0 +1,18 @@
+{
+  "about": {
+    "title": "O notatkach Trilium",
+    "homepage": "Strona główna:",
+    "app_version": "Wersja aplikacji:",
+    "db_version": "Wersja bazy danych:",
+    "sync_version": "Wersja synchronizacji:",
+    "build_date": "Zbudowano:",
+    "build_revision": "Rewizja zbudowania:",
+    "data_directory": "Katalog z danymi:"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "Błąd krytyczny",
+      "message": "Wystąpił krytyczny błąd uniemożliwiający uruchomienie aplikacji:\n\n{{message}}\n\nJest to spowodowane najprawdopodobniej niespodziewanym błędem skryptu. Spróbuj uruchomić aplikację ponownie w trybie bezpiecznym i zaadresuj problem."
+    }
+  }
+}
--- a/apps/client/src/translations/ro/translation.json
+++ b/apps/client/src/translations/ro/translation.json
@ -655,7 +655,8 @@
    "showSQLConsole": "afișează consola SQL",
    "tabShortcuts": "Scurtături pentru tab-uri",
    "troubleshooting": "Unelte pentru depanare",
-    "newTabWithActivationNoteLink": "pe o legătură către o notiță deschide și activează notița într-un tab nou"
+    "newTabWithActivationNoteLink": "pe o legătură către o notiță deschide și activează notița într-un tab nou",
+    "title": "Ghid rapid"
  },
  "hide_floating_buttons_button": {
    "button_title": "Ascunde butoanele"
@ -886,7 +887,8 @@
    "modal_title": "Selectați tipul notiței",
    "templates": "Șabloane",
    "change_path_prompt": "Selectați locul unde să se creeze noua notiță:",
-    "search_placeholder": "căutare cale notiță după nume (cea implicită dacă este necompletat)"
+    "search_placeholder": "căutare cale notiță după nume (cea implicită dacă este necompletat)",
+    "builtin_templates": "Șabloane predefinite"
  },
  "onclick_button": {
    "no_click_handler": "Butonul „{{componentId}}” nu are nicio acțiune la clic definită"
@ -940,7 +942,9 @@
  },
  "password_not_set": {
    "body1": "Notițele protejate sunt criptate utilizând parola de utilizator, dar nu a fost setată nicio parolă.",
-    "title": "Parola nu este setată"
+    "title": "Parola nu este setată",
+    "body2": "Pentru a putea proteja notițe, clic pe butonul de mai jos pentru a deschide fereastra de opțiuni și pentru a seta parola.",
+    "go_to_password_options": "Mergi la setările de parolă"
  },
  "promoted_attributes": {
    "add_new_attribute": "Adaugă un nou atribut",
@ -1243,7 +1247,10 @@
    "layout-horizontal-description": "bara de lansare se află sub bara de taburi, bara de taburi este pe toată lungimea.",
    "layout-horizontal-title": "Orizontal",
    "layout-vertical-title": "Vertical",
-    "layout-vertical-description": "bara de lansare se află pe stânga (implicit)"
+    "layout-vertical-description": "bara de lansare se află pe stânga (implicit)",
+    "auto_theme": "Tema clasică (se adaptează la schema de culori a sistemului)",
+    "light_theme": "Tema clasică (luminoasă)",
+    "dark_theme": "Tema clasică (întunecată)"
  },
  "toast": {
    "critical-error": {
@ -1985,6 +1992,12 @@
    "open_externally": "Deschide în afara programului"
  },
  "modal": {
-    "close": "Închide"
+    "close": "Închide",
+    "help_title": "Afișează mai multe informații despre acest ecran"
+  },
+  "call_to_action": {
+    "background_effects_title": "Efectele de fundal sunt acum stabile",
+    "background_effects_message": "Pe dispozitive cu Windows, efectele de fundal sunt complet stabile. Acestea adaugă un strop de culoare interfeței grafice prin estomparea fundalului din spatele ferestrei. Această tehnică este folosită și în alte aplicații precum Windows Explorer.",
+    "background_effects_button": "Activează efectele de fundal"
  }
 }
--- a/apps/client/src/translations/tw/translation.json
+++ b/apps/client/src/translations/tw/translation.json
--- a/apps/client/src/translations/uk/translation.json
+++ b/apps/client/src/translations/uk/translation.json
@ -0,0 +1,91 @@
+{
+  "add_link": {
+    "add_link": "Додати посилання",
+    "help_on_links": "Довідка щодо посилань",
+    "note": "Нотатка",
+    "search_note": "Знайти нотатку за ім'ям",
+    "link_title_mirrors": "заголовок посилання відображає назву нотатки",
+    "link_title_arbitrary": "свій заголовок посилання",
+    "link_title": "Заголовок посилання",
+    "button_add_link": "Додати посилання"
+  },
+  "branch_prefix": {
+    "save": "Зберегти",
+    "edit_branch_prefix": "Редагувати префікс гілки",
+    "help_on_tree_prefix": "Довідка щодо префіксів гілок",
+    "prefix": "Префікс: ",
+    "branch_prefix_saved": "Префікс гілки збережено."
+  },
+  "about": {
+    "app_version": "Версія програми:",
+    "db_version": "Версія БД:",
+    "build_date": "Дата збірки:",
+    "build_revision": "Ревізія збірки:",
+    "data_directory": "Директорія даних:",
+    "homepage": "Домашня сторінка:",
+    "title": "Про Trilium Notes"
+  },
+  "global_menu": {
+    "about": "Про Trilium Notes"
+  },
+  "modal": {
+    "help_title": "Показати більше інформації про це вікно"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "Критична помилка"
+    }
+  },
+  "bulk_actions": {
+    "bulk_actions": "Масові дії",
+    "affected_notes": "Зачеплені нотатки",
+    "available_actions": "Доступні дії",
+    "chosen_actions": "Обрані дії",
+    "execute_bulk_actions": "Виконати масові дії",
+    "bulk_actions_executed": "Масові дії успішно виконано.",
+    "none_yet": "Поки ніяких.. Додайте дію натиснувши на одну з наданих вище."
+  },
+  "clone_to": {
+    "clone_notes_to": "Клонувати нотатки до...",
+    "target_parent_note": "Цільова батьківська нотатка",
+    "search_for_note_by_its_name": "Знайти нотатку за ім'ям"
+  },
+  "clipboard": {
+    "copied": "Нотатку(-и) було скопійовано в буфер.",
+    "copy_failed": "Не вдалося скопіювати в буфер через проблеми з дозволами.",
+    "copy_success": "Скопійовано в буфер."
+  },
+  "entrypoints": {
+    "sql-error": "Виникла помилка при виконанні запиту SQL: {{message}}"
+  },
+  "branches": {
+    "undeleting-notes-finished-successfully": "Нотатки вдало відновлено.",
+    "undeleting-notes-in-progress": "Відновлюємо нотатки: {{count}}",
+    "delete-notes-in-progress": "Видаляємо нотатки: {{count}}",
+    "delete-finished-successfully": "Нотатки вдало видалено."
+  },
+  "launcher_context_menu": {
+    "add-spacer": "Додати розділювач",
+    "reset": "Скинути"
+  },
+  "editable-text": {
+    "auto-detect-language": "Автовизначена"
+  },
+  "highlighting": {
+    "color-scheme": "Схема кольорів"
+  },
+  "code_block": {
+    "copy_title": "Скопіювати в буфер"
+  },
+  "classic_editor_toolbar": {
+    "title": "Форматування"
+  },
+  "editor": {
+    "title": "Редактор"
+  },
+  "editing": {
+    "editor_type": {
+      "label": "Панель інструментів форматування"
+    }
+  }
+}
--- a/apps/client/src/translations/vi/translation.json
+++ b/apps/client/src/translations/vi/translation.json
@ -1,69 +1,77 @@
 {
-    "about": {
-        "homepage": "Trang chủ:",
-        "title": "Về Trilium Notes"
-    },
-    "add_link": {
-        "add_link": "Thêm liên kết",
-        "button_add_link": "Thêm liên kết"
-    },
-    "bulk_actions": {
-        "other": "Khác"
-    },
-    "branch_prefix": {
-        "save": "Lưu"
-    },
-    "confirm": {
-        "ok": "OK",
-        "cancel": "Huỷ"
-    },
-    "delete_notes": {
-        "close": "Đóng",
-        "ok": "OK",
-        "cancel": "Huỷ"
-    },
-    "export": {
-        "close": "Đóng"
-    },
-    "help": {
-        "other": "Khác"
-    },
-    "toast": {
-        "critical-error": {
-            "title": "Lỗi nghiêm trọng"
-        }
-    },
-    "import": {
-        "options": "Tuỳ chọn"
-    },
-    "info": {
-        "okButton": "OK",
-        "closeButton": "Đóng"
-    },
-    "move_to": {
-        "dialog_title": "Chuyển ghi chép tới..."
-    },
-    "prompt": {
-        "ok": "OK"
-    },
-    "protected_session_password": {
-        "close_label": "Đóng"
-    },
-    "revisions": {
-        "restore_button": "Khôi phục",
-        "delete_button": "Xoá"
-    },
-    "upload_attachments": {
-        "options": "Tuỳ chọn"
-    },
-    "attribute_detail": {
-        "name": "Tên",
-        "value": "Giá trị",
-        "text": "Văn bản",
-        "number": "Số",
-        "delete": "Xoá"
-    },
-    "rename_note": {
-        "rename_note": "Đổi tên ghi chép"
+  "about": {
+    "homepage": "Trang chủ:",
+    "title": "Về Trilium Notes"
+  },
+  "add_link": {
+    "add_link": "Thêm liên kết",
+    "button_add_link": "Thêm liên kết"
+  },
+  "bulk_actions": {
+    "other": "Khác"
+  },
+  "branch_prefix": {
+    "save": "Lưu"
+  },
+  "confirm": {
+    "ok": "OK",
+    "cancel": "Huỷ"
+  },
+  "delete_notes": {
+    "close": "Đóng",
+    "ok": "OK",
+    "cancel": "Huỷ"
+  },
+  "export": {
+    "close": "Đóng"
+  },
+  "help": {
+    "other": "Khác"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "Lỗi nghiêm trọng"
    }
+  },
+  "import": {
+    "options": "Tuỳ chọn"
+  },
+  "info": {
+    "okButton": "OK",
+    "closeButton": "Đóng"
+  },
+  "move_to": {
+    "dialog_title": "Chuyển ghi chép tới..."
+  },
+  "prompt": {
+    "ok": "OK"
+  },
+  "protected_session_password": {
+    "close_label": "Đóng"
+  },
+  "revisions": {
+    "restore_button": "Khôi phục",
+    "delete_button": "Xoá"
+  },
+  "upload_attachments": {
+    "options": "Tuỳ chọn"
+  },
+  "attribute_detail": {
+    "name": "Tên",
+    "value": "Giá trị",
+    "text": "Văn bản",
+    "number": "Số",
+    "delete": "Xoá"
+  },
+  "rename_note": {
+    "rename_note": "Đổi tên ghi chép"
+  },
+  "add_label": {
+    "add_label": "Thêm nhãn",
+    "label_name_placeholder": "tên nhãn",
+    "help_text_item2": "hoặc thay đổi giá trị của nhãn có sẵn"
+  },
+  "rename_label": {
+    "rename_label": "Đặt lại tên nhãn"
+  }
 }
--- a/apps/client/src/widgets/buttons/global_menu.ts
+++ b/apps/client/src/widgets/buttons/global_menu.ts
@ -414,7 +414,7 @@ export default class GlobalMenuWidget extends BasicWidget {
    }

    async fetchLatestVersion() {
-        const RELEASES_API_URL = "https://api.github.com/repos/TriliumNext/Notes/releases/latest";
+        const RELEASES_API_URL = "https://api.github.com/repos/TriliumNext/Trilium/releases/latest";

        const resp = await fetch(RELEASES_API_URL);
        const data = await resp.json();
--- a/apps/client/src/widgets/dialogs/call_to_action.tsx
+++ b/apps/client/src/widgets/dialogs/call_to_action.tsx
@ -3,6 +3,7 @@ import Button from "../react/Button";
 import Modal from "../react/Modal";
 import ReactBasicWidget from "../react/ReactBasicWidget";
 import { CallToAction, dismissCallToAction, getCallToActions } from "./call_to_action_definitions";
+import { t } from "../../services/i18n";

 function CallToActionDialogComponent({ activeCallToActions }: { activeCallToActions: CallToAction[] }) {
    if (!activeCallToActions.length) {
@ -25,12 +26,12 @@ function CallToActionDialogComponent({ activeCallToActions }: { activeCallToActi
        <Modal
            className="call-to-action"
            size="md"
-            title="New features"
+            title={activeItem.title}
            show={shown}
            onHidden={() => setShown(false)}
            footerAlignment="between"
            footer={<>
-                <Button text="Dismiss" onClick={async () => {
+                <Button text={t("call_to_action.dismiss")} onClick={async () => {
                    await dismissCallToAction(activeItem.id);
                    goToNext();
                }} />
@ -43,7 +44,6 @@ function CallToActionDialogComponent({ activeCallToActions }: { activeCallToActi
                )}
            </>}
        >
-            <h4>{activeItem.title}</h4>
            <p>{activeItem.message}</p>
        </Modal>
    )
--- a/apps/client/src/widgets/dialogs/call_to_action_definitions.ts
+++ b/apps/client/src/widgets/dialogs/call_to_action_definitions.ts
@ -65,7 +65,7 @@ const CALL_TO_ACTIONS: CallToAction[] = [
        id: "background_effects",
        title: t("call_to_action.background_effects_title"),
        message: t("call_to_action.background_effects_message"),
-        enabled: () => utils.isElectron() && window.glob.platform === "win32" && isNextTheme() && !options.is("backgroundEffects"),
+        enabled: () => false,
        buttons: [
            {
                text: t("call_to_action.background_effects_button"),
--- a/apps/client/src/widgets/quick_search.ts
+++ b/apps/client/src/widgets/quick_search.ts
@ -93,6 +93,8 @@ interface QuickSearchResponse {
        highlightedNotePathTitle: string;
        contentSnippet?: string;
        highlightedContentSnippet?: string;
+        attributeSnippet?: string;
+        highlightedAttributeSnippet?: string;
        icon: string;
    }>;
    error: string;
@ -241,7 +243,12 @@ export default class QuickSearchWidget extends BasicWidget {
                        <span style="flex: 1;" class="search-result-title">${result.highlightedNotePathTitle}</span>
                    </div>`;
                
-                // Add content snippet below the title if available
+                // Add attribute snippet (tags/attributes) below the title if available
+                if (result.highlightedAttributeSnippet) {
+                    itemHtml += `<div style="font-size: 0.75em; color: var(--muted-text-color); opacity: 0.5; margin-left: 20px; margin-top: 2px; line-height: 1.2;" class="search-result-attributes">${result.highlightedAttributeSnippet}</div>`;
+                }
+                
+                // Add content snippet below the attributes if available
                if (result.highlightedContentSnippet) {
                    itemHtml += `<div style="font-size: 0.85em; color: var(--main-text-color); opacity: 0.7; margin-left: 20px; margin-top: 4px; line-height: 1.3;" class="search-result-content">${result.highlightedContentSnippet}</div>`;
                }
--- a/apps/desktop-e2e/package.json
+++ b/apps/desktop-e2e/package.json
@ -19,6 +19,6 @@
  },
  "devDependencies": {
    "dotenv": "17.2.1",
-    "electron": "37.2.6"
+    "electron": "37.3.0"
  }
 }
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@ -1,6 +1,6 @@
 {
  "name": "@triliumnext/desktop",
-  "version": "0.97.2",
+  "version": "0.98.0",
  "description": "Build your personal knowledge base with Trilium Notes",
  "private": true,
  "main": "main.cjs",
@ -17,7 +17,7 @@
    "@types/electron-squirrel-startup": "1.0.2",
    "@triliumnext/server": "workspace:*",
    "copy-webpack-plugin": "13.0.1",
-    "electron": "37.2.6",
+    "electron": "37.3.0",
    "@electron-forge/cli": "7.8.3",
    "@electron-forge/maker-deb": "7.8.3",
    "@electron-forge/maker-dmg": "7.8.3",
--- a/apps/edit-docs/package.json
+++ b/apps/edit-docs/package.json
@ -12,7 +12,7 @@
    "@triliumnext/desktop": "workspace:*",
    "@types/fs-extra": "11.0.4",
    "copy-webpack-plugin": "13.0.1",
-    "electron": "37.2.6",
+    "electron": "37.3.0",
    "fs-extra": "11.3.1"
  },
  "nx": {
--- a/apps/server/package.json
+++ b/apps/server/package.json
@ -1,6 +1,6 @@
 {
  "name": "@triliumnext/server",
-  "version": "0.97.2",
+  "version": "0.98.0",
  "description": "The server-side component of TriliumNext, which exposes the client via the web, allows for sync and provides a REST API for both internal and external use.",
  "private": true,
  "dependencies": {
@ -39,7 +39,7 @@
    "@types/ws": "8.18.1",
    "@types/xml2js": "0.4.14",
    "express-http-proxy": "2.1.1",
-    "@anthropic-ai/sdk": "0.59.0",
+    "@anthropic-ai/sdk": "0.60.0",
    "@braintree/sanitize-url": "7.1.1",
    "@triliumnext/commons": "workspace:*",
    "@triliumnext/express-partial-content": "workspace:*",
@ -59,7 +59,7 @@
    "debounce": "2.2.0",
    "debug": "4.4.1",
    "ejs": "3.1.10",
-    "electron": "37.2.6",
+    "electron": "37.3.0",
    "electron-debug": "4.1.0",
    "electron-window-state": "5.0.3",
    "escape-html": "1.0.3",
@ -74,7 +74,7 @@
    "html2plaintext": "2.1.4",
    "http-proxy-agent": "7.0.2",
    "https-proxy-agent": "7.0.6",
-    "i18next": "25.3.4",
+    "i18next": "25.3.6",
    "i18next-fs-backend": "2.6.0",
    "image-type": "6.0.0",
    "ini": "5.0.0",
@ -83,7 +83,7 @@
    "jimp": "1.6.0",
    "js-yaml": "4.1.0",
    "jsdom": "26.1.0",
-    "marked": "16.1.2",
+    "marked": "16.2.0",
    "mime-types": "3.0.1",
    "multer": "2.0.2",
    "normalize-strings": "1.1.1",
@ -103,7 +103,7 @@
    "swagger-ui-express": "5.0.1",
    "time2fa": "^1.3.0",
    "tmp": "0.2.5",
-    "turndown": "7.2.0",
+    "turndown": "7.2.1",
    "unescape": "1.0.1",
    "ws": "8.18.3",
    "xml2js": "0.6.2",
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -1,6 +1,6 @@
 <p>Trilium supports configuration via a file named <code>config.ini</code> and
-  environment variables. Please review the file named <a href="https://github.com/TriliumNext/Trilium/blob/develop/apps/server/src/assets/config-sample.ini">config-sample.ini</a> in
-  the <a href="https://github.com/TriliumNext/Trilium">Notes</a> repository
+  environment variables. Please review the file named <a href="https://github.com/TriliumNext/Trilium/blob/main/apps/server/src/assets/config-sample.ini">config-sample.ini</a> in
+  the <a href="https://github.com/TriliumNext/Trilium">Trilium</a> repository
  to see what values are supported.</p>
 <p>You can provide the same values via environment variables instead of the <code>config.ini</code> file,
  and these environment variables use the following format:</p>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -231,23 +231,17 @@
  first, then adds fuzzy matching when needed.</p>
 <h3>How Progressive Search Works</h3>
 <ol>
-  <li>
-    <p><strong>Phase 1 - Exact Matching</strong>: When you search, Trilium first
-      looks for exact matches of your search terms. This handles the vast majority
-      of searches (90%+) and returns results almost instantly.</p>
-  </li>
-  <li>
-    <p><strong>Phase 2 - Fuzzy Fallback</strong>: If Phase 1 doesn't find enough
-      high-quality results (fewer than 5 results with good relevance scores),
-      Trilium automatically adds fuzzy matching to find results with typos or
-      spelling variations.</p>
-  </li>
-  <li>
-    <p><strong>Result Ordering</strong>: Exact matches always appear before fuzzy
-      matches, regardless of individual scores. This ensures that when you search
-      for "project", notes containing the exact word "project" will appear before
-      notes containing similar words like "projects" or "projection".</p>
-  </li>
+  <li><strong>Phase 1 - Exact Matching</strong>: When you search, Trilium first
+    looks for exact matches of your search terms. This handles the vast majority
+    of searches (90%+) and returns results almost instantly.</li>
+  <li><strong>Phase 2 - Fuzzy Fallback</strong>: If Phase 1 doesn't find enough
+    high-quality results (fewer than 5 results with good relevance scores),
+    Trilium automatically adds fuzzy matching to find results with typos or
+    spelling variations.</li>
+  <li><strong>Result Ordering</strong>: Exact matches always appear before fuzzy
+    matches, regardless of individual scores. This ensures that when you search
+    for "project", notes containing the exact word "project" will appear before
+    notes containing similar words like "projects" or "projection".</li>
 </ol>
 <h3>Progressive Search Behavior</h3>
 <ul>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -2,9 +2,9 @@
 <p>There are two types of error logs, both of which are useful when reporting
  bugs.</p>
 <ul>
-  <li data-list-item-id="e5d891396e04bcb9d78ea10421e8ee6be"><a class="reference-link" href="#root/pOsGYCXsbNQG/BgmBlOIl72jZ/qzNzp9LYQyPT/_help_bnyigUA2UK7s">Backend (server) logs</a>
+  <li><a class="reference-link" href="#root/_help_bnyigUA2UK7s">Backend (server) logs</a>
  </li>
-  <li data-list-item-id="e94ecb76c9af944e47bf8b5c5dabf027a"><a class="reference-link" href="#root/pOsGYCXsbNQG/BgmBlOIl72jZ/qzNzp9LYQyPT/_help_9yEHzMyFirZR">Frontend logs</a>
+  <li><a class="reference-link" href="#root/_help_9yEHzMyFirZR">Frontend logs</a>
  </li>
 </ul>
 <h2>Providing sensitive data</h2>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -1,10 +1,10 @@
 <h2>Accessing via the backend log</h2>
-<p>In the&nbsp;<a class="reference-link" href="#root/pOsGYCXsbNQG/gh7bpGYxajRS/Vc8PjrjAGuOp/_help_x3i7MxGccDuM">Global menu</a>,
+<p>In the&nbsp;<a class="reference-link" href="#root/_help_x3i7MxGccDuM">Global menu</a>,
  go to Advanced → Show backend log</p>
 <h2>Location on the disk</h2>
 <p>Backend logs are stored on the file system. To find them, open the&nbsp;
  <a
-  class="reference-link" href="#root/pOsGYCXsbNQG/Otzi9La2YAUX/_help_tAassRL4RSQL">Data directory</a>, go to the <code>log</code> subdirectory and find the
+  class="reference-link" href="#root/_help_tAassRL4RSQL">Data directory</a>, go to the <code>log</code> subdirectory and find the
    latest log file, e.g. <code>trilium-2022-12-14.log</code>.&nbsp;</p>
 <h2>Reporting backend bugs</h2>
 <p>You can attach the whole file to the bug report (preferable) or open it
@ -15,12 +15,18 @@
  in order to reduce the space consumption.</p>
 <p>It's possible to change the retention period by modifying the&nbsp;
  <a
-  class="reference-link" href="#root/pOsGYCXsbNQG/tC7s2alapj8V/_help_Gzjqa934BdH4">Configuration (config.ini or environment variables)</a>&nbsp;via the <code>.ini</code> file:</p><pre><code class="language-text-x-trilium-auto">[Logging]
+  class="reference-link" href="#root/_help_Gzjqa934BdH4">Configuration (config.ini or environment variables)</a>&nbsp;via the <code>.ini</code> file:</p><pre><code class="language-text-x-trilium-auto">[Logging]
 retentionDays=7</code></pre>
 <p>Or via the environment variable <code>TRILIUM_LOGGING_RETENTION_DAYS</code>.</p>
-<aside
-class="admonition note">
+<p>Special cases:</p>
+<ul>
+  <li>Positive values indicate the number of days worth of logs to keep</li>
+  <li>A value of 0 results with the default value (90 days) to be used</li>
+  <li>Negative values (e.g. <code>-1</code>) result with all logs to be kept,
+    irrespective how ancient and numerous (and</li>
+</ul>
+<aside class="admonition note">
  <p>If you set the retention days to a low number, you might notice that not
    all the log files are being deleted. This is because a minimum number of
    logs (7 at the time of writing) is maintained at all times.</p>
-  </aside>
+</aside>
--- a/apps/server/src/assets/doc_notes/en/User
+++ b/apps/server/src/assets/doc_notes/en/User
@ -5,9 +5,9 @@
  console is cleared on app restart.</p>
 <p>If that doesn't work, then:</p>
 <ul>
-  <li data-list-item-id="e1f836ac8425c0d56072614c40c996bbd">in Trilium desktop app, go to top-left menu button -&gt; Advanced -&gt;
+  <li>in Trilium desktop app, go to top-left menu button -&gt; Advanced -&gt;
    Open Dev Tools</li>
-  <li data-list-item-id="e8bd27605bedefe884b826a1899413a6d">In Firefox/Chrome right-click anywhere in the page and click Inspect:</li>
+  <li>In Firefox/Chrome right-click anywhere in the page and click Inspect:</li>
 </ul>
 <p>
  <img src="Frontend logs_error-logs-f.png">
--- a/apps/server/src/assets/translations/fa/server.json
+++ b/apps/server/src/assets/translations/fa/server.json
@ -0,0 +1,14 @@
+{
+  "keyboard_actions": {
+    "back-in-note-history": "به یادداشت قبلی در تاریخچه",
+    "forward-in-note-history": "به یادداشت بعدی در تاریخچه برو",
+    "open-jump-to-note-dialog": "باز کردن پنجرهٔ «پرش به یادداشت»",
+    "open-command-palette": "باز کردن پالت دستورات",
+    "scroll-to-active-note": "پیمایش درخت یادداشت به یادداشت جاری",
+    "quick-search": "فعال‌سازی نوار جستجوی سریع",
+    "search-in-subtree": "‪جستجوی یادداشت‌ها در زیردرخت یادداشت فعال",
+    "expand-subtree": "باز کردن زیردرخت یادداشت جاری",
+    "collapse-tree": "بستن کامل درخت یادداشت‌ها",
+    "collapse-subtree": "بستن زیرشاخه‌های یادداشت فعلی"
+  }
+}
--- a/apps/server/src/assets/translations/fi/server.json
+++ b/apps/server/src/assets/translations/fi/server.json
@ -0,0 +1,10 @@
+{
+  "keyboard_actions": {
+    "quick-search": "Aktivoi pikahakupalkki",
+    "collapse-tree": "Kutista valmis muistiinpanopuu",
+    "creating-and-moving-notes": "Luo ja siirrä muistioita",
+    "delete-note": "Poista muistio",
+    "move-note-up": "Siirrä muistio ylös",
+    "open-command-palette": "Avaa komentovalikko"
+  }
+}
--- a/apps/server/src/assets/translations/fr/server.json
+++ b/apps/server/src/assets/translations/fr/server.json
@ -134,7 +134,7 @@
  },
  "setup_sync-from-desktop": {
    "heading": "Synchroniser depuis une application de bureau",
-    "description": "Cette procédure doit être réalisée depuis l'application de bureau:",
+    "description": "Cette procédure doit être réalisée depuis l'application de bureau :",
    "step1": "Ouvrez l'application Trilium Notes.",
    "step2": "Dans le menu Trilium, cliquez sur Options.",
    "step3": "Cliquez sur la catégorie Synchroniser.",
@ -310,6 +310,46 @@
    "clone-notes-to": "Cloner les notes vers",
    "move-notes-to": "Déplacer les notes vers",
    "copy-notes-to-clipboard": "Copier les notes dans le presse-papiers",
-    "paste-notes-from-clipboard": "Coller les notes depuis le presse-papiers"
+    "paste-notes-from-clipboard": "Coller les notes depuis le presse-papiers",
+    "cut-notes-to-clipboard": "Couper les notes vers le presse-papier",
+    "select-all-notes-in-parent": "Selectionner toutes les notes dans le parent",
+    "add-note-above-to-selection": "Ajouter la note au-dessus à la selection",
+    "add-note-below-to-selection": "Ajouter la note dessous à la selection",
+    "duplicate-subtree": "Dupliquer la sous-arborescence",
+    "open-new-tab": "Ouvrir un nouvel onglet",
+    "close-active-tab": "Fermer l'onglet actif",
+    "reopen-last-tab": "Réouvrir le dernier onglet",
+    "activate-next-tab": "Activer l'onglet suivant",
+    "activate-previous-tab": "Activer l'onglet précédent",
+    "open-new-window": "Ouvrir une nouvelle fenêtre",
+    "toggle-system-tray-icon": "Activer/Désactiver l'icone de la barre d'état",
+    "toggle-zen-mode": "Activer/Désactiver le mode Zen",
+    "switch-to-first-tab": "Aller au premier onglet",
+    "switch-to-second-tab": "Aller au second onglet",
+    "switch-to-third-tab": "Aller au troisième onglet",
+    "switch-to-fourth-tab": "Aller au quatrième onglet",
+    "switch-to-fifth-tab": "Aller au cinquième onglet",
+    "switch-to-sixth-tab": "Aller au sixième onglet",
+    "switch-to-seventh-tab": "Aller au septième onglet",
+    "switch-to-eighth-tab": "Aller au huitième onglet",
+    "switch-to-ninth-tab": "Aller au neuvième onglet",
+    "switch-to-last-tab": "Aller au dernier onglet",
+    "show-note-source": "Afficher la source de la note",
+    "show-options": "Afficher les options",
+    "show-revisions": "Afficher les révisions",
+    "show-recent-changes": "Afficher les changements récents",
+    "show-sql-console": "Afficher la console SQL",
+    "show-backend-log": "Afficher le journal du backend",
+    "show-help": "Afficher l'aide",
+    "show-cheatsheet": "Afficher la fiche de triche",
+    "add-link-to-text": "Ajouter un lien au texte",
+    "follow-link-under-cursor": "Suivre le lien en dessous du curseur",
+    "insert-date-and-time-to-text": "Insérer la date et l'heure dans le texte",
+    "paste-markdown-into-text": "Coller du Markdown dans le texte",
+    "cut-into-note": "Couper dans une note",
+    "add-include-note-to-text": "Ajouter une note inclusion au texte",
+    "edit-read-only-note": "Modifier une note en lecture seule",
+    "add-new-label": "Ajouter une nouvelle étiquette",
+    "add-new-relation": "Ajouter une nouvelle relation"
  }
 }
--- a/apps/server/src/assets/translations/hu/server.json
+++ b/apps/server/src/assets/translations/hu/server.json
@ -0,0 +1 @@
+{}
--- a/apps/server/src/assets/translations/ja/server.json
+++ b/apps/server/src/assets/translations/ja/server.json
@ -6,20 +6,20 @@
    "open-command-palette": "コマンドパレットを開く",
    "scroll-to-active-note": "ノートツリーをアクティブなノートまでスクロールする",
    "search-in-subtree": "アクティブなノートのサブツリー内でノートを検索する",
-    "expand-subtree": "現在のノートのサブツリーを展開する",
+    "expand-subtree": "現在のノートのサブツリーを展開",
    "collapse-tree": "ノートツリー全体を折りたたむ",
    "collapse-subtree": "現在のノートのサブツリーを折りたたむ",
    "creating-and-moving-notes": "ノートの作成と移動",
    "create-note-after": "アクティブなノートの後にノートを作成する",
    "create-note-into": "アクティブなノートの子ノートを作成する",
-    "delete-note": "ノートを削除する",
-    "move-note-up": "ノートを上に移動する",
-    "move-note-down": "ノートを下に移動する",
-    "move-note-up-in-hierarchy": "ノートを上の階層に移動する",
-    "move-note-down-in-hierarchy": "ノートを下の階層に移動する",
+    "delete-note": "ノートを削除",
+    "move-note-up": "ノートを上に移動",
+    "move-note-down": "ノートを下に移動",
+    "move-note-up-in-hierarchy": "ノートを上の階層に移動",
+    "move-note-down-in-hierarchy": "ノートを下の階層に移動",
    "edit-note-title": "ツリーからノートの詳細にジャンプして、タイトルを編集",
-    "clone-notes-to": "選択したノートを複製する",
-    "move-notes-to": "選択したノートを移動する",
+    "clone-notes-to": "選択したノートを複製",
+    "move-notes-to": "選択したノートを移動",
    "copy-notes-to-clipboard": "選択したノートをクリップボードにコピー",
    "paste-notes-from-clipboard": "クリップボードからアクティブなノートにノートを貼り付け",
    "cut-notes-to-clipboard": "選択したノートをクリップボードにカット",
--- a/apps/server/src/assets/translations/pl/server.json
+++ b/apps/server/src/assets/translations/pl/server.json
@ -0,0 +1,66 @@
+{
+  "keyboard_actions": {
+    "back-in-note-history": "Nawigacja do poprzedniej notatki w historii",
+    "forward-in-note-history": "Nawigacja do następnej notatki w historii",
+    "open-jump-to-note-dialog": "Otwórz dialog \"Skocz do notatki\"",
+    "open-command-palette": "Otwórz paletę komend",
+    "scroll-to-active-note": "Przewiń drzewo notatek do aktywnej notatki",
+    "quick-search": "Aktywuj szybki pasek wyszukiwania",
+    "search-in-subtree": "Szukaj notatek w sub-drzewie aktywnej notatki",
+    "expand-subtree": "Rozszerz sub-drzewo obecnej notatki",
+    "collapse-tree": "Schowaj kompletne drzewo notatek",
+    "collapse-subtree": "Schowaj sub-drzewo aktualnej notatki",
+    "sort-child-notes": "Sortuj podnotatki",
+    "creating-and-moving-notes": "Tworzenie oraz przestawianie notatek",
+    "create-note-after": "Utwórz notatkę po aktywnej notatce",
+    "create-note-into": "Utwórz notatkę jako podnotatka aktywnej notatki",
+    "create-note-into-inbox": "Utwórz notatkę w skrzyncę (jeśli zdefiniowana) lub jako notatka dnia",
+    "delete-note": "Usuń notatkę",
+    "move-note-up": "Przestaw notatkę wyżej",
+    "move-note-down": "Przestaw notatkę niżej",
+    "move-note-up-in-hierarchy": "Przestaw notatkę wyżej w hierarchii",
+    "move-note-down-in-hierarchy": "Przestaw notatkę niżej w hierarchii",
+    "edit-note-title": "Przeskocz z drzewa do detali notatki i edytuj tytuł",
+    "edit-branch-prefix": "Pokaż dialog \"Edytuj prefiks gałęzi\"",
+    "clone-notes-to": "Sklonuj zaznaczone notatki",
+    "move-notes-to": "Przestaw zaznaczone notatki",
+    "note-clipboard": "Schowek notatki",
+    "copy-notes-to-clipboard": "Skopiuj zaznaczone notatki do schowka",
+    "paste-notes-from-clipboard": "Wklej notatki ze schowka do aktywnej notatki",
+    "cut-notes-to-clipboard": "Wytnij zaznaczone notatki do schowka",
+    "select-all-notes-in-parent": "Zaznacz wszystkie notatki z poziomu aktualnej notatki",
+    "add-note-above-to-the-selection": "Dodaj notatkę nad zaznaczeniem",
+    "add-note-below-to-selection": "Dodaj notatkę pod zaznaczeniem",
+    "duplicate-subtree": "Duplikuj sub-drzewo",
+    "tabs-and-windows": "Karty i Okna",
+    "open-new-tab": "Otwórz nową kartę",
+    "close-active-tab": "Zamknij aktywną kartę",
+    "reopen-last-tab": "Otwórz ponownie ostatnio zamkniętą kartę",
+    "activate-next-tab": "Aktywuj kartę po prawej",
+    "activate-previous-tab": "Aktywuj kartę po lewej",
+    "open-new-window": "Otwórz nowe puste okno",
+    "toggle-tray": "Pokaż/schowaj aplikację z zasobnika systemowego",
+    "first-tab": "Aktywuj piewszą kartę z listy",
+    "second-tab": "Aktywuj drugą kartę z listy",
+    "third-tab": "Aktywuj trzecią kartę z listy",
+    "fourth-tab": "Aktywuj czwartą kartę z listy",
+    "fifth-tab": "Aktywuj piątą kartę z listy",
+    "sixth-tab": "Aktywuj szóstą kartę z listy",
+    "seventh-tab": "Aktywuj siódmą kartę z listy",
+    "eight-tab": "Aktywuj ósmą kartę z listy",
+    "ninth-tab": "Aktywuj dziewiątą kartę z listy",
+    "last-tab": "Aktywuj ostatnią kartę z listy",
+    "dialogs": "Okna dialogowe",
+    "show-note-source": "Pokaż dialog \"Źródło notatki\"",
+    "show-options": "Pokaż stronę \"Opcje\"",
+    "show-revisions": "Pokaż dialog \"Rewizje notatki\"",
+    "show-recent-changes": "Pokaż dialog \"Ostatnie zmiany\"",
+    "show-sql-console": "Pokaż stronę \"Konsola SQL\"",
+    "show-backend-log": "Pokaż stronę \"Logi Backendu\"",
+    "show-help": "Pokaż wbudowany poradnik użytkownika",
+    "show-cheatsheet": "Pokaż dialog z częstymi operacjami klawiatury",
+    "text-note-operations": "Operacje tekstowe notatki",
+    "add-link-to-text": "Otwórz dialog dodawania linku do tekstu",
+    "follow-link-under-cursor": "Podążaj za linkiem, w którym znajduje się kursor"
+  }
+}
--- a/apps/server/src/assets/translations/ru/server.json
+++ b/apps/server/src/assets/translations/ru/server.json
@ -1 +1,34 @@
-{}
+{
+  "keyboard_actions": {
+    "open-command-palette": "Открыть палитру команд",
+    "quick-search": "Активировать панель быстрого поиска",
+    "move-note-up": "Переместить заметку вверх",
+    "move-note-down": "Переместить заметку вниз",
+    "move-note-up-in-hierarchy": "Переместить заметку вверх в иерархии",
+    "move-note-down-in-hierarchy": "Переместить заметку вниз в иерархии",
+    "delete-note": "Удалить заметку",
+    "back-in-note-history": "Перейти к предыдущей заметке в истории",
+    "forward-in-note-history": "Перейти к следующей заметке в истории",
+    "scroll-to-active-note": "Прокрутить дерево заметок до активной заметки",
+    "search-in-subtree": "Искать заметки в поддереве активной заметки",
+    "expand-subtree": "Развернуть поддерево текущей заметки",
+    "collapse-tree": "Свернуть дерево заметок полностью",
+    "collapse-subtree": "Свернуть поддерево текущей заметки",
+    "sort-child-notes": "Сортировка дочерних заметок",
+    "creating-and-moving-notes": "Создание и перемещение заметок",
+    "create-note-after": "Создать заметку после активной заметки",
+    "create-note-into": "Создать заметку как дочернюю для активной заметки",
+    "edit-note-title": "Перейти от дерева к деталям заметки и отредактировать заголовок",
+    "clone-notes-to": "Клонировать выбранные заметки",
+    "move-notes-to": "Переместить выбранные заметки",
+    "note-clipboard": "Буфер обмена заметок",
+    "copy-notes-to-clipboard": "Скопировать выбранные заметки в буфер обмена",
+    "paste-notes-from-clipboard": "Вставить заметки из буфера обмена в активную заметку",
+    "cut-notes-to-clipboard": "Вырезать выбранные заметки в буфер обмена",
+    "duplicate-subtree": "Дублировать поддерево",
+    "tabs-and-windows": "Вкладки и окна",
+    "open-new-tab": "Открыть новую вкладку",
+    "close-active-tab": "Закрыть активную вкладку",
+    "reopen-last-tab": "Повторно открыть последнюю закрытую вкладку"
+  }
+}
--- a/apps/server/src/assets/translations/tw/server.json
+++ b/apps/server/src/assets/translations/tw/server.json
@ -13,24 +13,24 @@
    "move-note-down": "下移筆記",
    "move-note-up-in-hierarchy": "將筆記層級上移",
    "move-note-down-in-hierarchy": "將筆記層級下移",
-    "edit-note-title": "從筆記樹跳轉至筆記詳情並編輯標題",
+    "edit-note-title": "從筆記樹跳轉至筆記內容並編輯標題",
    "edit-branch-prefix": "顯示編輯分支前綴對話方塊",
    "note-clipboard": "筆記剪貼簿",
-    "copy-notes-to-clipboard": "複製選定的筆記至剪貼簿",
+    "copy-notes-to-clipboard": "複製所選的筆記至剪貼簿",
    "paste-notes-from-clipboard": "從剪貼簿貼上筆記至目前筆記中",
-    "cut-notes-to-clipboard": "剪下選定的筆記至剪貼簿",
-    "select-all-notes-in-parent": "選擇當前筆記級別的所有筆記",
+    "cut-notes-to-clipboard": "剪下所選的筆記至剪貼簿",
+    "select-all-notes-in-parent": "選擇目前筆記級別的所有筆記",
    "add-note-above-to-the-selection": "加入上方筆記至選擇中",
    "add-note-below-to-selection": "加入下方筆記至選擇中",
    "duplicate-subtree": "複製子階層",
    "tabs-and-windows": "分頁和視窗",
    "open-new-tab": "打開新分頁",
-    "close-active-tab": "關閉活動分頁",
+    "close-active-tab": "關閉使用中分頁",
    "reopen-last-tab": "重新打開最後關閉的分頁",
    "activate-next-tab": "切換至右側分頁",
    "activate-previous-tab": "切換至左側分頁",
    "open-new-window": "打開新空白視窗",
-    "toggle-tray": "從系統匣顯示/隱藏應用程式",
+    "toggle-tray": "從系統匣顯示 / 隱藏應用程式",
    "first-tab": "切換至列表中第一個分頁",
    "second-tab": "切換至列表中第二個分頁",
    "third-tab": "切換至列表中第三個分頁",
@ -44,7 +44,7 @@
    "dialogs": "對話方塊",
    "show-note-source": "顯示筆記來源對話方塊",
    "show-options": "打開選項頁面",
-    "show-revisions": "顯示筆記修改歷史對話方塊",
+    "show-revisions": "顯示筆記歷史版本對話方塊",
    "show-recent-changes": "顯示最近更改對話方塊",
    "show-sql-console": "打開 SQL 控制台頁面",
    "show-backend-log": "打開後端日誌頁面",
@ -54,18 +54,18 @@
    "insert-date-and-time-to-text": "插入目前日期和時間",
    "paste-markdown-into-text": "將剪貼簿中的 Markdown 文字貼上",
    "cut-into-note": "從目前筆記剪下選擇的部分並新增至子筆記",
-    "add-include-note-to-text": "打開對話方塊以包含筆記",
+    "add-include-note-to-text": "打開對話方塊以內嵌筆記",
    "edit-readonly-note": "編輯唯讀筆記",
    "attributes-labels-and-relations": "屬性（標籤和關係）",
    "add-new-label": "新增新標籤",
    "create-new-relation": "新增新關聯",
    "ribbon-tabs": "功能區分頁",
    "toggle-basic-properties": "顯示基本屬性",
-    "toggle-file-properties": "顯示文件屬性",
+    "toggle-file-properties": "顯示檔案屬性",
    "toggle-image-properties": "顯示圖像屬性",
-    "toggle-owned-attributes": "顯示擁有的屬性",
-    "toggle-inherited-attributes": "顯示繼承的屬性",
-    "toggle-promoted-attributes": "顯示提升的屬性",
+    "toggle-owned-attributes": "顯示自有屬性",
+    "toggle-inherited-attributes": "顯示繼承屬性",
+    "toggle-promoted-attributes": "顯示升級的屬性",
    "toggle-link-map": "顯示連結地圖",
    "toggle-note-info": "顯示筆記資訊",
    "toggle-note-paths": "顯示筆記路徑",
@ -73,9 +73,9 @@
    "other": "其他",
    "toggle-right-pane": "切換右側面板的顯示，包括目錄和高亮",
    "print-active-note": "列印目前筆記",
-    "open-note-externally": "以預設應用程式打開筆記文件",
+    "open-note-externally": "以預設應用程式打開筆記檔案",
    "render-active-note": "渲染（重新渲染）目前筆記",
-    "run-active-note": "執行目前的 JavaScript（前端/後端）程式碼筆記",
+    "run-active-note": "執行目前的 JavaScript（前端 / 後端）程式碼筆記",
    "toggle-note-hoisting": "聚焦目前筆記",
    "unhoist": "取消任何聚焦",
    "reload-frontend-app": "重新載入前端應用",
@ -86,24 +86,24 @@
    "zoom-in": "放大",
    "note-navigation": "筆記導航",
    "reset-zoom-level": "重設縮放比例",
-    "copy-without-formatting": "以純文字複製選定文字",
-    "force-save-revision": "強制新增/儲存目前筆記的新版本",
+    "copy-without-formatting": "以純文字複製所選文字",
+    "force-save-revision": "強制新增 / 儲存目前筆記的新版本",
    "show-help": "顯示用戶說明",
    "toggle-book-properties": "顯示集合屬性",
    "back-in-note-history": "跳轉至歷史記錄中的上一個筆記",
    "forward-in-note-history": "跳轉至歷史記錄中的下一個筆記",
    "open-command-palette": "打開命令面板",
-    "scroll-to-active-note": "滾動筆記樹至目前筆記",
+    "scroll-to-active-note": "捲動筆記樹至目前筆記",
    "quick-search": "開啟快速搜尋列",
    "create-note-after": "新增筆記於目前筆記之後",
    "create-note-into": "新增目前筆記的子筆記",
-    "clone-notes-to": "克隆選定的筆記至",
-    "move-notes-to": "移動選定的筆記至",
+    "clone-notes-to": "克隆所選的筆記至",
+    "move-notes-to": "移動所選的筆記至",
    "show-cheatsheet": "顯示常用鍵盤快捷鍵",
    "find-in-text": "顯示搜尋面板",
    "toggle-classic-editor-toolbar": "顯示固定工具列編輯器的格式分頁",
    "export-as-pdf": "匯出目前筆記為 PDF",
-    "toggle-zen-mode": "啟用/禁用禪模式（極簡界面以專注編輯）"
+    "toggle-zen-mode": "啟用 / 禁用禪模式（極簡界面以專注編輯）"
  },
  "login": {
    "title": "登入",
@ -214,7 +214,7 @@
    "back-in-note-history": "返回筆記歷史",
    "forward-in-note-history": "前進筆記歷史",
    "jump-to-note": "跳轉至…",
-    "scroll-to-active-note": "滾動至目前筆記",
+    "scroll-to-active-note": "捲動至目前筆記",
    "quick-search": "快速搜尋",
    "search-in-subtree": "在子階層中搜尋",
    "expand-subtree": "展開子階層",
@ -246,8 +246,8 @@
    "activate-next-tab": "切換至下一分頁",
    "activate-previous-tab": "切換至上一分頁",
    "open-new-window": "打開新視窗",
-    "toggle-system-tray-icon": "顯示/隱藏系統匣圖示",
-    "toggle-zen-mode": "啟用/禁用禪模式",
+    "toggle-system-tray-icon": "顯示 / 隱藏系統匣圖示",
+    "toggle-zen-mode": "啟用 / 禁用禪模式",
    "switch-to-first-tab": "切換至第一個分頁",
    "switch-to-second-tab": "切換至第二個分頁",
    "switch-to-third-tab": "切換至第三個分頁",
@ -260,7 +260,7 @@
    "switch-to-last-tab": "切換至第最後一個分頁",
    "show-note-source": "顯示筆記原始碼",
    "show-options": "顯示選項",
-    "show-revisions": "顯示修改歷史",
+    "show-revisions": "顯示歷史版本",
    "show-recent-changes": "顯示最近更改",
    "show-sql-console": "顯示 SQL 控制台",
    "show-backend-log": "顯示後端日誌",
@ -271,18 +271,18 @@
    "insert-date-and-time-to-text": "插入日期和時間",
    "paste-markdown-into-text": "貼上 Markdown 文字",
    "cut-into-note": "剪下至筆記",
-    "add-include-note-to-text": "新增包含筆記",
+    "add-include-note-to-text": "新增內嵌筆記",
    "edit-read-only-note": "編輯唯讀筆記",
    "add-new-label": "新增標籤",
    "add-new-relation": "新增關聯",
    "toggle-ribbon-tab-classic-editor": "顯示功能區分頁：經典編輯器",
    "toggle-ribbon-tab-basic-properties": "顯示功能區分頁：基本屬性",
    "toggle-ribbon-tab-book-properties": "顯示功能區分頁：書籍屬性",
-    "toggle-ribbon-tab-file-properties": "顯示功能區分頁：文件屬性",
+    "toggle-ribbon-tab-file-properties": "顯示功能區分頁：檔案屬性",
    "toggle-ribbon-tab-image-properties": "顯示功能區分頁：圖片屬性",
    "toggle-ribbon-tab-owned-attributes": "顯示功能區分頁：自有屬性",
    "toggle-ribbon-tab-inherited-attributes": "顯示功能區分頁：繼承屬性",
-    "toggle-ribbon-tab-promoted-attributes": "顯示功能區分頁：提升屬性",
+    "toggle-ribbon-tab-promoted-attributes": "顯示功能區分頁：升級屬性",
    "toggle-ribbon-tab-note-map": "顯示功能區分頁：筆記地圖",
    "toggle-ribbon-tab-note-info": "顯示功能區分頁：筆記資訊",
    "toggle-ribbon-tab-note-paths": "顯示功能區分頁：筆記路徑",
@ -313,15 +313,15 @@
    "bulk-action-title": "批次操作",
    "backend-log-title": "後端日誌",
    "user-hidden-title": "隱藏的用戶",
-    "launch-bar-templates-title": "啟動列模版",
+    "launch-bar-templates-title": "啟動欄模版",
    "base-abstract-launcher-title": "基礎摘要啟動器",
    "command-launcher-title": "命令啟動器",
    "note-launcher-title": "筆記啟動器",
    "script-launcher-title": "腳本啟動器",
-    "built-in-widget-title": "內建小工具",
-    "spacer-title": "空白占位",
-    "custom-widget-title": "自訂小工具",
-    "launch-bar-title": "啟動列",
+    "built-in-widget-title": "內建元件",
+    "spacer-title": "分隔元件",
+    "custom-widget-title": "自訂元件",
+    "launch-bar-title": "啟動欄",
    "available-launchers-title": "可用啟動器",
    "go-to-previous-note-title": "跳轉至前一筆記",
    "go-to-next-note-title": "跳轉至後一筆記",
@ -349,7 +349,7 @@
    "etapi-title": "ETAPI",
    "backup-title": "備份",
    "sync-title": "同步",
-    "ai-llm-title": "AI/LLM",
+    "ai-llm-title": "AI / LLM",
    "other": "其他",
    "advanced-title": "進階",
    "visible-launchers-title": "可見啟動器",
@ -373,7 +373,7 @@
    "export_filter": "PDF 文件 (*.pdf)",
    "unable-to-export-message": "目前筆記無法被匯出為 PDF 。",
    "unable-to-export-title": "無法匯出為 PDF",
-    "unable-to-save-message": "選定文件無法被寫入。請重試或選擇其他路徑。"
+    "unable-to-save-message": "所選檔案無法被寫入。請重試或選擇其他路徑。"
  },
  "tray": {
    "tooltip": "Trilium 筆記",
--- a/apps/server/src/assets/translations/uk/server.json
+++ b/apps/server/src/assets/translations/uk/server.json
@ -0,0 +1,12 @@
+{
+  "keyboard_actions": {
+    "back-in-note-history": "Перейти до минулої нотатки в історії",
+    "forward-in-note-history": "Перейти до наступної нотатки в історії",
+    "open-command-palette": "Відкрити палітру команд",
+    "scroll-to-active-note": "Прокрутити дерево нотаток до активної нотатки",
+    "quick-search": "Показати панель швидкого пошуку",
+    "search-in-subtree": "Пошук нотаток в піддереві активної нотатки",
+    "expand-subtree": "Розкрити піддерево поточної нотатки",
+    "collapse-tree": "Згорнути все дерево нотаток"
+  }
+}
--- a/apps/server/src/services/search/search_result.ts
+++ b/apps/server/src/services/search/search_result.ts
@ -35,6 +35,8 @@ class SearchResult {
    highlightedNotePathTitle?: string;
    contentSnippet?: string;
    highlightedContentSnippet?: string;
+    attributeSnippet?: string;
+    highlightedAttributeSnippet?: string;
    private fuzzyScore: number; // Track fuzzy score separately

    constructor(notePathArray: string[]) {
--- a/apps/server/src/services/search/services/search.ts
+++ b/apps/server/src/services/search/services/search.ts
@ -468,8 +468,13 @@ function extractContentSnippet(noteId: string, searchTokens: string[], maxLength
            content = striptags(content);
        }

-        // Normalize whitespace
-        content = content.replace(/\s+/g, " ").trim();
+        // Normalize whitespace while preserving paragraph breaks
+        // First, normalize multiple newlines to double newlines (paragraph breaks)
+        content = content.replace(/\n\s*\n/g, "\n\n");
+        // Then normalize spaces within lines
+        content = content.split('\n').map(line => line.replace(/\s+/g, " ").trim()).join('\n');
+        // Finally trim the whole content
+        content = content.trim();

        if (!content) {
            return "";
@ -495,21 +500,36 @@ function extractContentSnippet(noteId: string, searchTokens: string[], maxLength
        // Extract snippet
        let snippet = content.substring(snippetStart, snippetStart + maxLength);
        
-        // Try to start/end at word boundaries
-        if (snippetStart > 0) {
-            const firstSpace = snippet.indexOf(" ");
-            if (firstSpace > 0 && firstSpace < 20) {
-                snippet = snippet.substring(firstSpace + 1);
-            }
-            snippet = "..." + snippet;
-        }
-        
-        if (snippetStart + maxLength < content.length) {
-            const lastSpace = snippet.lastIndexOf(" ");
-            if (lastSpace > snippet.length - 20) {
-                snippet = snippet.substring(0, lastSpace);
-            }
+        // If snippet contains linebreaks, limit to max 4 lines and override character limit
+        const lines = snippet.split('\n');
+        if (lines.length > 4) {
+            snippet = lines.slice(0, 4).join('\n');
+            // Add ellipsis if we truncated lines
            snippet = snippet + "...";
+        } else if (lines.length > 1) {
+            // For multi-line snippets, just limit to 4 lines (keep existing snippet)
+            snippet = lines.slice(0, 4).join('\n');
+            if (lines.length > 4) {
+                snippet = snippet + "...";
+            }
+        } else {
+            // Single line content - apply original word boundary logic
+            // Try to start/end at word boundaries
+            if (snippetStart > 0) {
+                const firstSpace = snippet.search(/\s/);
+                if (firstSpace > 0 && firstSpace < 20) {
+                    snippet = snippet.substring(firstSpace + 1);
+                }
+                snippet = "..." + snippet;
+            }
+            
+            if (snippetStart + maxLength < content.length) {
+                const lastSpace = snippet.search(/\s[^\s]*$/);
+                if (lastSpace > snippet.length - 20 && lastSpace > 0) {
+                    snippet = snippet.substring(0, lastSpace);
+                }
+                snippet = snippet + "...";
+            }
        }

        return snippet;
@ -519,6 +539,90 @@ function extractContentSnippet(noteId: string, searchTokens: string[], maxLength
    }
 }

+function extractAttributeSnippet(noteId: string, searchTokens: string[], maxLength: number = 200): string {
+    const note = becca.notes[noteId];
+    if (!note) {
+        return "";
+    }
+
+    try {
+        // Get all attributes for this note
+        const attributes = note.getAttributes();
+        if (!attributes || attributes.length === 0) {
+            return "";
+        }
+
+        let matchingAttributes: Array<{name: string, value: string, type: string}> = [];
+        
+        // Look for attributes that match the search tokens
+        for (const attr of attributes) {
+            const attrName = attr.name?.toLowerCase() || "";
+            const attrValue = attr.value?.toLowerCase() || "";
+            const attrType = attr.type || "";
+            
+            // Check if any search token matches the attribute name or value
+            const hasMatch = searchTokens.some(token => {
+                const normalizedToken = normalizeString(token.toLowerCase());
+                return attrName.includes(normalizedToken) || attrValue.includes(normalizedToken);
+            });
+            
+            if (hasMatch) {
+                matchingAttributes.push({
+                    name: attr.name || "",
+                    value: attr.value || "",
+                    type: attrType
+                });
+            }
+        }
+
+        if (matchingAttributes.length === 0) {
+            return "";
+        }
+
+        // Limit to 4 lines maximum, similar to content snippet logic
+        const lines: string[] = [];
+        for (const attr of matchingAttributes.slice(0, 4)) {
+            let line = "";
+            if (attr.type === "label") {
+                line = attr.value ? `#${attr.name}="${attr.value}"` : `#${attr.name}`;
+            } else if (attr.type === "relation") {
+                // For relations, show the target note title if possible
+                const targetNote = attr.value ? becca.notes[attr.value] : null;
+                const targetTitle = targetNote ? targetNote.title : attr.value;
+                line = `~${attr.name}="${targetTitle}"`;
+            }
+            
+            if (line) {
+                lines.push(line);
+            }
+        }
+
+        let snippet = lines.join('\n');
+        
+        // Apply length limit while preserving line structure
+        if (snippet.length > maxLength) {
+            // Try to truncate at word boundaries but keep lines intact
+            const truncated = snippet.substring(0, maxLength);
+            const lastNewline = truncated.lastIndexOf('\n');
+            
+            if (lastNewline > maxLength / 2) {
+                // If we can keep most content by truncating to last complete line
+                snippet = truncated.substring(0, lastNewline);
+            } else {
+                // Otherwise just truncate and add ellipsis
+                const lastSpace = truncated.lastIndexOf(' ');
+                snippet = truncated.substring(0, lastSpace > maxLength / 2 ? lastSpace : maxLength - 3);
+                snippet = snippet + "...";
+            }
+        }
+
+        return snippet;
+    } catch (e) {
+        log.error(`Error extracting attribute snippet for note ${noteId}: ${e}`);
+        return "";
+    }
+}
+
 function searchNotesForAutocomplete(query: string, fastSearch: boolean = true) {
    const searchContext = new SearchContext({
        fastSearch: fastSearch,
@ -533,9 +637,10 @@ function searchNotesForAutocomplete(query: string, fastSearch: boolean = true) {

    const trimmed = allSearchResults.slice(0, 200);

-    // Extract content snippets
+    // Extract content and attribute snippets
    for (const result of trimmed) {
        result.contentSnippet = extractContentSnippet(result.noteId, searchContext.highlightedTokens);
+        result.attributeSnippet = extractAttributeSnippet(result.noteId, searchContext.highlightedTokens);
    }

    highlightSearchResults(trimmed, searchContext.highlightedTokens, searchContext.ignoreInternalAttributes);
@ -549,6 +654,8 @@ function searchNotesForAutocomplete(query: string, fastSearch: boolean = true) {
            highlightedNotePathTitle: result.highlightedNotePathTitle,
            contentSnippet: result.contentSnippet,
            highlightedContentSnippet: result.highlightedContentSnippet,
+            attributeSnippet: result.attributeSnippet,
+            highlightedAttributeSnippet: result.highlightedAttributeSnippet,
            icon: icon ?? "bx bx-note"
        };
    });
@ -574,7 +681,18 @@ function highlightSearchResults(searchResults: SearchResult[], highlightedTokens
        
        // Initialize highlighted content snippet
        if (result.contentSnippet) {
-            result.highlightedContentSnippet = escapeHtml(result.contentSnippet).replace(/[<{}]/g, "");
+            // Escape HTML but preserve newlines for later conversion to <br>
+            result.highlightedContentSnippet = escapeHtml(result.contentSnippet);
+            // Remove any stray < { } that might interfere with our highlighting markers
+            result.highlightedContentSnippet = result.highlightedContentSnippet.replace(/[<{}]/g, "");
+        }
+        
+        // Initialize highlighted attribute snippet
+        if (result.attributeSnippet) {
+            // Escape HTML but preserve newlines for later conversion to <br>
+            result.highlightedAttributeSnippet = escapeHtml(result.attributeSnippet);
+            // Remove any stray < { } that might interfere with our highlighting markers
+            result.highlightedAttributeSnippet = result.highlightedAttributeSnippet.replace(/[<{}]/g, "");
        }
    }

@ -612,6 +730,16 @@ function highlightSearchResults(searchResults: SearchResult[], highlightedTokens
                    contentRegex.lastIndex += 2;
                }
            }
+
+            // Highlight in attribute snippet
+            if (result.highlightedAttributeSnippet) {
+                const attributeRegex = new RegExp(escapeRegExp(token), "gi");
+                while ((match = attributeRegex.exec(normalizeString(result.highlightedAttributeSnippet))) !== null) {
+                    result.highlightedAttributeSnippet = wrapText(result.highlightedAttributeSnippet, match.index, token.length, "{", "}");
+                    // 2 characters are added, so we need to adjust the index
+                    attributeRegex.lastIndex += 2;
+                }
+            }
        }
    }

@ -621,7 +749,17 @@ function highlightSearchResults(searchResults: SearchResult[], highlightedTokens
        }
        
        if (result.highlightedContentSnippet) {
+            // Replace highlighting markers with HTML tags
            result.highlightedContentSnippet = result.highlightedContentSnippet.replace(/{/g, "<b>").replace(/}/g, "</b>");
+            // Convert newlines to <br> tags for HTML display
+            result.highlightedContentSnippet = result.highlightedContentSnippet.replace(/\n/g, "<br>");
+        }
+        
+        if (result.highlightedAttributeSnippet) {
+            // Replace highlighting markers with HTML tags
+            result.highlightedAttributeSnippet = result.highlightedAttributeSnippet.replace(/{/g, "<b>").replace(/}/g, "</b>");
+            // Convert newlines to <br> tags for HTML display
+            result.highlightedAttributeSnippet = result.highlightedAttributeSnippet.replace(/\n/g, "<br>");
        }
    }
 }
--- a/Notes/!!!meta.json
+++ b/Notes/!!!meta.json
@ -61,6 +61,32 @@
            "attachments": [],
            "dirFileName": "Release Notes",
            "children": [
+                {
+                    "isClone": false,
+                    "noteId": "PLUoryywi0BC",
+                    "notePath": [
+                        "hD3V4hiu2VW4",
+                        "PLUoryywi0BC"
+                    ],
+                    "title": "v0.98.0",
+                    "notePosition": 10,
+                    "prefix": null,
+                    "isExpanded": false,
+                    "type": "text",
+                    "mime": "text/html",
+                    "attributes": [
+                        {
+                            "type": "relation",
+                            "name": "template",
+                            "value": "wyurrlcDl416",
+                            "isInheritable": false,
+                            "position": 60
+                        }
+                    ],
+                    "format": "markdown",
+                    "dataFileName": "v0.98.0.md",
+                    "attachments": []
+                },
                {
                    "isClone": false,
                    "noteId": "lvOuiWsLDv8F",
@ -69,7 +95,7 @@
                        "lvOuiWsLDv8F"
                    ],
                    "title": "v0.97.2",
-                    "notePosition": 10,
+                    "notePosition": 20,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -95,7 +121,7 @@
                        "OtFZ6Nd9vM3n"
                    ],
                    "title": "v0.97.1",
-                    "notePosition": 20,
+                    "notePosition": 30,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -121,7 +147,7 @@
                        "SJZ5PwfzHSQ1"
                    ],
                    "title": "v0.97.0",
-                    "notePosition": 30,
+                    "notePosition": 40,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -147,7 +173,7 @@
                        "mYXFde3LuNR7"
                    ],
                    "title": "v0.96.0",
-                    "notePosition": 40,
+                    "notePosition": 50,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -173,7 +199,7 @@
                        "jthwbL0FdaeU"
                    ],
                    "title": "v0.95.0",
-                    "notePosition": 50,
+                    "notePosition": 60,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -199,7 +225,7 @@
                        "7HGYsJbLuhnv"
                    ],
                    "title": "v0.94.1",
-                    "notePosition": 60,
+                    "notePosition": 70,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -225,7 +251,7 @@
                        "Neq53ujRGBqv"
                    ],
                    "title": "v0.94.0",
-                    "notePosition": 70,
+                    "notePosition": 80,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -251,7 +277,7 @@
                        "VN3xnce1vLkX"
                    ],
                    "title": "v0.93.0",
-                    "notePosition": 80,
+                    "notePosition": 90,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -269,7 +295,7 @@
                        "WRaBfQqPr6qo"
                    ],
                    "title": "v0.92.7",
-                    "notePosition": 90,
+                    "notePosition": 100,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -295,7 +321,7 @@
                        "a2rwfKNmUFU1"
                    ],
                    "title": "v0.92.6",
-                    "notePosition": 100,
+                    "notePosition": 110,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -313,7 +339,7 @@
                        "fEJ8qErr0BKL"
                    ],
                    "title": "v0.92.5-beta",
-                    "notePosition": 110,
+                    "notePosition": 120,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -331,7 +357,7 @@
                        "kkkZQQGSXjwy"
                    ],
                    "title": "v0.92.4",
-                    "notePosition": 120,
+                    "notePosition": 130,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -349,7 +375,7 @@
                        "vAroNixiezaH"
                    ],
                    "title": "v0.92.3-beta",
-                    "notePosition": 130,
+                    "notePosition": 140,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -367,7 +393,7 @@
                        "mHEq1wxAKNZd"
                    ],
                    "title": "v0.92.2-beta",
-                    "notePosition": 140,
+                    "notePosition": 150,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -385,7 +411,7 @@
                        "IykjoAmBpc61"
                    ],
                    "title": "v0.92.1-beta",
-                    "notePosition": 150,
+                    "notePosition": 160,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -403,7 +429,7 @@
                        "dq2AJ9vSBX4Y"
                    ],
                    "title": "v0.92.0-beta",
-                    "notePosition": 160,
+                    "notePosition": 170,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -421,7 +447,7 @@
                        "3a8aMe4jz4yM"
                    ],
                    "title": "v0.91.6",
-                    "notePosition": 170,
+                    "notePosition": 180,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -439,7 +465,7 @@
                        "8djQjkiDGESe"
                    ],
                    "title": "v0.91.5",
-                    "notePosition": 180,
+                    "notePosition": 190,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -457,7 +483,7 @@
                        "OylxVoVJqNmr"
                    ],
                    "title": "v0.91.4-beta",
-                    "notePosition": 190,
+                    "notePosition": 200,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -475,7 +501,7 @@
                        "tANGQDvnyhrj"
                    ],
                    "title": "v0.91.3-beta",
-                    "notePosition": 200,
+                    "notePosition": 210,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -493,7 +519,7 @@
                        "hMoBfwSoj1SC"
                    ],
                    "title": "v0.91.2-beta",
-                    "notePosition": 210,
+                    "notePosition": 220,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -511,7 +537,7 @@
                        "a2XMSKROCl9z"
                    ],
                    "title": "v0.91.1-beta",
-                    "notePosition": 220,
+                    "notePosition": 230,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -529,7 +555,7 @@
                        "yqXFvWbLkuMD"
                    ],
                    "title": "v0.90.12",
-                    "notePosition": 230,
+                    "notePosition": 240,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -547,7 +573,7 @@
                        "veS7pg311yJP"
                    ],
                    "title": "v0.90.11-beta",
-                    "notePosition": 240,
+                    "notePosition": 250,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -565,7 +591,7 @@
                        "sq5W9TQxRqMq"
                    ],
                    "title": "v0.90.10-beta",
-                    "notePosition": 250,
+                    "notePosition": 260,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -583,7 +609,7 @@
                        "yFEGVCUM9tPx"
                    ],
                    "title": "v0.90.9-beta",
-                    "notePosition": 260,
+                    "notePosition": 270,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -601,7 +627,7 @@
                        "o4wAGqOQuJtV"
                    ],
                    "title": "v0.90.8",
-                    "notePosition": 270,
+                    "notePosition": 280,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -634,7 +660,7 @@
                        "i4A5g9iOg9I0"
                    ],
                    "title": "v0.90.7-beta",
-                    "notePosition": 280,
+                    "notePosition": 290,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -652,7 +678,7 @@
                        "ThNf2GaKgXUs"
                    ],
                    "title": "v0.90.6-beta",
-                    "notePosition": 290,
+                    "notePosition": 300,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -670,7 +696,7 @@
                        "G4PAi554kQUr"
                    ],
                    "title": "v0.90.5-beta",
-                    "notePosition": 300,
+                    "notePosition": 310,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -697,7 +723,7 @@
                        "zATRobGRCmBn"
                    ],
                    "title": "v0.90.4",
-                    "notePosition": 310,
+                    "notePosition": 320,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -715,7 +741,7 @@
                        "sCDLf8IKn3Iz"
                    ],
                    "title": "v0.90.3",
-                    "notePosition": 320,
+                    "notePosition": 330,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -733,7 +759,7 @@
                        "VqqyBu4AuTjC"
                    ],
                    "title": "v0.90.2-beta",
-                    "notePosition": 330,
+                    "notePosition": 340,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -751,7 +777,7 @@
                        "RX3Nl7wInLsA"
                    ],
                    "title": "v0.90.1-beta",
-                    "notePosition": 340,
+                    "notePosition": 350,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -769,7 +795,7 @@
                        "GyueACukPWjk"
                    ],
                    "title": "v0.90.0-beta",
-                    "notePosition": 350,
+                    "notePosition": 360,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
@ -787,7 +813,7 @@
                        "wyurrlcDl416"
                    ],
                    "title": "Release Template",
-                    "notePosition": 360,
+                    "notePosition": 370,
                    "prefix": null,
                    "isExpanded": false,
                    "type": "text",
--- a/Notes/v0.98.0.md
+++ b/Notes/v0.98.0.md
@ -0,0 +1,63 @@
+# v0.98.0
+> [!IMPORTANT]
+> If you enjoyed this release, consider showing a token of appreciation by:
+> 
+> *   Pressing the “Star” button on [GitHub](https://github.com/TriliumNext/Trilium) (top-right).
+> *   Considering a one-time or recurrent donation to the [lead developer](https://github.com/eliandoran) via [GitHub Sponsors](https://github.com/sponsors/eliandoran) or [PayPal](https://paypal.me/eliandoran).
+
+## 💡 Key highlights
+
+*   [Enhanced Search with Fuzzy Matching and Better UX](https://github.com/TriliumNext/Trilium/pull/6536) by @perfectra1n
+*   For Linux users, RPM packages are now GPG-signed.
+    *   The keys must be imported once per device, before installation: `sudo rpm --import https://triliumnotes.org/RPM-GPG-KEY-trilium`
+
+## 🐞 Bugfixes
+
+*   The "chat with notes" icon re-appears on 0.97.2's Launchbar after update, even though the LLM feature was disabled before
+*   Board view: sub-children (recursive) not displayed.
+*   [Canvas: unable to open internal note path links](https://github.com/TriliumNext/Trilium/issues/6606)
+*   Delay when opening a Text note for the first time
+*   Search term is not highlighted in preview search result
+*   ETAPI: Save note revision if needed by @perfectra1n
+*   [No update notification in the global menu](https://github.com/TriliumNext/Trilium/pull/6657) by @SiriusXT
+
+## ✨ Improvements
+
+*   Zen mode is now supported on mobile by @Papierkorb2292
+*   Code notes: new Cobalt2 theme by @hulmgulm
+*   Existing users will be prompted with a message at the start of the application (and an option to dismiss it permanently):
+    *   To enable background effects on Windows, since it has become stable.
+    *   To use the TriliumNext theme.
+*   The built-in themes were renamed:
+    *   TriliumNext themes become simply Trilium
+    *   The Light/Dark/Auto themes become Legacy
+*   [Clean up old backend logs](https://github.com/TriliumNext/Trilium/pull/6609) by @perfectra1n
+
+## 📖 Documentation
+
+*   update doc references from triliumnext/notes to triliumnext/trilium by @perfectra1n
+*   Simple Update/Autoupdate Script by @serossi
+*   Improve OIDC docs by @JYC333
+*   Traditional Chinese README by @francistw
+*   README improvements by @meichthys
+
+## 🌍 Internationalization
+
+*   Improvements to multiple languages:
+    *   Chinese (Traditional)
+    *   Spanish
+*   Some work started on new languages:
+    
+    Portuguese (Brazil), Japanese, Russian, Serbian, Italian, Greek, Catalan
+*   Added new languages:
+    *   Russian (translations by @questamor)
+    *   Japanese language (translations by [acwr47](https://hosted.weblate.org/user/acwr47/))\[…\]
+
+## 🛠️ Technical updates
+
+*   Add duplicateSubtree to backend API by @Geekswordsman
+*   Fixed CVE-2025-54798 in `tmp` dependency
+*   Remove unnecessary idea directory by @GrantZhu1001
+*   Support getting an attribute value by ID in BNote by @Geekswordsman
+*   only run nightly.yml on TriliumNext/Trilium by @maphew
+*   All the dialogs have been converted to React/Preact for better maintainability. **If you notice any regressions, please report them.**
--- a/Guide/!!!meta.json
+++ b/Guide/!!!meta.json
@ -9141,10 +9141,24 @@
                                {
                                    "type": "relation",
                                    "name": "internalLink",
-                                    "value": "x59R8J8KV5Bp",
+                                    "value": "bnyigUA2UK7s",
+                                    "isInheritable": false,
+                                    "position": 10
+                                },
+                                {
+                                    "type": "relation",
+                                    "name": "internalLink",
+                                    "value": "9yEHzMyFirZR",
                                    "isInheritable": false,
                                    "position": 20
                                },
+                                {
+                                    "type": "relation",
+                                    "name": "internalLink",
+                                    "value": "x59R8J8KV5Bp",
+                                    "isInheritable": false,
+                                    "position": 30
+                                },
                                {
                                    "type": "label",
                                    "name": "shareAlias",
@ -9152,20 +9166,6 @@
                                    "isInheritable": false,
                                    "position": 30
                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "bnyigUA2UK7s",
-                                    "isInheritable": false,
-                                    "position": 40
-                                },
-                                {
-                                    "type": "relation",
-                                    "name": "internalLink",
-                                    "value": "9yEHzMyFirZR",
-                                    "isInheritable": false,
-                                    "position": 50
-                                },
                                {
                                    "type": "label",
                                    "name": "iconClass",
@ -9207,14 +9207,14 @@
                                        {
                                            "type": "relation",
                                            "name": "internalLink",
-                                            "value": "tAassRL4RSQL",
+                                            "value": "x3i7MxGccDuM",
                                            "isInheritable": false,
                                            "position": 10
                                        },
                                        {
                                            "type": "relation",
                                            "name": "internalLink",
-                                            "value": "x3i7MxGccDuM",
+                                            "value": "tAassRL4RSQL",
                                            "isInheritable": false,
                                            "position": 20
                                        },
--- a/Usage/Configuration
+++ b/Usage/Configuration
@ -1,5 +1,5 @@
 # Configuration (config.ini or environment variables)
-Trilium supports configuration via a file named `config.ini` and environment variables. Please review the file named [config-sample.ini](https://github.com/TriliumNext/Trilium/blob/develop/apps/server/src/assets/config-sample.ini) in the [Notes](https://github.com/TriliumNext/Trilium) repository to see what values are supported.
+Trilium supports configuration via a file named `config.ini` and environment variables. Please review the file named [config-sample.ini](https://github.com/TriliumNext/Trilium/blob/main/apps/server/src/assets/config-sample.ini) in the [Trilium](https://github.com/TriliumNext/Trilium) repository to see what values are supported.

 You can provide the same values via environment variables instead of the `config.ini` file, and these environment variables use the following format:

--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "@triliumnext/source",
-  "version": "0.97.2",
+  "version": "0.98.0",
  "description": "Build your personal knowledge base with Trilium Notes",
  "directories": {
    "doc": "docs"
@ -40,10 +40,10 @@
    "@playwright/test": "^1.36.0",
    "@triliumnext/server": "workspace:*",
    "@types/express": "^5.0.0",
-    "@types/node": "22.17.1",
+    "@types/node": "22.17.2",
    "@vitest/coverage-v8": "^3.0.5",
    "@vitest/ui": "^3.0.0",
-    "chalk": "5.5.0",
+    "chalk": "5.6.0",
    "cross-env": "10.0.0",
    "dpdm": "3.14.0",
    "esbuild": "^0.25.0",
@ -58,7 +58,7 @@
    "react-refresh": "^0.17.0",
    "rollup-plugin-webpack-stats": "2.1.3",
    "tslib": "^2.3.0",
-    "tsx": "4.20.3",
+    "tsx": "4.20.4",
    "typescript": "~5.9.0",
    "typescript-eslint": "^8.19.0",
    "upath": "2.0.1",
@ -90,7 +90,7 @@
    },
    "overrides": {
      "mermaid": "11.9.0",
-      "preact": "10.27.0",
+      "preact": "10.27.1",
      "roughjs": "4.6.6",
      "@types/express-serve-static-core": "5.0.7",
      "flat@<5.0.1": ">=5.0.1",
--- a/packages/ckeditor5-admonition/package.json
+++ b/packages/ckeditor5-admonition/package.json
@ -35,7 +35,7 @@
    "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.39.0",
+    "@typescript-eslint/eslint-plugin": "~8.40.0",
    "@typescript-eslint/parser": "^8.0.0",
    "@vitest/browser": "^3.0.5",
    "@vitest/coverage-istanbul": "^3.0.5",
--- a/packages/ckeditor5-footnotes/package.json
+++ b/packages/ckeditor5-footnotes/package.json
@ -36,7 +36,7 @@
    "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.39.0",
+    "@typescript-eslint/eslint-plugin": "~8.40.0",
    "@typescript-eslint/parser": "^8.0.0",
    "@vitest/browser": "^3.0.5",
    "@vitest/coverage-istanbul": "^3.0.5",
--- a/packages/ckeditor5-keyboard-marker/package.json
+++ b/packages/ckeditor5-keyboard-marker/package.json
@ -38,7 +38,7 @@
    "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.39.0",
+    "@typescript-eslint/eslint-plugin": "~8.40.0",
    "@typescript-eslint/parser": "^8.0.0",
    "@vitest/browser": "^3.0.5",
    "@vitest/coverage-istanbul": "^3.0.5",
--- a/packages/ckeditor5-math/package.json
+++ b/packages/ckeditor5-math/package.json
@ -39,7 +39,7 @@
    "@ckeditor/ckeditor5-dev-utils": "43.1.0",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.39.0",
+    "@typescript-eslint/eslint-plugin": "~8.40.0",
    "@typescript-eslint/parser": "^8.0.0",
    "@vitest/browser": "^3.0.5",
    "@vitest/coverage-istanbul": "^3.0.5",
--- a/packages/ckeditor5-mermaid/package.json
+++ b/packages/ckeditor5-mermaid/package.json
@ -38,7 +38,7 @@
    "@ckeditor/ckeditor5-dev-build-tools": "43.1.0",
    "@ckeditor/ckeditor5-inspector": ">=4.1.0",
    "@ckeditor/ckeditor5-package-tools": "^4.0.0",
-    "@typescript-eslint/eslint-plugin": "~8.39.0",
+    "@typescript-eslint/eslint-plugin": "~8.40.0",
    "@typescript-eslint/parser": "^8.0.0",
    "@vitest/browser": "^3.0.5",
    "@vitest/coverage-istanbul": "^3.0.5",
--- a/packages/commons/package.json
+++ b/packages/commons/package.json
@ -1,6 +1,6 @@
 {
  "name": "@triliumnext/commons",
-  "version": "0.97.2",
+  "version": "0.98.0",
  "description": "Shared library between the clients (e.g. browser, Electron) and the server, mostly for type definitions and utility methods.",
  "private": true,
  "type": "module",
--- a/packages/turndown-plugin-gfm/package.json
+++ b/packages/turndown-plugin-gfm/package.json
@ -57,7 +57,7 @@
    }
  },
  "devDependencies": {
-    "turndown": "7.2.0",
+    "turndown": "7.2.1",
    "turndown-attendant": "0.0.3"
  }
 }
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml