feat(docs): add asyncapi websocket docs

Currently translated at 44.1% (167 of 378 strings)

Translation: Trilium Notes/Server
Translate-URL: https://hosted.weblate.org/projects/trilium/server/uk/

.github/actions/build-electron/action.yml

@@ -162,3 +162,25 @@ runs:
         echo "Found ZIP: $zip_file"
         echo "Note: ZIP files are not code signed, but their contents should be"
       fi
+
+  - name: Sign the RPM
+    if: inputs.os == 'linux'
+    shell: ${{ inputs.shell }}
+    run: |
+      echo -n "$GPG_SIGNING_KEY" | base64 --decode | gpg --import
+
+      # Import the key into RPM for verification
+      gpg --export -a > pubkey
+      rpm --import pubkey
+      rm pubkey
+
+      # Sign the RPM
+      rpm_file=$(find ./apps/desktop/upload -name "*.rpm" -print -quit)
+      rpmsign --define "_gpg_name Trilium Notes Signing Key <triliumnotes@outlook.com>" --addsign "$rpm_file"
+      rpm -Kv "$rpm_file"
+
+      # Validate code signing
+      if ! rpm -K "$rpm_file" | grep -q "digests signatures OK"; then
+        echo .rpm file not signed
+        exit 1
+      fi

.github/actions/report-size/action.yml

@@ -44,7 +44,7 @@ runs:
   steps:
     # Checkout branch to compare to [required]
     - name: Checkout base branch
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         ref: ${{ inputs.branch }}
         path: br-base

.github/workflows/checks.yml

@@ -12,6 +12,7 @@ jobs:
     steps:
       - name: Check if PRs have conflicts
         uses: eps1lon/actions-label-merge-conflict@v3
+        if: github.repository == ${{ vars.REPO_MAIN }}
         with:
           dirtyLabel: "merge-conflicts"
           repoToken: "${{ secrets.MERGE_CONFLICT_LABEL_PAT }}"

.github/workflows/codeql.yml

@@ -57,7 +57,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Add any setup steps before running the `github/codeql-action/init` action.
     # This includes steps like installing compilers or runtimes (`actions/setup-node`

.github/workflows/dev.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0  # needed for https://github.com/marketplace/actions/nx-set-shas
 
@@ -48,7 +48,7 @@ jobs:
       - check-affected
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
@@ -68,7 +68,7 @@ jobs:
       - test_dev
       - check-affected
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pnpm/action-setup@v4
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -103,7 +103,7 @@ jobs:
           - dockerfile: Dockerfile
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - uses: pnpm/action-setup@v4
       - name: Install dependencies

.github/workflows/main-docker.yml

@@ -32,7 +32,7 @@ jobs:
           - dockerfile: Dockerfile
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set IMAGE_NAME to lowercase
         run: echo "IMAGE_NAME=${IMAGE_NAME,,}" >> $GITHUB_ENV
@@ -141,7 +141,7 @@ jobs:
         run: echo "TEST_TAG=${TEST_TAG,,}" >> $GITHUB_ENV
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4

.github/workflows/nightly.yml

@@ -27,6 +27,7 @@ permissions:
 
 jobs:
   nightly-electron:
+    if: github.repository == ${{ vars.REPO_MAIN }}
     name: Deploy nightly
     strategy:
       fail-fast: false
@@ -47,7 +48,7 @@ jobs:
             forge_platform: win32
     runs-on: ${{ matrix.os.image }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
@@ -75,6 +76,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
+          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
 
       - name: Publish release
         uses: softprops/action-gh-release@v2.3.2
@@ -96,6 +98,7 @@ jobs:
           path: apps/desktop/upload
 
   nightly-server:
+    if: github.repository == ${{ vars.REPO_MAIN }}
     name: Deploy server nightly
     strategy:
       fail-fast: false
@@ -108,7 +111,7 @@ jobs:
             runs-on: ubuntu-24.04-arm
     runs-on: ${{ matrix.runs-on }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Run the build
         uses: ./.github/actions/build-server

.github/workflows/playwright.yml

@@ -14,7 +14,7 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           filter: tree:0
           fetch-depth: 0

.github/workflows/release.yml

@@ -32,7 +32,7 @@ jobs:
             forge_platform: win32
     runs-on: ${{ matrix.os.image }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pnpm/action-setup@v4
       - name: Set up node & dependencies
         uses: actions/setup-node@v4
@@ -58,6 +58,7 @@ jobs:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           WINDOWS_SIGN_EXECUTABLE: ${{ vars.WINDOWS_SIGN_EXECUTABLE }}
+          GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
 
       - name: Upload the artifact
         uses: actions/upload-artifact@v4
@@ -78,7 +79,7 @@ jobs:
             runs-on: ubuntu-24.04-arm
     runs-on: ${{ matrix.runs-on }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Run the build
         uses: ./.github/actions/build-server
@@ -101,7 +102,7 @@ jobs:
     steps:
       - run: mkdir upload
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           sparse-checkout: |
             docs/Release Notes

.gitignore

@@ -10,6 +10,7 @@ node_modules
 
 # IDEs and editors
 /.idea
+.idea
 .project
 .classpath
 .c9/

.idea/.gitignore

@@ -1,6 +0,0 @@
-# Default ignored files
-/workspace.xml
-
-# Datasource local storage ignored files
-/dataSources.local.xml
-/dataSources/

.idea/codeStyles/Project.xml

@@ -1,15 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="OTHER_INDENT_OPTIONS">
-      <value>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </value>
-    </option>
-    <codeStyleSettings language="JSON">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="4" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/dataSources.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="document.db" uuid="2a4ac1e6-b828-4a2a-8e4a-3f59f10aff26">
-      <driver-ref>sqlite.xerial</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.sqlite.JDBC</jdbc-driver>
-      <jdbc-url>jdbc:sqlite:$PROJECT_DIR$/data/document.db</jdbc-url>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

.idea/git_toolbox_prj.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GitToolBoxProjectSettings">
-    <option name="commitMessageIssueKeyValidationOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-    <option name="commitMessageValidationEnabledOverride">
-      <BoolValueOverride>
-        <option name="enabled" value="true" />
-      </BoolValueOverride>
-    </option>
-  </component>
-</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

.idea/jsLinters/jslint.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JSLintConfiguration">
-    <option devel="true" />
-    <option es6="true" />
-    <option maxerr="50" />
-    <option node="true" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,8 +0,0 @@
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="openjdk-16" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/trilium.iml" filepath="$PROJECT_DIR$/trilium.iml" />
-    </modules>
-  </component>
-</project>

.idea/sqldialects.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="SqlDialectMappings">
-    <file url="file://$PROJECT_DIR$" dialect="SQLite" />
-    <file url="PROJECT" dialect="SQLite" />
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.vscode/i18n-ally-custom-framework.yml

@@ -3,6 +3,7 @@
 languageIds:
   - javascript
   - typescript
+  - typescriptreact
   - html
 
 # An array of RegExes to find the key usage. **The key should be captured in the first match group**.
@@ -25,6 +26,7 @@ scopeRangeRegex: "useTranslation\\(\\s*\\[?\\s*['\"`](.*?)['\"`]"
 # The "$1" will be replaced by the keypath specified.
 refactorTemplates:
   - t("$1")
+  - {t("$1")}
   - ${t("$1")}
   - <%= t("$1") %>
 

README.md

@@ -1,11 +1,11 @@
 # 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](./docs/README-ZH_CN.md) | [Russian](./docs/README.ru.md) | [Japanese](./docs/README.ja.md) | [Italian](./docs/README.it.md) | [Spanish](./docs/README.es.md)
+[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)
 
 Trilium Notes is a free and open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases.
 
@@ -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,14 +75,14 @@ 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
 
 ### Windows / MacOS
 
-Download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Notes/releases/latest), unzip the package and run the `trilium` executable.
+Download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Trilium/releases/latest), unzip the package and run the `trilium` executable.
 
 ### Linux
 
@@ -90,7 +90,7 @@ If your distribution is listed in the table below, use your distribution's packa
 
 [![Packaging status](https://repology.org/badge/vertical-allrepos/triliumnext.svg)](https://repology.org/project/triliumnext/versions)
 
-You may also download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Notes/releases/latest), unzip the package and run the `trilium` executable.
+You may also download the binary release for your platform from the [latest release page](https://github.com/TriliumNext/Trilium/releases/latest), unzip the package and run the `trilium` executable.
 
 TriliumNext is also provided as a Flatpak, but not yet published on FlatHub.
 
@@ -104,13 +104,15 @@ 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
 
-To install TriliumNext on your own server (including via Docker from [Dockerhub](https://hub.docker.com/r/triliumnext/notes)) follow [the server installation docs](https://triliumnext.github.io/Docs/Wiki/server-installation).
+To install TriliumNext on your own server (including via Docker from [Dockerhub](https://hub.docker.com/r/triliumnext/trilium)) follow [the server installation docs](https://triliumnext.github.io/Docs/Wiki/server-installation).
 
 
 ## 💻 Contribute
@@ -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).
 
 

_regroup/package.json

@@ -36,12 +36,12 @@
   },
   "devDependencies": {    
     "@playwright/test": "1.54.2",
-    "@stylistic/eslint-plugin": "5.2.2",        
+    "@stylistic/eslint-plugin": "5.2.3",        
     "@types/express": "5.0.3",    
-    "@types/node": "22.17.0",    
+    "@types/node": "22.17.2",    
     "@types/yargs": "17.0.33",
     "@vitest/coverage-v8": "3.2.4",
-    "eslint": "9.32.0",
+    "eslint": "9.33.0",
     "eslint-plugin-simple-import-sort": "12.1.1",
     "esm": "3.2.25",
     "jsdoc": "4.0.4",
@@ -49,8 +49,8 @@
     "rcedit": "4.0.1",
     "rimraf": "6.0.1",    
     "tslib": "2.8.1",    
-    "typedoc": "0.28.9",
-    "typedoc-plugin-missing-exports": "4.0.0"
+    "typedoc": "0.28.10",
+    "typedoc-plugin-missing-exports": "4.1.0"
   },
   "optionalDependencies": {
     "appdmg": "0.6.6"

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",
@@ -10,16 +10,16 @@
     "url": "https://github.com/TriliumNext/Notes"
   },
   "dependencies": {
-    "@eslint/js": "9.32.0",
+    "@eslint/js": "9.33.0",
     "@excalidraw/excalidraw": "0.18.0",
-    "@fullcalendar/core": "6.1.18",
-    "@fullcalendar/daygrid": "6.1.18",
-    "@fullcalendar/interaction": "6.1.18",
-    "@fullcalendar/list": "6.1.18",
-    "@fullcalendar/multimonth": "6.1.18",
-    "@fullcalendar/timegrid": "6.1.18",
+    "@fullcalendar/core": "6.1.19",
+    "@fullcalendar/daygrid": "6.1.19",
+    "@fullcalendar/interaction": "6.1.19",
+    "@fullcalendar/list": "6.1.19",
+    "@fullcalendar/multimonth": "6.1.19",
+    "@fullcalendar/timegrid": "6.1.19",
     "@maplibre/maplibre-gl-leaflet": "0.1.3",
-    "@mermaid-js/layout-elk": "0.1.8",
+    "@mermaid-js/layout-elk": "0.1.9",
     "@mind-elixir/node-menu": "5.0.0",
     "@popperjs/core": "2.11.8",
     "@triliumnext/ckeditor5": "workspace:*",
@@ -36,7 +36,7 @@
     "draggabilly": "3.0.0",
     "force-graph": "1.50.1",
     "globals": "16.3.0",
-    "i18next": "25.3.2",
+    "i18next": "25.3.6",
     "i18next-http-backend": "3.0.2",
     "jquery": "3.7.1",
     "jquery.fancytree": "2.38.5",
@@ -46,12 +46,13 @@
     "leaflet": "1.9.4",
     "leaflet-gpx": "2.2.0",
     "mark.js": "8.11.1",
-    "marked": "16.1.2",
-    "mermaid": "11.9.0",
-    "mind-elixir": "5.0.4",
+    "marked": "16.2.0",
+    "mermaid": "11.10.0",
+    "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",
     "tabulator-tables": "6.3.1",
@@ -65,8 +66,8 @@
     "@types/leaflet": "1.9.20",
     "@types/leaflet-gpx": "1.3.7",
     "@types/mark.js": "8.11.12",
-    "@types/tabulator-tables": "6.2.9",
-    "copy-webpack-plugin": "13.0.0",
+    "@types/tabulator-tables": "6.2.10",
+    "copy-webpack-plugin": "13.0.1",
     "happy-dom": "18.0.1",
     "script-loader": "0.7.2",
     "vite-plugin-static-copy": "3.1.1"

apps/client/src/components/app_context.ts

@@ -30,6 +30,7 @@ import type CodeMirror from "@triliumnext/codemirror";
 import { StartupChecks } from "./startup_checks.js";
 import type { CreateNoteOpts } from "../services/note_create.js";
 import { ColumnComponent } from "tabulator-tables";
+import { ChooseNoteTypeCallback } from "../widgets/dialogs/note_type_chooser.jsx";
 
 interface Layout {
     getRootWidget: (appContext: AppContext) => RootWidget;
@@ -92,7 +93,9 @@ export type CommandMappings = {
     closeTocCommand: CommandData;
     closeHlt: CommandData;
     showLaunchBarSubtree: CommandData;
-    showRevisions: CommandData;
+    showRevisions: CommandData & {
+        noteId?: string | null;
+    };
     showLlmChat: CommandData;
     createAiChat: CommandData;
     showOptions: CommandData & {
@@ -368,6 +371,9 @@ export type CommandMappings = {
     };
     refreshTouchBar: CommandData;
     reloadTextEditor: CommandData;
+    chooseNoteType: CommandData & {
+        callback: ChooseNoteTypeCallback
+    }
 };
 
 type EventMappings = {

apps/client/src/layouts/layout_commons.ts

@@ -30,6 +30,7 @@ import ClassicEditorToolbar from "../widgets/ribbon_widgets/classic_editor_toolb
 import PromotedAttributesWidget from "../widgets/ribbon_widgets/promoted_attributes.js";
 import NoteDetailWidget from "../widgets/note_detail.js";
 import NoteListWidget from "../widgets/note_list.js";
+import { CallToActionDialog } from "../widgets/dialogs/call_to_action.jsx";
 
 export function applyModals(rootContainer: RootContainer) {
     rootContainer
@@ -66,4 +67,5 @@ export function applyModals(rootContainer: RootContainer) {
                 .child(new PromotedAttributesWidget())
                 .child(new NoteDetailWidget())
                 .child(new NoteListWidget(true)))
+        .child(new CallToActionDialog());
 }

apps/client/src/layouts/mobile_layout.ts

@@ -26,6 +26,7 @@ import TabRowWidget from "../widgets/tab_row.js";
 import RefreshButton from "../widgets/floating_buttons/refresh_button.js";
 import MobileEditorToolbar from "../widgets/ribbon_widgets/mobile_editor_toolbar.js";
 import { applyModals } from "./layout_commons.js";
+import CloseZenButton from "../widgets/close_zen_button.js";
 
 const MOBILE_CSS = `
 <style>
@@ -174,7 +175,8 @@ export default class MobileLayout {
                     .id("mobile-bottom-bar")
                     .child(new TabRowWidget().css("height", "40px"))
                     .child(new FlexContainer("row").class("horizontal").css("height", "53px").child(new LauncherContainer(true)).child(new GlobalMenuWidget(true)).id("launcher-pane"))
-            );
+            )
+            .child(new CloseZenButton());
         applyModals(rootContainer);
         return rootContainer;
     }

apps/client/src/services/froca_updater.ts

@@ -35,8 +35,10 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
                 loadResults.addOption(attributeEntity.name);
             } else if (ec.entityName === "attachments") {
                 processAttachment(loadResults, ec);
-            } else if (ec.entityName === "blobs" || ec.entityName === "etapi_tokens") {
+            } else if (ec.entityName === "blobs") {
                 // NOOP - these entities are handled at the backend level and don't require frontend processing
+            } else if (ec.entityName === "etapi_tokens") {
+                loadResults.hasEtapiTokenChanges = true;
             } else {
                 throw new Error(`Unknown entityName '${ec.entityName}'`);
             }
@@ -77,9 +79,7 @@ async function processEntityChanges(entityChanges: EntityChange[]) {
             noteAttributeCache.invalidate();
         }
 
-        // TODO: Remove after porting the file
-        // @ts-ignore
-        const appContext = (await import("../components/app_context.js")).default as any;
+        const appContext = (await import("../components/app_context.js")).default;
         await appContext.triggerEvent("entitiesReloaded", { loadResults });
     }
 }

apps/client/src/services/i18n.ts

@@ -3,6 +3,7 @@ import i18next from "i18next";
 import i18nextHttpBackend from "i18next-http-backend";
 import server from "./server.js";
 import type { Locale } from "@triliumnext/commons";
+import { initReactI18next } from "react-i18next";
 
 let locales: Locale[] | null;
 
@@ -16,6 +17,7 @@ export async function initLocale() {
 
     locales = await server.get<Locale[]>("options/locales");
 
+    i18next.use(initReactI18next);
     await i18next.use(i18nextHttpBackend).init({
         lng: locale,
         fallbackLng: "en",

apps/client/src/services/load_results.ts

@@ -1,4 +1,4 @@
-import type { AttachmentRow } from "@triliumnext/commons";
+import type { AttachmentRow, EtapiTokenRow } from "@triliumnext/commons";
 import type { AttributeType } from "../entities/fattribute.js";
 import type { EntityChange } from "../server_types.js";
 
@@ -53,6 +53,7 @@ type EntityRowMappings = {
     options: OptionRow;
     revisions: RevisionRow;
     note_reordering: NoteReorderingRow;
+    etapi_tokens: EtapiTokenRow;
 };
 
 export type EntityRowNames = keyof EntityRowMappings;
@@ -68,6 +69,7 @@ export default class LoadResults {
     private contentNoteIdToComponentId: ContentNoteIdToComponentIdRow[];
     private optionNames: string[];
     private attachmentRows: AttachmentRow[];
+    public hasEtapiTokenChanges: boolean = false;
 
     constructor(entityChanges: EntityChange[]) {
         const entities: Record<string, Record<string, any>> = {};
@@ -215,7 +217,8 @@ export default class LoadResults {
             this.revisionRows.length === 0 &&
             this.contentNoteIdToComponentId.length === 0 &&
             this.optionNames.length === 0 &&
-            this.attachmentRows.length === 0
+            this.attachmentRows.length === 0 &&
+            !this.hasEtapiTokenChanges
         );
     }
 

apps/client/src/services/note_autocomplete.ts

@@ -38,8 +38,8 @@ export interface Suggestion {
     commandShortcut?: string;
 }
 
-interface Options {
-    container?: HTMLElement;
+export interface Options {
+    container?: HTMLElement | null;
     fastSearch?: boolean;
     allowCreatingNotes?: boolean;
     allowJumpToSearchNotes?: boolean;
@@ -452,6 +452,21 @@ function init() {
     };
 }
 
+/**
+ * Convenience function which triggers the display of recent notes in the autocomplete input and focuses it.
+ *
+ * @param inputElement - The input element to trigger recent notes on.
+ */
+export function triggerRecentNotes(inputElement: HTMLInputElement | null | undefined) {
+    if (!inputElement) {
+        return;
+    }
+
+    const $el = $(inputElement);
+    showRecentNotes($el);
+    $el.trigger("focus").trigger("select");
+}
+
 export default {
     autocompleteSourceForCKEditor,
     initNoteAutocomplete,

apps/client/src/services/note_create.ts

@@ -109,8 +109,6 @@ async function createNote(parentNotePath: string | undefined, options: CreateNot
 
 async function chooseNoteType() {
     return new Promise<ChooseNoteTypeResponse>((res) => {
-        // TODO: Remove ignore after callback for chooseNoteType is defined in app_context.ts
-        //@ts-ignore
         appContext.triggerCommand("chooseNoteType", { callback: res });
     });
 }

apps/client/src/services/options.ts

@@ -1,7 +1,8 @@
+import { OptionNames } from "@triliumnext/commons";
 import server from "./server.js";
 import { isShare } from "./utils.js";
 
-type OptionValue = number | string;
+export type OptionValue = number | string;
 
 class Options {
     initializedPromise: Promise<void>;
@@ -76,6 +77,14 @@ class Options {
         await server.put(`options`, payload);
     }
 
+    /**
+     * Saves multiple options at once, by supplying a record where the keys are the option names and the values represent the stringified value to set.
+     * @param newValues the record of keys and values.
+     */
+    async saveMany<T extends OptionNames>(newValues: Record<T, OptionValue>) {
+        await server.put<void>("options", newValues);
+    }
+
     async toggle(key: string) {
         await this.save(key, (!this.is(key)).toString());
     }

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

apps/client/src/services/utils.ts

@@ -5,7 +5,7 @@ const SVG_MIME = "image/svg+xml";
 
 export const isShare = !window.glob;
 
-function reloadFrontendApp(reason?: string) {
+export function reloadFrontendApp(reason?: string) {
     if (reason) {
         logInfo(`Frontend app reload: ${reason}`);
     }
@@ -13,7 +13,7 @@ function reloadFrontendApp(reason?: string) {
     window.location.reload();
 }
 
-function restartDesktopApp() {
+export function restartDesktopApp() {
     if (!isElectron()) {
         reloadFrontendApp();
         return;
@@ -125,7 +125,7 @@ function formatDateISO(date: Date) {
     return `${date.getFullYear()}-${padNum(date.getMonth() + 1)}-${padNum(date.getDate())}`;
 }
 
-function formatDateTime(date: Date, userSuppliedFormat?: string): string {
+export function formatDateTime(date: Date, userSuppliedFormat?: string): string {
     if (userSuppliedFormat?.trim()) {
         return dayjs(date).format(userSuppliedFormat);
     } else {
@@ -144,7 +144,7 @@ function now() {
 /**
  * Returns `true` if the client is currently running under Electron, or `false` if running in a web browser.
  */
-function isElectron() {
+export function isElectron() {
     return !!(window && window.process && window.process.type);
 }
 
@@ -218,7 +218,7 @@ function randomString(len: number) {
     return text;
 }
 
-function isMobile() {
+export function isMobile() {
     return (
         window.glob?.device === "mobile" ||
         // window.glob.device is not available in setup
@@ -306,7 +306,7 @@ function copySelectionToClipboard() {
     }
 }
 
-function dynamicRequire(moduleName: string) {
+export function dynamicRequire(moduleName: string) {
     if (typeof __non_webpack_require__ !== "undefined") {
         return __non_webpack_require__(moduleName);
     } else {
@@ -374,6 +374,17 @@ async function openInAppHelp($button: JQuery<HTMLElement>) {
 
     const inAppHelpPage = $button.attr("data-in-app-help");
     if (inAppHelpPage) {
+        openInAppHelpFromUrl(inAppHelpPage);
+    }
+}
+
+/**
+ * Opens the in-app help at the given page in a split note. If there already is a split note open with a help page, it will be replaced by this one.
+ *
+ * @param inAppHelpPage the ID of the help note (excluding the `_help_` prefix).
+ * @returns a promise that resolves once the help has been opened.
+ */
+export async function openInAppHelpFromUrl(inAppHelpPage: string) {
     // Dynamic import to avoid import issues in tests.
     const appContext = (await import("../components/app_context.js")).default;
     const activeContext = appContext.tabManager.getActiveContext();
@@ -399,8 +410,6 @@ async function openInAppHelp($button: JQuery<HTMLElement>) {
         // There is already a help window open, make sure it opens on the right note.
         helpSubcontext.setNote(targetNote, { viewScope });
     }
-        return;
-    }
 }
 
 function initHelpButtons($el: JQuery<HTMLElement> | JQuery<Window>) {
@@ -735,6 +744,50 @@ function isLaunchBarConfig(noteId: string) {
     return ["_lbRoot", "_lbAvailableLaunchers", "_lbVisibleLaunchers", "_lbMobileRoot", "_lbMobileAvailableLaunchers", "_lbMobileVisibleLaunchers"].includes(noteId);
 }
 
+/**
+ * Adds a class to the <body> of the page, where the class name is formed via a prefix and a value.
+ * Useful for configurable options such as `heading-style-markdown`, where `heading-style` is the prefix and `markdown` is the dynamic value.
+ * There is no separator between the prefix and the value, if needed it has to be supplied manually to the prefix.
+ *
+ * @param prefix the prefix.
+ * @param value the value to be appended to the prefix.
+ */
+export function toggleBodyClass(prefix: string, value: string) {
+    const $body = $("body");
+    for (const clazz of Array.from($body[0].classList)) {
+        // create copy to safely iterate over while removing classes
+        if (clazz.startsWith(prefix)) {
+            $body.removeClass(clazz);
+        }
+    }
+
+    $body.addClass(prefix + value);
+}
+
+/**
+ * Basic comparison for equality between the two arrays. The values are strictly checked via `===`.
+ *
+ * @param a the first array to compare.
+ * @param b the second array to compare.
+ * @returns `true` if both arrays are equals, `false` otherwise.
+ */
+export function arrayEqual<T>(a: T[], b: T[]) {
+    if (a === b) {
+        return true;
+    }
+    if (a.length !== b.length) {
+        return false;
+    }
+
+    for (let i=0; i < a.length; i++) {
+        if (a[i] !== b[i]) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
 export default {
     reloadFrontendApp,
     restartDesktopApp,

apps/client/src/stylesheets/print.css

@@ -320,8 +320,3 @@ h6 {
     page-break-after: avoid;
     break-after: avoid;
 }
-
-figure.table {
-    /* Workaround for https://github.com/ckeditor/ckeditor5/issues/18903. Remove once official fix is released */
-    display: table !important;
-}

apps/client/src/stylesheets/style.css

@@ -139,6 +139,15 @@ textarea,
     color: var(--muted-text-color);
 }
 
+.form-group.disabled {
+    opacity: 0.5;
+    pointer-events: none;
+}
+
+.form-group {
+    margin-bottom: 15px;
+}
+
 /* Add a gap between consecutive radios / check boxes */
 label.tn-radio + label.tn-radio,
 label.tn-checkbox + label.tn-checkbox {
@@ -642,6 +651,10 @@ table.promoted-attributes-in-tooltip th {
     z-index: calc(var(--ck-z-panel) - 1) !important;
 }
 
+.tooltip.tooltip-top {
+    z-index: 32767 !important;
+}
+
 .tooltip-trigger {
     background: transparent;
     pointer-events: none;
@@ -1734,16 +1747,12 @@ button.close:hover {
     margin-bottom: 10px;
 }
 
-.options-number-input {
+.options-section input[type="number"] {
     /* overriding settings from .form-control */
     width: 10em !important;
     flex-grow: 0 !important;
 }
 
-.options-mime-types {
-    column-width: 250px;
-}
-
 textarea {
     cursor: auto;
 }
@@ -1886,6 +1895,7 @@ body.zen #launcher-container,
 body.zen #launcher-pane,
 body.zen #left-pane,
 body.zen #right-pane,
+body.zen #mobile-sidebar-wrapper,
 body.zen .tab-row-container,
 body.zen .tab-row-widget,
 body.zen .ribbon-container:not(:has(.classic-toolbar-widget.visible)),
@@ -1893,7 +1903,8 @@ body.zen .ribbon-container:has(.classic-toolbar-widget.visible) .ribbon-top-row,
 body.zen .ribbon-container .ribbon-body:not(:has(.classic-toolbar-widget.visible)),
 body.zen .note-icon-widget,
 body.zen .title-row .button-widget,
-body.zen .floating-buttons-children > *:not(.bx-edit-alt) {
+body.zen .floating-buttons-children > *:not(.bx-edit-alt),
+body.zen .action-button {
     display: none !important;
 }
 
@@ -1935,6 +1946,10 @@ body.zen .note-title-widget input {
     background: transparent !important;
 }
 
+body.zen #detail-container {
+    width: 100%;
+}
+
 /* Content renderer */
 
 footer.file-footer,
@@ -2245,6 +2260,13 @@ footer.webview-footer button {
     padding: 1px 10px 1px 10px;
 }
 
+/* Search result highlighting */
+.search-result-title b,
+.search-result-content b {
+    font-weight: 900;
+    color: var(--admonition-warning-accent-color);
+}
+
 /* Customized icons */
 
 .bx-tn-toc::before {

apps/client/src/stylesheets/theme-next/dialogs.css

@@ -233,16 +233,16 @@ div.tn-tool-dialog {
 
 /* Item title link */
 
-.recent-changes-content ul li .note-title a {
+.recent-changes-content ul li a {
     color: currentColor;
 }
 
-.recent-changes-content ul li .note-title a:hover {
+.recent-changes-content ul li a:hover {
     text-decoration: underline;
 }
 
 /* Item title for deleted notes */
-.recent-changes-content ul li.deleted-note .note-title > .note-title {
+.recent-changes-content ul li.deleted-note .note-title {
     text-decoration: line-through;
 }
 

apps/client/src/stylesheets/theme-next/pages.css

@@ -182,8 +182,6 @@ div.note-detail-empty {
 
 .options-section:not(.tn-no-card) {
     margin: auto;    
-    min-width: var(--options-card-min-width);
-    max-width: var(--options-card-max-width);
     border-radius: 12px;
     border: 1px solid var(--card-border-color) !important;
     box-shadow: var(--card-box-shadow);
@@ -192,6 +190,11 @@ div.note-detail-empty {
     margin-bottom: calc(var(--options-title-offset) + 26px) !important;
 }
 
+body.desktop .option-section:not(.tn-no-card) {
+    min-width: var(--options-card-min-width);
+    max-width: var(--options-card-max-width);
+}
+
 .note-detail-content-widget-content.options {
     --default-padding: 15px;
     padding-top: calc(var(--default-padding) + var(--options-title-offset) + var(--options-title-font-size));
@@ -233,11 +236,6 @@ div.note-detail-empty {
     margin-bottom: 0;
 }
 
-.options-section .options-mime-types {
-    padding: 0;
-    margin: 0;
-}
-
 .options-section .form-group {
     margin-bottom: 1em;
 }

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

@@ -1,31 +1,23 @@
 {
     "about": {
         "title": "Sobre Trilium Notes",
-        "close": "Tanca",
         "homepage": "Pàgina principal:"
     },
     "add_link": {
-        "note": "Nota",
-        "close": "Tanca"
+        "note": "Nota"
     },
     "branch_prefix": {
-        "close": "Tanca",
         "prefix": "Prefix: ",
         "save": "Desa"
     },
     "bulk_actions": {
-        "close": "Tanca",
         "labels": "Etiquetes",
         "relations": "Relacions",
         "notes": "Notes",
         "other": "Altres"
     },
-    "clone_to": {
-        "close": "Tanca"
-    },
     "confirm": {
         "confirmation": "Confirmació",
-        "close": "Tanca",
         "cancel": "Cancel·la",
         "ok": "OK"
     },
@@ -39,53 +31,34 @@
         "export": "Exporta"
     },
     "help": {
-        "close": "Tanca",
         "troubleshooting": "Solució de problemes",
         "other": "Altres"
     },
     "import": {
-        "close": "Tanca",
         "options": "Opcions",
         "import": "Importa"
     },
     "include_note": {
-        "close": "Tanca",
         "label_note": "Nota"
     },
     "info": {
         "closeButton": "Tanca",
         "okButton": "OK"
     },
-    "jump_to_note": {
-        "close": "Tanca"
-    },
-    "markdown_import": {
-        "close": "Tanca"
-    },
-    "move_to": {
-        "close": "Tanca"
-    },
     "note_type_chooser": {
-        "close": "Tanca",
         "templates": "Plantilles:"
     },
-    "password_not_set": {
-        "close": "Tanca"
-    },
     "prompt": {
         "title": "Sol·licitud",
-        "close": "Tanca",
         "defaultTitle": "Sol·licitud"
     },
     "protected_session_password": {
         "close_label": "Tanca"
     },
     "recent_changes": {
-        "close": "Tanca",
         "undelete_link": "recuperar"
     },
     "revisions": {
-        "close": "Tanca",
         "restore_button": "Restaura",
         "delete_button": "Suprimeix",
         "download_button": "Descarrega",
@@ -93,14 +66,12 @@
         "preview": "Vista prèvia:"
     },
     "sort_child_notes": {
-        "close": "Tanca",
         "title": "títol",
         "ascending": "ascendent",
         "descending": "descendent",
         "folders": "Carpetes"
     },
     "upload_attachments": {
-        "close": "Tanca",
         "options": "Opcions",
         "upload": "Puja"
     },

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

@@ -1,7 +1,6 @@
 {
   "about": {
     "title": "关于 Trilium Notes",
-        "close": "关闭",
     "homepage": "项目主页：",
     "app_version": "应用版本：",
     "db_version": "数据库版本：",
@@ -28,25 +27,22 @@
   "add_link": {
     "add_link": "添加链接",
     "help_on_links": "链接帮助",
-        "close": "关闭",
     "note": "笔记",
     "search_note": "按名称搜索笔记",
     "link_title_mirrors": "链接标题跟随笔记标题变化",
     "link_title_arbitrary": "链接标题可随意修改",
     "link_title": "链接标题",
-        "button_add_link": "添加链接 <kbd>回车</kbd>"
+    "button_add_link": "添加链接"
   },
   "branch_prefix": {
     "edit_branch_prefix": "编辑分支前缀",
     "help_on_tree_prefix": "有关树前缀的帮助",
-        "close": "关闭",
     "prefix": "前缀： ",
     "save": "保存",
     "branch_prefix_saved": "分支前缀已保存。"
   },
   "bulk_actions": {
     "bulk_actions": "批量操作",
-        "close": "关闭",
     "affected_notes": "受影响的笔记",
     "include_descendants": "包括所选笔记的子笔记",
     "available_actions": "可用操作",
@@ -61,20 +57,18 @@
   },
   "clone_to": {
     "clone_notes_to": "克隆笔记到...",
-        "close": "关闭",
     "help_on_links": "链接帮助",
     "notes_to_clone": "要克隆的笔记",
     "target_parent_note": "目标父笔记",
     "search_for_note_by_its_name": "按名称搜索笔记",
     "cloned_note_prefix_title": "克隆的笔记将在笔记树中显示给定的前缀",
     "prefix_optional": "前缀（可选）",
-        "clone_to_selected_note": "克隆到选定的笔记 <kbd>回车</kbd>",
+    "clone_to_selected_note": "克隆到选定的笔记",
     "no_path_to_clone_to": "没有克隆路径。",
     "note_cloned": "笔记 \"{{clonedTitle}}\" 已克隆到 \"{{targetTitle}}\""
   },
   "confirm": {
     "confirmation": "确认",
-        "close": "关闭",
     "cancel": "取消",
     "ok": "确定",
     "are_you_sure_remove_note": "确定要从关系图中移除笔记 \"{{title}}\" ？ ",
@@ -87,9 +81,9 @@
     "delete_all_clones_description": "同时删除所有克隆（可以在最近修改中撤消）",
     "erase_notes_description": "通常（软）删除仅标记笔记为已删除，可以在一段时间内通过最近修改对话框撤消。选中此选项将立即擦除笔记，不可撤销。",
     "erase_notes_warning": "永久擦除笔记（无法撤销），包括所有克隆。这将强制应用程序重载。",
-        "notes_to_be_deleted": "将删除以下笔记 ({{- noteCount}})",
+    "notes_to_be_deleted": "将删除以下笔记 ({{notesCount}})",
     "no_note_to_delete": "没有笔记将被删除（仅克隆）。",
-        "broken_relations_to_be_deleted": "将删除以下关系并断开连接 ({{- relationCount}})",
+    "broken_relations_to_be_deleted": "将删除以下关系并断开连接 ({{ relationCount}})",
     "cancel": "取消",
     "ok": "确定",
     "deleted_relation_text": "笔记 {{- note}} (将被删除的笔记) 被以下关系 {{- relation}} 引用, 来自 {{- source}}。"
@@ -113,20 +107,17 @@
     "format_pdf": "PDF - 用于打印或共享目的。"
   },
   "help": {
-        "fullDocumentation": "帮助（完整<a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">在线文档</a>)",
-        "close": "关闭",
     "noteNavigation": "笔记导航",
-        "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> - 在笔记列表中向上/向下移动",
-        "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - 折叠/展开节点",
+    "goUpDown": "在笔记列表中向上/向下移动",
+    "collapseExpand": "折叠/展开节点",
     "notSet": "未设置",
     "goBackForwards": "在历史记录中前后移动",
     "showJumpToNoteDialog": "显示<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"跳转到\" 对话框</a>",
     "scrollToActiveNote": "滚动到活跃笔记",
-        "jumpToParentNote": "<kbd>Backspace</kbd> - 跳转到父笔记",
+    "jumpToParentNote": "跳转到父笔记",
     "collapseWholeTree": "折叠整个笔记树",
     "collapseSubTree": "折叠子树",
     "tabShortcuts": "标签页快捷键",
-        "newTabNoteLink": "<kbd>CTRL+click</kbd> - 在笔记链接上使用CTRL+点击（或中键点击）在新标签页中打开笔记",
     "onlyInDesktop": "仅在桌面版（电子构建）中",
     "openEmptyTab": "打开空白标签页",
     "closeActiveTab": "关闭活跃标签页",
@@ -141,14 +132,14 @@
     "moveNoteUpHierarchy": "在层级结构中向上移动笔记",
     "multiSelectNote": "多选上/下笔记",
     "selectAllNotes": "选择当前级别的所有笔记",
-        "selectNote": "<kbd>Shift+click</kbd> - 选择笔记",
+    "selectNote": "选择笔记",
     "copyNotes": "将活跃笔记（或当前选择）复制到剪贴板（用于<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">克隆</a>）",
     "cutNotes": "将当前笔记（或当前选择）剪切到剪贴板（用于移动笔记）",
     "pasteNotes": "将笔记粘贴为活跃笔记的子笔记（根据是复制还是剪切到剪贴板来决定是移动还是克隆）",
     "deleteNotes": "删除笔记/子树",
     "editingNotes": "编辑笔记",
     "editNoteTitle": "在树形笔记树中，焦点会从笔记树切换到笔记标题。按下 Enter 键会将焦点从笔记标题切换到文本编辑器。按下 <kbd>Ctrl+.</kbd> 会将焦点从编辑器切换回笔记树。",
-        "createEditLink": "<kbd>Ctrl+K</kbd> - 创建/编辑外部链接",
+    "createEditLink": "创建/编辑外部链接",
     "createInternalLink": "创建内部链接",
     "followLink": "跟随光标下的链接",
     "insertDateTime": "在插入点插入当前日期和时间",
@@ -165,11 +156,12 @@
     "other": "其他",
     "quickSearch": "定位到快速搜索框",
     "inPageSearch": "页面内搜索",
-        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+click</kbd> - (或 <kbd>Shift+middle mouse click</kbd>) 在笔记链接打开并激活笔记在一个新的选项卡"
+    "newTabWithActivationNoteLink": "在新标签页打开笔记链接并激活该标签页",
+    "title": "资料表",
+    "newTabNoteLink": "在新标签页开启链接"
   },
   "import": {
     "importIntoNote": "导入到笔记",
-        "close": "关闭",
     "chooseImportFile": "选择导入文件",
     "importDescription": "所选文件的内容将作为子笔记导入到",
     "options": "选项",
@@ -196,14 +188,13 @@
   },
   "include_note": {
     "dialog_title": "包含笔记",
-        "close": "关闭",
     "label_note": "笔记",
     "placeholder_search": "按名称搜索笔记",
     "box_size_prompt": "包含笔记的框大小：",
     "box_size_small": "小型 (显示大约10行)",
     "box_size_medium": "中型 (显示大约30行)",
     "box_size_full": "完整显示（完整文本框）",
-        "button_include": "包含笔记 <kbd>回车</kbd>"
+    "button_include": "包含笔记"
   },
   "info": {
     "modalTitle": "信息消息",
@@ -211,45 +202,41 @@
     "okButton": "确定"
   },
   "jump_to_note": {
-        "close": "关闭",
-        "search_button": "全文搜索 <kbd>Ctrl+回车</kbd>",
+    "search_button": "全文搜索",
     "search_placeholder": "按名称或类型搜索笔记 > 查看命令..."
   },
   "markdown_import": {
     "dialog_title": "Markdown 导入",
-        "close": "关闭",
     "modal_body_text": "由于浏览器沙箱的限制，无法直接从 JavaScript 读取剪贴板内容。请将要导入的 Markdown 文本粘贴到下面的文本框中，然后点击导入按钮",
-        "import_button": "导入 Ctrl+回车",
+    "import_button": "导入",
     "import_success": "Markdown 内容已成功导入文档。"
   },
   "move_to": {
     "dialog_title": "移动笔记到...",
-        "close": "关闭",
     "notes_to_move": "需要移动的笔记",
     "target_parent_note": "目标父笔记",
     "search_placeholder": "通过名称搜索笔记",
-        "move_button": "移动到选定的笔记 <kbd>回车</kbd>",
+    "move_button": "移动到选定的笔记",
     "error_no_path": "没有可以移动到的路径。",
     "move_success_message": "所选笔记已移动到 "
   },
   "note_type_chooser": {
     "modal_title": "选择笔记类型",
-        "close": "关闭",
     "modal_body": "选择新笔记的类型或模板：",
-        "templates": "模板:",
+    "templates": "模板",
     "change_path_prompt": "更改创建新笔记的位置：",
-        "search_placeholder": "按名称搜索路径（默认为空）"
+    "search_placeholder": "按名称搜索路径（默认为空）",
+    "builtin_templates": "内置模板"
   },
   "password_not_set": {
     "title": "密码未设置",
-        "close": "关闭",
     "body1": "受保护的笔记使用用户密码加密，但密码尚未设置。",
-        "body2": "点击<a class=\"open-password-options-button\" href=\"javascript:\">这里</a>打开选项对话框并设置您的密码。"
+    "body2": "若要保护笔记，请按一下下方按钮开启「选项」对话框并设置密码。",
+    "go_to_password_options": "移动至密码选项"
   },
   "prompt": {
     "title": "提示",
-        "close": "关闭",
-        "ok": "确定 <kbd>回车</kbd>",
+    "ok": "确定",
     "defaultTitle": "提示"
   },
   "protected_session_password": {
@@ -257,12 +244,11 @@
     "help_title": "关于保护笔记的帮助",
     "close_label": "关闭",
     "form_label": "输入密码进入保护会话以继续：",
-        "start_button": "开始保护会话 <kbd>回车</kbd>"
+    "start_button": "开始保护会话"
   },
   "recent_changes": {
     "title": "最近修改",
     "erase_notes_button": "立即清理已删除的笔记",
-        "close": "关闭",
     "deleted_notes_message": "已删除的笔记已清理。",
     "no_changes_message": "暂无修改...",
     "undelete_link": "恢复删除",
@@ -273,7 +259,6 @@
     "delete_all_revisions": "删除此笔记的所有修订版本",
     "delete_all_button": "删除所有修订版本",
     "help_title": "关于笔记修订版本的帮助",
-        "close": "关闭",
     "revision_last_edited": "此修订版本上次编辑于 {{date}}",
     "confirm_delete_all": "您是否要删除此笔记的所有修订版本？",
     "no_revisions": "此笔记暂无修订版本...",
@@ -295,7 +280,6 @@
   },
   "sort_child_notes": {
     "sort_children_by": "按...排序子笔记",
-        "close": "关闭",
     "sorting_criteria": "排序条件",
     "title": "标题",
     "date_created": "创建日期",
@@ -309,13 +293,12 @@
     "sort_with_respect_to_different_character_sorting": "根据不同语言或地区的字符排序和排序规则排序。",
     "natural_sort_language": "自然排序语言",
     "the_language_code_for_natural_sort": "自然排序的语言代码，例如中文的 \"zh-CN\"。",
-        "sort": "排序 <kbd>Enter</kbd>"
+    "sort": "排序"
   },
   "upload_attachments": {
     "upload_attachments_to_note": "上传附件到笔记",
-        "close": "关闭",
     "choose_files": "选择文件",
-        "files_will_be_uploaded": "文件将作为附件上传到",
+    "files_will_be_uploaded": "文件将作为附件上传到 {{noteTitle}}",
     "options": "选项",
     "shrink_images": "缩小图片",
     "upload": "上传",
@@ -441,7 +424,7 @@
     "share_favicon": "在分享页面中设置的 favicon 笔记。一般需要将它设置为分享和可继承。Favicon 笔记也必须位于分享子树中。可以考虑一并使用 'share_hidden_from_tree'。",
     "is_owned_by_note": "由此笔记所有",
     "other_notes_with_name": "其它含有 {{attributeType}} 名为 \"{{attributeName}}\" 的的笔记",
-        "and_more": "... 以及另外 {{count}} 个",
+    "and_more": "... 以及另外 {{count}} 个。",
     "print_landscape": "导出为 PDF 时，将页面方向更改为横向而不是纵向。",
     "print_page_size": "导出为 PDF 时，更改页面大小。支持的值：<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": "颜色"
@@ -449,7 +432,7 @@
   "attribute_editor": {
     "help_text_body1": "要添加标签，只需输入例如 <code>#rock</code> 或者如果您还想添加值，则例如 <code>#year = 2020</code>",
     "help_text_body2": "对于关系，请输入 <code>~author = @</code>，这将显示一个自动完成列表，您可以查找所需的笔记。",
-        "help_text_body3": "您也可以使用右侧的 <code>+</code> 按钮添加标签和关系。</p>",
+    "help_text_body3": "您也可以使用右侧的 <code>+</code> 按钮添加标签和关系。",
     "save_attributes": "保存属性 <enter>",
     "add_a_new_attribute": "添加新属性",
     "add_new_label": "添加新标签 <kbd data-command=\"addNewLabel\"></kbd>",
@@ -965,7 +948,7 @@
     "no_attachments": "此笔记没有附件。"
   },
   "book": {
-        "no_children_help": "此类型为书籍的笔记没有任何子笔记，因此没有内容显示。请参阅 <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> 了解详情"
+    "no_children_help": "此类型为书籍的笔记没有任何子笔记，因此没有内容显示。请参阅 <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> 了解详情。"
   },
   "editable_code": {
     "placeholder": "在这里输入您的代码笔记内容..."
@@ -984,7 +967,7 @@
   },
   "protected_session": {
     "enter_password_instruction": "显示受保护的笔记需要输入您的密码：",
-        "start_session_button": "开始受保护的会话",
+    "start_session_button": "开始受保护的会话 <kbd>Enter</kbd>",
     "started": "受保护的会话已启动。",
     "wrong_password": "密码错误。",
     "protecting-finished-successfully": "保护操作已成功完成。",
@@ -1045,7 +1028,7 @@
     "error_creating_anonymized_database": "无法创建匿名化数据库，请检查后端日志以获取详细信息",
     "successfully_created_fully_anonymized_database": "成功创建完全匿名化的数据库，路径为 {{anonymizedFilePath}}",
     "successfully_created_lightly_anonymized_database": "成功创建轻度匿名化的数据库，路径为 {{anonymizedFilePath}}",
-        "no_anonymized_database_yet": "尚无匿名化数据库"
+    "no_anonymized_database_yet": "尚无匿名化数据库。"
   },
   "database_integrity_check": {
     "title": "数据库完整性检查",
@@ -1118,17 +1101,17 @@
     "title": "主题",
     "theme_label": "主题",
     "override_theme_fonts_label": "覆盖主题字体",
-        "auto_theme": "自动",
-        "light_theme": "浅色",
-        "dark_theme": "深色",
-        "triliumnext": "TriliumNext Beta（跟随系统颜色方案）",
-        "triliumnext-light": "TriliumNext Beta（浅色）",
-        "triliumnext-dark": "TriliumNext Beta（深色）",
+    "triliumnext": "Trilium（跟随系统颜色方案）",
+    "triliumnext-light": "Trilium（浅色）",
+    "triliumnext-dark": "Trilium（深色）",
     "layout": "布局",
     "layout-vertical-title": "垂直",
     "layout-horizontal-title": "水平",
     "layout-vertical-description": "启动栏位于左侧（默认）",
-        "layout-horizontal-description": "启动栏位于标签页栏下方，标签页栏现在是全宽的。"
+    "layout-horizontal-description": "启动栏位于标签页栏下方，标签页栏现在是全宽的。",
+    "auto_theme": "传统（跟随系统配色方案）",
+    "light_theme": "传统（浅色）",
+    "dark_theme": "传统（深色）"
   },
   "zoom_factor": {
     "title": "缩放系数（仅桌面客户端有效）",
@@ -1182,7 +1165,7 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "笔记修订快照间隔",
-        "note_revisions_snapshot_description": "笔记修订快照间隔是创建新笔记修订的时间。有关更多信息，请参见 <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a>。",
+    "note_revisions_snapshot_description": "笔记修订快照间隔是创建新笔记修订的时间。有关更多信息，请参见 <doc>wiki</doc>。",
     "snapshot_time_interval_label": "笔记修订快照时间间隔："
   },
   "revisions_snapshot_limit": {
@@ -1350,7 +1333,7 @@
     "oauth_title": "OAuth/OpenID 认证",
     "oauth_description": "OpenID 是一种标准化方式，允许您使用其他服务（如 Google）的账号登录网站来验证您的身份。默认的身份提供者是 Google，但您可以更改为任何其他 OpenID 提供者。点击<a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">这里</a>了解更多信息。请参阅这些 <a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">指南</a> 通过 Google 设置 OpenID 服务。",
     "oauth_description_warning": "要启用 OAuth/OpenID，您需要设置 config.ini 文件中的 OAuth/OpenID 基础 URL、客户端 ID 和客户端密钥，并重新启动应用程序。如果要从环境变量设置，请设置 TRILIUM_OAUTH_BASE_URL、TRILIUM_OAUTH_CLIENT_ID 和 TRILIUM_OAUTH_CLIENT_SECRET 环境变量。",
-        "oauth_missing_vars": "缺少以下设置项: {{missingVars}}",
+    "oauth_missing_vars": "缺少以下设置项：{{variables}}",
     "oauth_user_account": "用户账号： ",
     "oauth_user_email": "用户邮箱： ",
     "oauth_user_not_logged_in": "未登录！"
@@ -1895,7 +1878,7 @@
   },
   "custom_date_time_format": {
     "title": "自定义日期/时间格式",
-        "description": "通过<kbd></kbd>或工具栏的方式可自定义日期和时间格式，有关日期/时间格式字符串中各个字符的含义，请参阅<a href=\"https://day.js.org/docs/en/display/format\" target=\"_blank\" rel=\"noopener noreferrer\">Day.js docs</a>。",
+    "description": "通过<shortcut />或工具栏的方式可自定义日期和时间格式，有关日期/时间格式字符串中各个字符的含义，请参阅<doc>Day.js docs</doc>。",
     "format_string": "日期/时间格式字符串：",
     "formatted_time": "格式化后日期/时间："
   },
@@ -2005,6 +1988,16 @@
     "open_externally": "在外部打开"
   },
   "modal": {
-        "close": "关闭"
+    "close": "关闭",
+    "help_title": "显示关于此画面的更多信息"
+  },
+  "call_to_action": {
+    "background_effects_title": "背景效果现已推出稳定版本",
+    "background_effects_message": "在 Windows 装置上，背景效果现在已完全稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。此技术也用于其他应用程序，例如 Windows 资源管理器。",
+    "background_effects_button": "启用背景效果",
+    "next_theme_title": "试用新 Trilium 主题",
+    "next_theme_message": "当前使用旧版主题，要试用新主题吗？",
+    "next_theme_button": "试用新主题",
+    "dismiss": "关闭"
   }
 }

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

@@ -1,7 +1,6 @@
 {
   "about": {
     "title": "Über Trilium Notes",
-        "close": "Schließen",
     "homepage": "Startseite:",
     "app_version": "App-Version:",
     "db_version": "DB-Version:",
@@ -28,25 +27,22 @@
   "add_link": {
     "add_link": "Link hinzufügen",
     "help_on_links": "Hilfe zu Links",
-        "close": "Schließen",
     "note": "Notiz",
     "search_note": "Suche nach einer Notiz anhand ihres Namens",
     "link_title_mirrors": "Der Linktitel spiegelt den aktuellen Titel der Notiz wider",
     "link_title_arbitrary": "Der Linktitel kann beliebig geändert werden",
     "link_title": "Linktitel",
-        "button_add_link": "Link hinzufügen <kbd>Eingabetaste</kbd>"
+    "button_add_link": "Link hinzufügen"
   },
   "branch_prefix": {
     "edit_branch_prefix": "Zweigpräfix bearbeiten",
     "help_on_tree_prefix": "Hilfe zum Baumpräfix",
-        "close": "Schließen",
     "prefix": "Präfix: ",
     "save": "Speichern",
     "branch_prefix_saved": "Zweigpräfix wurde gespeichert."
   },
   "bulk_actions": {
     "bulk_actions": "Massenaktionen",
-        "close": "Schließen",
     "affected_notes": "Betroffene Notizen",
     "include_descendants": "Unternotizen der ausgewählten Notizen einbeziehen",
     "available_actions": "Verfügbare Aktionen",
@@ -61,20 +57,18 @@
   },
   "clone_to": {
     "clone_notes_to": "Notizen klonen nach...",
-        "close": "Schließen",
     "help_on_links": "Hilfe zu Links",
     "notes_to_clone": "Notizen zum Klonen",
     "target_parent_note": "Ziel-Übergeordnetenotiz",
     "search_for_note_by_its_name": "Suche nach einer Notiz anhand ihres Namens",
     "cloned_note_prefix_title": "Die geklonte Notiz wird im Notizbaum mit dem angegebenen Präfix angezeigt",
     "prefix_optional": "Präfix (optional)",
-        "clone_to_selected_note": "Auf ausgewählte Notiz klonen <kbd>Eingabe</kbd>",
+    "clone_to_selected_note": "Auf ausgewählte Notiz klonen",
     "no_path_to_clone_to": "Kein Pfad zum Klonen.",
     "note_cloned": "Die Notiz \"{{clonedTitle}}\" wurde in \"{{targetTitle}}\" hinein geklont"
   },
   "confirm": {
     "confirmation": "Bestätigung",
-        "close": "Schließen",
     "cancel": "Abbrechen",
     "ok": "OK",
     "are_you_sure_remove_note": "Bist du sicher, dass du \"{{title}}\" von der Beziehungskarte entfernen möchten? ",
@@ -87,9 +81,9 @@
     "delete_all_clones_description": "auch alle Klone löschen (kann bei letzte Änderungen rückgängig gemacht werden)",
     "erase_notes_description": "Beim normalen (vorläufigen) Löschen werden die Notizen nur als gelöscht markiert und sie können innerhalb eines bestimmten Zeitraums (im Dialogfeld „Letzte Änderungen“) wiederhergestellt werden. Wenn du diese Option aktivierst, werden die Notizen sofort gelöscht und es ist nicht möglich, die Notizen wiederherzustellen.",
     "erase_notes_warning": "Notizen dauerhaft löschen (kann nicht rückgängig gemacht werden), einschließlich aller Klone. Dadurch wird ein Neuladen der Anwendung erzwungen.",
-        "notes_to_be_deleted": "Folgende Notizen werden gelöscht (<span class=\"deleted-notes-count\"></span>)",
+    "notes_to_be_deleted": "Folgende Notizen werden gelöscht ({{notesCount}})",
     "no_note_to_delete": "Es werden keine Notizen gelöscht (nur Klone).",
-        "broken_relations_to_be_deleted": "Folgende Beziehungen werden gelöst und gelöscht (<span class=\"broke-relations-count\"></span>)",
+    "broken_relations_to_be_deleted": "Folgende Beziehungen werden gelöst und gelöscht ({{ relationCount}})",
     "cancel": "Abbrechen",
     "ok": "OK",
     "deleted_relation_text": "Notiz {{- note}} (soll gelöscht werden) wird von Beziehung {{- relation}} ausgehend von {{- source}} referenziert."
@@ -113,20 +107,18 @@
     "format_pdf": "PDF - für Ausdrucke oder Teilen."
   },
   "help": {
-        "fullDocumentation": "Hilfe (gesamte Dokumentation ist <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a> verfügbar)",
-        "close": "Schließen",
     "noteNavigation": "Notiz Navigation",
-        "goUpDown": "<kbd>Pfeil Hoch</kbd>, <kbd>Pfeil Runter</kbd> - In der Liste der Notizen nach oben/unten gehen",
-        "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - Knoten reduzieren/erweitern",
+    "goUpDown": "In der Liste der Notizen nach oben/unten gehen",
+    "collapseExpand": "Knoten reduzieren/erweitern",
     "notSet": "nicht eingestellt",
     "goBackForwards": "in der Historie zurück/vorwärts gehen",
     "showJumpToNoteDialog": "zeige <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Springe zu\" dialog</a>",
     "scrollToActiveNote": "Scrolle zur aktiven Notiz",
-        "jumpToParentNote": "<kbd>Backspace</kbd> - Zur übergeordneten Notiz springen",
+    "jumpToParentNote": "Zur übergeordneten Notiz springen",
     "collapseWholeTree": "Reduziere den gesamten Notizbaum",
     "collapseSubTree": "Teilbaum einklappen",
     "tabShortcuts": "Tab-Tastenkürzel",
-        "newTabNoteLink": "<kbd>Strg+Klick</kbd> - (oder mittlerer Mausklick) auf den Notizlink öffnet die Notiz in einem neuen Tab",
+    "newTabNoteLink": "auf den Notizlink öffnet die Notiz in einem neuen Tab",
     "onlyInDesktop": "Nur im Desktop (Electron Build)",
     "openEmptyTab": "Leeren Tab öffnen",
     "closeActiveTab": "Aktiven Tab schließen",
@@ -141,14 +133,14 @@
     "moveNoteUpHierarchy": "Verschiebe die Notiz in der Hierarchie nach oben",
     "multiSelectNote": "Mehrfachauswahl von Notizen oben/unten",
     "selectAllNotes": "Wähle alle Notizen in der aktuellen Ebene aus",
-        "selectNote": "<kbd>Umschalt+Klick</kbd> - Notiz auswählen",
+    "selectNote": "Notiz auswählen",
     "copyNotes": "Kopiere aktive Notiz (oder aktuelle Auswahl) in den Zwischenspeicher (wird genutzt für <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">Klonen</a>)",
     "cutNotes": "Aktuelle Notiz (oder aktuelle Auswahl) in die Zwischenablage ausschneiden (wird zum Verschieben von Notizen verwendet)",
     "pasteNotes": "Notiz(en) als Unternotiz in die aktive Notiz einfügen (entweder verschieben oder klonen, je nachdem, ob sie kopiert oder in die Zwischenablag e ausgeschnitten wurde)",
     "deleteNotes": "Notiz / Unterbaum löschen",
     "editingNotes": "Notizen bearbeiten",
     "editNoteTitle": "Im Baumbereich wird vom Baumbereich zum Notiztitel gewechselt. Beim Druck auf Eingabe im Notiztitel, wechselt der Fokus zum Texteditor. <kbd>Strg+.</kbd> wechselt vom Editor zurück zum Baumbereich.",
-        "createEditLink": "<kbd>Strg+K</kbd> - Externen Link erstellen/bearbeiten",
+    "createEditLink": "Externen Link erstellen/bearbeiten",
     "createInternalLink": "Internen Link erstellen",
     "followLink": "Folge dem Link unter dem Cursor",
     "insertDateTime": "Gebe das aktuelle Datum und die aktuelle Uhrzeit an der Einfügemarke ein",
@@ -164,11 +156,12 @@
     "showSQLConsole": "SQL-Konsole anzeigen",
     "other": "Andere",
     "quickSearch": "Fokus auf schnelle Sucheingabe",
-        "inPageSearch": "Auf-der-Seite-Suche"
+    "inPageSearch": "Auf-der-Seite-Suche",
+    "newTabWithActivationNoteLink": "auf einen Notiz-Link öffnet und aktiviert die Notiz in einem neuen Tab",
+    "title": "Spickzettel"
   },
   "import": {
     "importIntoNote": "In Notiz importieren",
-        "close": "Schließen",
     "chooseImportFile": "Wähle Importdatei aus",
     "importDescription": "Der Inhalt der ausgewählten Datei(en) wird als untergeordnete Notiz(en) importiert",
     "options": "Optionen",
@@ -195,14 +188,13 @@
   },
   "include_note": {
     "dialog_title": "Notiz beifügen",
-        "close": "Schließen",
     "label_note": "Notiz",
     "placeholder_search": "Suche nach einer Notiz anhand ihres Namens",
     "box_size_prompt": "Kartongröße des beigelegten Zettels:",
     "box_size_small": "klein (~ 10 Zeilen)",
     "box_size_medium": "mittel (~ 30 Zeilen)",
     "box_size_full": "vollständig (Feld zeigt vollständigen Text)",
-        "button_include": "Notiz beifügen <kbd>Eingabetaste</kbd>"
+    "button_include": "Notiz beifügen"
   },
   "info": {
     "modalTitle": "Infonachricht",
@@ -210,42 +202,35 @@
     "okButton": "OK"
   },
   "jump_to_note": {
-        "close": "Schließen",
-        "search_button": "Suche im Volltext: <kbd>Strg+Eingabetaste</kbd>"
+    "search_button": "Suche im Volltext"
   },
   "markdown_import": {
     "dialog_title": "Markdown-Import",
-        "close": "Schließen",
     "modal_body_text": "Aufgrund der Browser-Sandbox ist es nicht möglich, die Zwischenablage direkt aus JavaScript zu lesen. Bitte füge den zu importierenden Markdown in den Textbereich unten ein und klicke auf die Schaltfläche „Importieren“.",
-        "import_button": "Importieren Strg+Eingabe",
+    "import_button": "Importieren",
     "import_success": "Markdown-Inhalt wurde in das Dokument importiert."
   },
   "move_to": {
     "dialog_title": "Notizen verschieben nach ...",
-        "close": "Schließen",
     "notes_to_move": "Notizen zum Verschieben",
     "target_parent_note": "Ziel-Elternnotiz",
     "search_placeholder": "Suche nach einer Notiz anhand ihres Namens",
-        "move_button": "Zur ausgewählten Notiz wechseln <kbd>Eingabetaste</kbd>",
+    "move_button": "Zur ausgewählten Notiz wechseln",
     "error_no_path": "Kein Weg, auf den man sich bewegen kann.",
     "move_success_message": "Ausgewählte Notizen wurden verschoben"
   },
   "note_type_chooser": {
     "modal_title": "Wähle den Notiztyp aus",
-        "close": "Schließen",
     "modal_body": "Wähle den Notiztyp / die Vorlage der neuen Notiz:",
-        "templates": "Vorlagen:"
+    "templates": "Vorlagen"
   },
   "password_not_set": {
     "title": "Das Passwort ist nicht festgelegt",
-        "close": "Schließen",
-        "body1": "Geschützte Notizen werden mit einem Benutzerpasswort verschlüsselt, es wurde jedoch noch kein Passwort festgelegt.",
-        "body2": "Um Notizen verschlüsseln zu können, klicke <a class=\"open-password-options-button\" href=\"javascript:\">hier</a> um das Optionsmenu zu öffnen und ein Passwort zu setzen."
+    "body1": "Geschützte Notizen werden mit einem Benutzerpasswort verschlüsselt, es wurde jedoch noch kein Passwort festgelegt."
   },
   "prompt": {
     "title": "Prompt",
-        "close": "Schließen",
-        "ok": "OK <kbd>Eingabe</kbd>",
+    "ok": "OK",
     "defaultTitle": "Prompt"
   },
   "protected_session_password": {
@@ -253,12 +238,11 @@
     "help_title": "Hilfe zu geschützten Notizen",
     "close_label": "Schließen",
     "form_label": "Um mit der angeforderten Aktion fortzufahren, musst du eine geschützte Sitzung starten, indem du ein Passwort eingibst:",
-        "start_button": "Geschützte Sitzung starten <kbd>enter</kbd>"
+    "start_button": "Geschützte Sitzung starten"
   },
   "recent_changes": {
     "title": "Aktuelle Änderungen",
     "erase_notes_button": "Jetzt gelöschte Notizen löschen",
-        "close": "Schließen",
     "deleted_notes_message": "Gelöschte Notizen wurden gelöscht.",
     "no_changes_message": "Noch keine Änderungen...",
     "undelete_link": "Wiederherstellen",
@@ -269,7 +253,6 @@
     "delete_all_revisions": "Lösche alle Revisionen dieser Notiz",
     "delete_all_button": "Alle Revisionen löschen",
     "help_title": "Hilfe zu Notizrevisionen",
-        "close": "Schließen",
     "revision_last_edited": "Diese Revision wurde zuletzt am {{date}} bearbeitet",
     "confirm_delete_all": "Möchtest du alle Revisionen dieser Notiz löschen?",
     "no_revisions": "Für diese Notiz gibt es noch keine Revisionen...",
@@ -289,7 +272,6 @@
   },
   "sort_child_notes": {
     "sort_children_by": "Unternotizen sortieren nach...",
-        "close": "Schließen",
     "sorting_criteria": "Sortierkriterien",
     "title": "Titel",
     "date_created": "Erstellungsdatum",
@@ -303,13 +285,12 @@
     "sort_with_respect_to_different_character_sorting": "Sortierung im Hinblick auf unterschiedliche Sortier- und Sortierregeln für Zeichen in verschiedenen Sprachen oder Regionen.",
     "natural_sort_language": "Natürliche Sortiersprache",
     "the_language_code_for_natural_sort": "Der Sprachcode für die natürliche Sortierung, z. B. \"de-DE\" für Deutsch.",
-        "sort": "Sortieren <kbd>Eingabetaste</kbd>"
+    "sort": "Sortieren"
   },
   "upload_attachments": {
     "upload_attachments_to_note": "Lade Anhänge zur Notiz hoch",
-        "close": "Schließen",
     "choose_files": "Wähle Dateien aus",
-        "files_will_be_uploaded": "Dateien werden als Anhänge in hochgeladen",
+    "files_will_be_uploaded": "Dateien werden als Anhänge in hochgeladen {{noteTitle}}",
     "options": "Optionen",
     "shrink_images": "Bilder verkleinern",
     "upload": "Hochladen",
@@ -1098,12 +1079,9 @@
     "title": "Thema",
     "theme_label": "Thema",
     "override_theme_fonts_label": "Theme-Schriftarten überschreiben",
-        "auto_theme": "Auto",
-        "light_theme": "Hell",
-        "dark_theme": "Dunkel",
-        "triliumnext": "TriliumNext Beta (Systemfarbschema folgend)",
-        "triliumnext-light": "TriliumNext Beta (Hell)",
-        "triliumnext-dark": "TriliumNext Beta (Dunkel)",
+    "triliumnext": "Trilium (Systemfarbschema folgend)",
+    "triliumnext-light": "Trilium (Hell)",
+    "triliumnext-dark": "Trilium (Dunkel)",
     "layout": "Layout",
     "layout-vertical-title": "Vertikal",
     "layout-horizontal-title": "Horizontal",
@@ -1160,7 +1138,7 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Snapshot-Intervall für Notizrevisionen",
-        "note_revisions_snapshot_description": "Das Snapshot-Zeitintervall für Notizrevisionen ist die Zeit, nach der eine neue Notizrevision erstellt wird. Weitere Informationen findest du im <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">Wiki</a>.",
+    "note_revisions_snapshot_description": "Das Snapshot-Zeitintervall für Notizrevisionen ist die Zeit, nach der eine neue Notizrevision erstellt wird. Weitere Informationen findest du im <doc>Wiki</doc>.",
     "snapshot_time_interval_label": "Zeitintervall für Notiz-Revisions-Snapshot:"
   },
   "revisions_snapshot_limit": {
@@ -1650,5 +1628,8 @@
   },
   "time_selector": {
     "invalid_input": "Die eingegebene Zeit ist keine valide Zahl."
+  },
+  "modal": {
+    "close": "Schließen"
   }
 }

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

@@ -1,7 +1,6 @@
 {
     "about": {
         "title": "Πληροφορίες για το Trilium Notes",
-        "close": "Κλείσιμο",
         "homepage": "Αρχική Σελίδα:",
         "app_version": "Έκδοση εφαρμογής:",
         "db_version": "Έκδοση βάσης δεδομένων:",

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

@@ -1,7 +1,6 @@
 {
   "about": {
     "title": "About Trilium Notes",
-    "close": "Close",
     "homepage": "Homepage:",
     "app_version": "App version:",
     "db_version": "DB version:",
@@ -28,25 +27,22 @@
   "add_link": {
     "add_link": "Add link",
     "help_on_links": "Help on links",
-    "close": "Close",
     "note": "Note",
     "search_note": "search for note by its name",
     "link_title_mirrors": "link title mirrors the note's current title",
     "link_title_arbitrary": "link title can be changed arbitrarily",
     "link_title": "Link title",
-    "button_add_link": "Add link <kbd>enter</kbd>"
+    "button_add_link": "Add link"
   },
   "branch_prefix": {
     "edit_branch_prefix": "Edit branch prefix",
     "help_on_tree_prefix": "Help on Tree prefix",
-    "close": "Close",
     "prefix": "Prefix: ",
     "save": "Save",
     "branch_prefix_saved": "Branch prefix has been saved."
   },
   "bulk_actions": {
     "bulk_actions": "Bulk actions",
-    "close": "Close",
     "affected_notes": "Affected notes",
     "include_descendants": "Include descendants of the selected notes",
     "available_actions": "Available actions",
@@ -61,20 +57,18 @@
   },
   "clone_to": {
     "clone_notes_to": "Clone notes to...",
-    "close": "Close",
     "help_on_links": "Help on links",
     "notes_to_clone": "Notes to clone",
     "target_parent_note": "Target parent note",
     "search_for_note_by_its_name": "search for note by its name",
     "cloned_note_prefix_title": "Cloned note will be shown in note tree with given prefix",
     "prefix_optional": "Prefix (optional)",
-    "clone_to_selected_note": "Clone to selected note <kbd>enter</kbd>",
+    "clone_to_selected_note": "Clone to selected note",
     "no_path_to_clone_to": "No path to clone to.",
     "note_cloned": "Note \"{{clonedTitle}}\" has been cloned into \"{{targetTitle}}\""
   },
   "confirm": {
     "confirmation": "Confirmation",
-    "close": "Close",
     "cancel": "Cancel",
     "ok": "OK",
     "are_you_sure_remove_note": "Are you sure you want to remove the note \"{{title}}\" from relation map? ",
@@ -87,9 +81,9 @@
     "delete_all_clones_description": "Delete also all clones (can be undone in recent changes)",
     "erase_notes_description": "Normal (soft) deletion only marks the notes as deleted and they can be undeleted (in recent changes dialog) within a period of time. Checking this option will erase the notes immediately and it won't be possible to undelete the notes.",
     "erase_notes_warning": "Erase notes permanently (can't be undone), including all clones. This will force application reload.",
-    "notes_to_be_deleted": "Following notes will be deleted ({{- noteCount}})",
+    "notes_to_be_deleted": "Following notes will be deleted ({{notesCount}})",
     "no_note_to_delete": "No note will be deleted (only clones).",
-    "broken_relations_to_be_deleted": "Following relations will be broken and deleted ({{- relationCount}})",
+    "broken_relations_to_be_deleted": "Following relations will be broken and deleted ({{ relationCount}})",
     "cancel": "Cancel",
     "ok": "OK",
     "deleted_relation_text": "Note {{- note}} (to be deleted) is referenced by relation {{- relation}} originating from {{- source}}."
@@ -113,21 +107,20 @@
     "format_pdf": "PDF - for printing or sharing purposes."
   },
   "help": {
-    "fullDocumentation": "Help (full documentation is available <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
-    "close": "Close",
+    "title": "Cheatsheet",
     "noteNavigation": "Note navigation",
-    "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> - go up/down in the list of notes",
-    "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - collapse/expand node",
+    "goUpDown": "go up/down in the list of notes",
+    "collapseExpand": "collapse/expand node",
     "notSet": "not set",
     "goBackForwards": "go back / forwards in the history",
     "showJumpToNoteDialog": "show <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Jump to\" dialog</a>",
     "scrollToActiveNote": "scroll to active note",
-    "jumpToParentNote": "<kbd>Backspace</kbd> - jump to parent note",
+    "jumpToParentNote": "jump to parent note",
     "collapseWholeTree": "collapse whole note tree",
     "collapseSubTree": "collapse sub-tree",
     "tabShortcuts": "Tab shortcuts",
-    "newTabNoteLink": "<kbd>Ctrl+click</kbd> - (or <kbd>middle mouse click</kbd>) on note link opens note in a new tab",
-    "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+click</kbd> - (or <kbd>Shift+middle mouse click</kbd>) on note link opens and activates the note in a new tab",
+    "newTabNoteLink": "on note link opens note in a new tab",
+    "newTabWithActivationNoteLink": "on note link opens and activates the note in a new tab",
     "onlyInDesktop": "Only in desktop (Electron build)",
     "openEmptyTab": "open empty tab",
     "closeActiveTab": "close active tab",
@@ -142,14 +135,14 @@
     "moveNoteUpHierarchy": "move note up in the hierarchy",
     "multiSelectNote": "multi-select note above/below",
     "selectAllNotes": "select all notes in the current level",
-    "selectNote": "<kbd>Shift+click</kbd> - select note",
+    "selectNote": "select note",
     "copyNotes": "copy active note (or current selection) into clipboard (used for <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">cloning</a>)",
     "cutNotes": "cut current note (or current selection) into clipboard (used for moving notes)",
     "pasteNotes": "paste note(s) as sub-note into active note (which is either move or clone depending on whether it was copied or cut into clipboard)",
     "deleteNotes": "delete note / sub-tree",
     "editingNotes": "Editing notes",
     "editNoteTitle": "in tree pane will switch from tree pane into note title. Enter from note title will switch focus to text editor. <kbd>Ctrl+.</kbd> will switch back from editor to tree pane.",
-    "createEditLink": "<kbd>Ctrl+K</kbd> - create / edit external link",
+    "createEditLink": "create / edit external link",
     "createInternalLink": "create internal link",
     "followLink": "follow link under cursor",
     "insertDateTime": "insert current date and time at caret position",
@@ -169,7 +162,6 @@
   },
   "import": {
     "importIntoNote": "Import into note",
-    "close": "Close",
     "chooseImportFile": "Choose import file",
     "importDescription": "Content of the selected file(s) will be imported as child note(s) into",
     "options": "Options",
@@ -196,14 +188,13 @@
   },
   "include_note": {
     "dialog_title": "Include note",
-    "close": "Close",
     "label_note": "Note",
     "placeholder_search": "search for note by its name",
     "box_size_prompt": "Box size of the included note:",
     "box_size_small": "small (~ 10 lines)",
     "box_size_medium": "medium (~ 30 lines)",
     "box_size_full": "full (box shows complete text)",
-    "button_include": "Include note <kbd>enter</kbd>"
+    "button_include": "Include note"
   },
   "info": {
     "modalTitle": "Info message",
@@ -212,23 +203,20 @@
   },
   "jump_to_note": {
     "search_placeholder": "Search for note by its name or type > for commands...",
-    "close": "Close",
-    "search_button": "Search in full text <kbd>Ctrl+Enter</kbd>"
+    "search_button": "Search in full text"
   },
   "markdown_import": {
     "dialog_title": "Markdown import",
-    "close": "Close",
     "modal_body_text": "Because of browser sandbox it's not possible to directly read clipboard from JavaScript. Please paste the Markdown to import to textarea below and click on Import button",
-    "import_button": "Import Ctrl+Enter",
+    "import_button": "Import",
     "import_success": "Markdown content has been imported into the document."
   },
   "move_to": {
     "dialog_title": "Move notes to ...",
-    "close": "Close",
     "notes_to_move": "Notes to move",
     "target_parent_note": "Target parent note",
     "search_placeholder": "search for note by its name",
-    "move_button": "Move to selected note <kbd>enter</kbd>",
+    "move_button": "Move to selected note",
     "error_no_path": "No path to move to.",
     "move_success_message": "Selected notes have been moved into "
   },
@@ -236,20 +224,19 @@
     "change_path_prompt": "Change where to create the new note:",
     "search_placeholder": "search path by name (default if empty)",
     "modal_title": "Choose note type",
-    "close": "Close",
     "modal_body": "Choose note type / template of the new note:",
-    "templates": "Templates:"
+    "templates": "Templates",
+    "builtin_templates": "Built-in Templates"
   },
   "password_not_set": {
     "title": "Password is not set",
-    "close": "Close",
     "body1": "Protected notes are encrypted using a user password, but password has not been set yet.",
-    "body2": "To be able to protect notes, click <a class=\"open-password-options-button\" href=\"javascript:\">here</a> to open the Options dialog and set your password."
+    "body2": "To be able to protect notes, click the button below to open the Options dialog and set your password.",
+    "go_to_password_options": "Go to Password options"
   },
   "prompt": {
     "title": "Prompt",
-    "close": "Close",
-    "ok": "OK <kbd>enter</kbd>",
+    "ok": "OK",
     "defaultTitle": "Prompt"
   },
   "protected_session_password": {
@@ -257,12 +244,11 @@
     "help_title": "Help on Protected notes",
     "close_label": "Close",
     "form_label": "To proceed with requested action you need to start protected session by entering password:",
-    "start_button": "Start protected session <kbd>enter</kbd>"
+    "start_button": "Start protected session"
   },
   "recent_changes": {
     "title": "Recent changes",
     "erase_notes_button": "Erase deleted notes now",
-    "close": "Close",
     "deleted_notes_message": "Deleted notes have been erased.",
     "no_changes_message": "No changes yet...",
     "undelete_link": "undelete",
@@ -273,7 +259,6 @@
     "delete_all_revisions": "Delete all revisions of this note",
     "delete_all_button": "Delete all revisions",
     "help_title": "Help on Note Revisions",
-    "close": "Close",
     "revision_last_edited": "This revision was last edited on {{date}}",
     "confirm_delete_all": "Do you want to delete all revisions of this note?",
     "no_revisions": "No revisions for this note yet...",
@@ -295,7 +280,6 @@
   },
   "sort_child_notes": {
     "sort_children_by": "Sort children by...",
-    "close": "Close",
     "sorting_criteria": "Sorting criteria",
     "title": "title",
     "date_created": "date created",
@@ -309,13 +293,12 @@
     "sort_with_respect_to_different_character_sorting": "sort with respect to different character sorting and collation rules in different languages or regions.",
     "natural_sort_language": "Natural sort language",
     "the_language_code_for_natural_sort": "The language code for natural sort, e.g. \"zh-CN\" for Chinese.",
-    "sort": "Sort <kbd>enter</kbd>"
+    "sort": "Sort"
   },
   "upload_attachments": {
     "upload_attachments_to_note": "Upload attachments to note",
-    "close": "Close",
     "choose_files": "Choose files",
-    "files_will_be_uploaded": "Files will be uploaded as attachments into",
+    "files_will_be_uploaded": "Files will be uploaded as attachments into {{noteTitle}}",
     "options": "Options",
     "shrink_images": "Shrink images",
     "upload": "Upload",
@@ -1118,12 +1101,12 @@
     "title": "Application Theme",
     "theme_label": "Theme",
     "override_theme_fonts_label": "Override theme fonts",
-    "auto_theme": "Auto",
-    "light_theme": "Light",
-    "dark_theme": "Dark",
-    "triliumnext": "TriliumNext Beta (Follow system color scheme)",
-    "triliumnext-light": "TriliumNext Beta (Light)",
-    "triliumnext-dark": "TriliumNext Beta (Dark)",
+    "auto_theme": "Legacy (Follow system color scheme)",
+    "light_theme": "Legacy (Light)",
+    "dark_theme": "Legacy (Dark)",
+    "triliumnext": "Trilium (Follow system color scheme)",
+    "triliumnext-light": "Trilium (Light)",
+    "triliumnext-dark": "Trilium (Dark)",
     "layout": "Layout",
     "layout-vertical-title": "Vertical",
     "layout-horizontal-title": "Horizontal",
@@ -1270,7 +1253,12 @@
     "selected_provider": "Selected Provider",
     "selected_provider_description": "Choose the AI provider for chat and completion features",
     "select_model": "Select model...",
-    "select_provider": "Select provider..."
+    "select_provider": "Select provider...",
+    "ai_enabled": "AI features enabled",
+    "ai_disabled": "AI features disabled",
+    "no_models_found_online": "No models found. Please check your API key and settings.",
+    "no_models_found_ollama": "No Ollama models found. Please check if Ollama is running.",
+    "error_fetching": "Error fetching models: {{error}}"
   },
   "zoom_factor": {
     "title": "Zoom Factor (desktop build only)",
@@ -1327,7 +1315,7 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Note Revision Snapshot Interval",
-    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> for more info.",
+    "note_revisions_snapshot_description": "The Note revision snapshot interval is the time after which a new note revision will be created for the note. See <doc>wiki</doc> for more info.",
     "snapshot_time_interval_label": "Note revision snapshot time interval:"
   },
   "revisions_snapshot_limit": {
@@ -1389,7 +1377,7 @@
   },
   "custom_date_time_format": {
     "title": "Custom Date/Time Format",
-    "description": "Customize the format of the date and time inserted via <kbd></kbd> or the toolbar. See <a href=\"https://day.js.org/docs/en/display/format\" target=\"_blank\" rel=\"noopener noreferrer\">Day.js docs</a> for available format tokens.",
+    "description": "Customize the format of the date and time inserted via <shortcut /> or the toolbar. See <doc>Day.js docs</doc> for available format tokens.",
     "format_string": "Format string:",
     "formatted_time": "Formatted date/time:"
   },
@@ -2007,6 +1995,26 @@
     "open_externally": "Open externally"
   },
   "modal": {
-    "close": "Close"
+    "close": "Close",
+    "help_title": "Display more information about this screen"
+  },
+  "call_to_action": {
+    "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",
+    "dismiss": "Dismiss"
+  },
+  "settings": {
+    "related_settings": "Related settings"
+  },
+  "settings_appearance": {
+    "related_code_blocks": "Color scheme for code blocks in text notes",
+    "related_code_notes": "Color scheme for code notes"
+  },
+  "units": {
+    "percentage": "%"
   }
 }

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

@@ -1,7 +1,6 @@
 {
   "about": {
     "title": "Acerca de Trilium Notes",
-        "close": "Cerrar",
     "homepage": "Página principal:",
     "app_version": "Versión de la aplicación:",
     "db_version": "Versión de base de datos:",
@@ -28,25 +27,22 @@
   "add_link": {
     "add_link": "Agregar enlace",
     "help_on_links": "Ayuda sobre enlaces",
-        "close": "Cerrar",
     "note": "Nota",
     "search_note": "buscar nota por su nombre",
     "link_title_mirrors": "el título del enlace replica el título actual de la nota",
     "link_title_arbitrary": "el título del enlace se puede cambiar arbitrariamente",
     "link_title": "Título del enlace",
-        "button_add_link": "Agregar enlace <kbd>Enter</kbd>"
+    "button_add_link": "Agregar enlace"
   },
   "branch_prefix": {
     "edit_branch_prefix": "Editar prefijo de rama",
     "help_on_tree_prefix": "Ayuda sobre el prefijo del árbol",
-        "close": "Cerrar",
     "prefix": "Prefijo: ",
     "save": "Guardar",
     "branch_prefix_saved": "Se ha guardado el prefijo de rama."
   },
   "bulk_actions": {
     "bulk_actions": "Acciones en bloque",
-        "close": "Cerrar",
     "affected_notes": "Notas afectadas",
     "include_descendants": "Incluir descendientes de las notas seleccionadas",
     "available_actions": "Acciones disponibles",
@@ -61,20 +57,18 @@
   },
   "clone_to": {
     "clone_notes_to": "Clonar notas a...",
-        "close": "Cerrar",
     "help_on_links": "Ayuda sobre enlaces",
     "notes_to_clone": "Notas a clonar",
     "target_parent_note": "Nota padre de destino",
     "search_for_note_by_its_name": "buscar nota por su nombre",
     "cloned_note_prefix_title": "La nota clonada se mostrará en el árbol de notas con el prefijo dado",
     "prefix_optional": "Prefijo (opcional)",
-        "clone_to_selected_note": "Clonar a nota seleccionada <kbd>enter</kbd>",
+    "clone_to_selected_note": "Clonar a nota seleccionada",
     "no_path_to_clone_to": "No hay ruta para clonar.",
     "note_cloned": "La nota \"{{clonedTitle}}\" a sido clonada en \"{{targetTitle}}\""
   },
   "confirm": {
     "confirmation": "Confirmación",
-        "close": "Cerrar",
     "cancel": "Cancelar",
     "ok": "Aceptar",
     "are_you_sure_remove_note": "¿Está seguro que desea eliminar la nota \"{{title}}\" del mapa de relaciones? ",
@@ -87,9 +81,9 @@
     "delete_all_clones_description": "Eliminar también todos los clones (se puede deshacer en cambios recientes)",
     "erase_notes_description": "La eliminación normal (suave) solo marca las notas como eliminadas y se pueden recuperar (en el cuadro de diálogo de cambios recientes) dentro de un periodo de tiempo. Al marcar esta opción se borrarán las notas inmediatamente y no será posible recuperarlas.",
     "erase_notes_warning": "Eliminar notas permanentemente (no se puede deshacer), incluidos todos los clones. Esto forzará la recarga de la aplicación.",
-        "notes_to_be_deleted": "Las siguientes notas serán eliminadas ({{- noteCount}})",
+    "notes_to_be_deleted": "Las siguientes notas serán eliminadas ({{notesCount}})",
     "no_note_to_delete": "No se eliminará ninguna nota (solo clones).",
-        "broken_relations_to_be_deleted": "Las siguientes relaciones se romperán y serán eliminadas ({{- relationCount}})",
+    "broken_relations_to_be_deleted": "Las siguientes relaciones se romperán y serán eliminadas ({{ relationCount}})",
     "cancel": "Cancelar",
     "ok": "Aceptar",
     "deleted_relation_text": "Nota {{- note}} (para ser eliminada) está referenciado por la relación {{- relation}} que se origina en {{- source}}."
@@ -113,21 +107,19 @@
     "format_pdf": "PDF - para propósitos de impresión o compartición."
   },
   "help": {
-        "fullDocumentation": "Ayuda (la documentación completa está disponible <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
-        "close": "Cerrar",
     "noteNavigation": "Navegación de notas",
-        "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> - subir/bajar en la lista de notas",
-        "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - colapsar/expandir nodo",
+    "goUpDown": "subir/bajar en la lista de notas",
+    "collapseExpand": "colapsar/expandir nodo",
     "notSet": "no establecido",
     "goBackForwards": "retroceder / avanzar en la historia",
     "showJumpToNoteDialog": "mostrar <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Saltar a\" diálogo</a>",
     "scrollToActiveNote": "desplazarse hasta la nota activa",
-        "jumpToParentNote": "<kbd>Backspace</kbd> - saltar a la nota padre",
+    "jumpToParentNote": "saltar a la nota padre",
     "collapseWholeTree": "colapsar todo el árbol de notas",
     "collapseSubTree": "colapsar subárbol",
     "tabShortcuts": "Atajos de pestañas",
-        "newTabNoteLink": "<kbd>CTRL+clic</kbd> - (o <kbd>clic central del mouse</kbd>) en el enlace de la nota abre la nota en una nueva pestaña",
-        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+clic</kbd> - (o <kbd>Shift+clic de rueda de ratón</kbd>) en el enlace de la nota abre y activa la nota en una nueva pestaña",
+    "newTabNoteLink": "en el enlace de la nota abre la nota en una nueva pestaña",
+    "newTabWithActivationNoteLink": "en el enlace de la nota abre y activa la nota en una nueva pestaña",
     "onlyInDesktop": "Solo en escritorio (compilación con Electron)",
     "openEmptyTab": "abrir pestaña vacía",
     "closeActiveTab": "cerrar pestaña activa",
@@ -142,14 +134,14 @@
     "moveNoteUpHierarchy": "mover nota hacia arriba en la jerarquía",
     "multiSelectNote": "selección múltiple de nota hacia arriba/abajo",
     "selectAllNotes": "seleccionar todas las notas en el nivel actual",
-        "selectNote": "<kbd>Shift+click</kbd> - seleccionar nota",
+    "selectNote": "seleccionar nota",
     "copyNotes": "copiar nota activa (o selección actual) al portapapeles (usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">clonar</a>)",
     "cutNotes": "cortar la nota actual (o la selección actual) en el portapapeles (usado para mover notas)",
     "pasteNotes": "pegar notas como subnotas en la nota activa (que se puede mover o clonar dependiendo de si se copió o cortó en el portapapeles)",
     "deleteNotes": "eliminar nota/subárbol",
     "editingNotes": "Editando notas",
     "editNoteTitle": "en el panel de árbol cambiará del panel de árbol al título de la nota. Ingresar desde el título de la nota cambiará el foco al editor de texto. <kbd>Ctrl+.</kbd> cambiará de nuevo del editor al panel de árbol.",
-        "createEditLink": "<kbd>Ctrl+K</kbd> - crear/editar enlace externo",
+    "createEditLink": "crear/editar enlace externo",
     "createInternalLink": "crear enlace interno",
     "followLink": "siga el enlace debajo del cursor",
     "insertDateTime": "insertar la fecha y hora actuales en la posición del cursor",
@@ -165,11 +157,11 @@
     "showSQLConsole": "mostrar consola SQL",
     "other": "Otro",
     "quickSearch": "centrarse en la entrada de búsqueda rápida",
-        "inPageSearch": "búsqueda en la página"
+    "inPageSearch": "búsqueda en la página",
+    "title": "Hoja de ayuda"
   },
   "import": {
     "importIntoNote": "Importar a nota",
-        "close": "Cerrar",
     "chooseImportFile": "Elija el archivo de importación",
     "importDescription": "El contenido de los archivos seleccionados se importará como notas secundarias en",
     "options": "Opciones",
@@ -196,14 +188,13 @@
   },
   "include_note": {
     "dialog_title": "Incluir nota",
-        "close": "Cerrar",
     "label_note": "Nota",
     "placeholder_search": "buscar nota por su nombre",
     "box_size_prompt": "Tamaño de caja de la nota incluida:",
     "box_size_small": "pequeño (~ 10 líneas)",
     "box_size_medium": "medio (~ 30 líneas)",
     "box_size_full": "completo (el cuadro muestra el texto completo)",
-        "button_include": "Incluir nota <kbd>Enter</kbd>"
+    "button_include": "Incluir nota"
   },
   "info": {
     "modalTitle": "Mensaje informativo",
@@ -211,24 +202,21 @@
     "okButton": "Aceptar"
   },
   "jump_to_note": {
-        "close": "Cerrar",
-        "search_button": "Buscar en texto completo <kbd>Ctrl+Enter</kbd>",
+    "search_button": "Buscar en texto completo",
     "search_placeholder": "Busque nota por su nombre o escriba > para comandos..."
   },
   "markdown_import": {
     "dialog_title": "Importación de Markdown",
-        "close": "Cerrar",
     "modal_body_text": "Debido al entorno limitado del navegador, no es posible leer directamente el portapapeles desde JavaScript. Por favor, pegue el código Markdown para importar en el área de texto a continuación y haga clic en el botón Importar",
-        "import_button": "Importar Ctrl+Enter",
+    "import_button": "Importar",
     "import_success": "El contenido de Markdown se ha importado al documento."
   },
   "move_to": {
     "dialog_title": "Mover notas a...",
-        "close": "Cerrar",
     "notes_to_move": "Notas a mover",
     "target_parent_note": "Nota padre de destino",
     "search_placeholder": "buscar nota por su nombre",
-        "move_button": "Mover a la nota seleccionada <kbd>enter</kbd>",
+    "move_button": "Mover a la nota seleccionada",
     "error_no_path": "No hay ruta a donde mover.",
     "move_success_message": "Las notas seleccionadas se han movido a "
   },
@@ -236,20 +224,19 @@
     "change_path_prompt": "Cambiar donde se creará la nueva nota:",
     "search_placeholder": "ruta de búsqueda por nombre (por defecto si está vacío)",
     "modal_title": "Elija el tipo de nota",
-        "close": "Cerrar",
     "modal_body": "Elija el tipo de nota/plantilla de la nueva nota:",
-        "templates": "Plantillas:"
+    "templates": "Plantillas",
+    "builtin_templates": "Plantillas incluidas"
   },
   "password_not_set": {
     "title": "La contraseña no está establecida",
-        "close": "Cerrar",
     "body1": "Las notas protegidas se cifran mediante una contraseña de usuario, pero la contraseña aún no se ha establecido.",
-        "body2": "Para poder proteger notas, dé clic <a class=\"open-password-options-button\" href=\"javascript:\">aquí</a> para abrir el diálogo de Opciones y establecer tu contraseña."
+    "go_to_password_options": "Ir a opciones de contraseña",
+    "body2": "Para poder proteger las notas, haz click en el botón inferior para abrir la pantalla de Opciones y establecer tu contraseña."
   },
   "prompt": {
     "title": "Aviso",
-        "close": "Cerrar",
-        "ok": "Aceptar <kbd>enter</kbd>",
+    "ok": "Aceptar",
     "defaultTitle": "Aviso"
   },
   "protected_session_password": {
@@ -257,12 +244,11 @@
     "help_title": "Ayuda sobre notas protegidas",
     "close_label": "Cerrar",
     "form_label": "Para continuar con la acción solicitada, debe iniciar en la sesión protegida ingresando la contraseña:",
-        "start_button": "Iniciar sesión protegida <kbd>entrar</kbd>"
+    "start_button": "Iniciar sesión protegida"
   },
   "recent_changes": {
     "title": "Cambios recientes",
     "erase_notes_button": "Borrar notas eliminadas ahora",
-        "close": "Cerrar",
     "deleted_notes_message": "Las notas eliminadas han sido borradas.",
     "no_changes_message": "Aún no hay cambios...",
     "undelete_link": "recuperar",
@@ -273,7 +259,6 @@
     "delete_all_revisions": "Eliminar todas las revisiones de esta nota",
     "delete_all_button": "Eliminar todas las revisiones",
     "help_title": "Ayuda sobre revisiones de notas",
-        "close": "Cerrar",
     "revision_last_edited": "Esta revisión se editó por última vez en {{date}}",
     "confirm_delete_all": "¿Quiere eliminar todas las revisiones de esta nota?",
     "no_revisions": "Aún no hay revisiones para esta nota...",
@@ -295,7 +280,6 @@
   },
   "sort_child_notes": {
     "sort_children_by": "Ordenar hijos por...",
-        "close": "Cerrar",
     "sorting_criteria": "Criterios de ordenamiento",
     "title": "título",
     "date_created": "fecha de creación",
@@ -309,13 +293,12 @@
     "sort_with_respect_to_different_character_sorting": "ordenar con respecto a diferentes reglas de ordenamiento y clasificación de caracteres en diferentes idiomas o regiones.",
     "natural_sort_language": "Idioma de clasificación natural",
     "the_language_code_for_natural_sort": "El código del idioma para el ordenamiento natural, ej. \"zh-CN\" para Chino.",
-        "sort": "Ordenar <kbd>Enter</kbd>"
+    "sort": "Ordenar"
   },
   "upload_attachments": {
     "upload_attachments_to_note": "Cargar archivos adjuntos a nota",
-        "close": "Cerrar",
     "choose_files": "Elija los archivos",
-        "files_will_be_uploaded": "Los archivos se cargarán como archivos adjuntos en",
+    "files_will_be_uploaded": "Los archivos se cargarán como archivos adjuntos en {{noteTitle}}",
     "options": "Opciones",
     "shrink_images": "Reducir imágenes",
     "upload": "Subir",
@@ -1118,17 +1101,17 @@
     "title": "Tema",
     "theme_label": "Tema",
     "override_theme_fonts_label": "Sobreescribir fuentes de tema",
-        "auto_theme": "Automático",
-        "light_theme": "Claro",
-        "dark_theme": "Oscuro",
-        "triliumnext": "TriliumNext Beta (Sigue el esquema de color del sistema)",
-        "triliumnext-light": "TriliumNext Beta (Claro)",
-        "triliumnext-dark": "TriliumNext Beta (Oscuro)",
+    "triliumnext": "Trilium (Sigue el esquema de color del sistema)",
+    "triliumnext-light": "Trilium (Claro)",
+    "triliumnext-dark": "Trilium (Oscuro)",
     "layout": "Disposición",
     "layout-vertical-title": "Vertical",
     "layout-horizontal-title": "Horizontal",
     "layout-vertical-description": "la barra del lanzador está en la izquierda (por defecto)",
-        "layout-horizontal-description": "la barra de lanzamiento está debajo de la barra de pestañas, la barra de pestañas ahora tiene ancho completo."
+    "layout-horizontal-description": "la barra de lanzamiento está debajo de la barra de pestañas, la barra de pestañas ahora tiene ancho completo.",
+    "auto_theme": "Heredado (Sigue el esquema de colores del sistema)",
+    "light_theme": "Heredado (Claro)",
+    "dark_theme": "Heredado (Oscuro)"
   },
   "ai_llm": {
     "not_started": "No iniciado",
@@ -1327,7 +1310,7 @@
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Intervalo de instantáneas de revisiones de notas",
-        "note_revisions_snapshot_description": "El intervalo de tiempo de la instantánea de revisión de nota es el tiempo después de lo cual se creará una nueva revisión para la nota. Ver <a href=\"https://triliumnext.github.io/docs/wiki/note-revisions.html\" class=\"external\"> wiki </a> para obtener más información.",
+    "note_revisions_snapshot_description": "El intervalo de tiempo de la instantánea de revisión de nota es el tiempo después de lo cual se creará una nueva revisión para la nota. Ver <doc>wiki</doc> para obtener más información.",
     "snapshot_time_interval_label": "Intervalo de tiempo de la instantánea de revisión de notas:"
   },
   "revisions_snapshot_limit": {
@@ -1389,7 +1372,7 @@
   },
   "custom_date_time_format": {
     "title": "Formato de fecha/hora personalizada",
-        "description": "Personalizar el formado de fecha y la hora insertada vía <kbd></kbd> o la barra de herramientas. Véa la <a href=\"https://day.js.org/docs/en/display/format\" target=\"_blank\" rel=\"noopener noreferrer\">documentación de Day.js</a> para más tokens de formato disponibles.",
+    "description": "Personalizar el formado de fecha y la hora insertada vía <shortcut /> o la barra de herramientas. Véa la <doc>documentación de Day.js</doc> para más tokens de formato disponibles.",
     "format_string": "Cadena de formato:",
     "formatted_time": "Fecha/hora personalizada:"
   },
@@ -2007,6 +1990,16 @@
     "configure_launch_bar_description": "Abrir la configuración de la barra de inicio, para agregar o quitar elementos."
   },
   "modal": {
-        "close": "Cerrar"
+    "close": "Cerrar",
+    "help_title": "Mostrar más información sobre esta pantalla"
+  },
+  "call_to_action": {
+    "next_theme_title": "Prueba el nuevo tema de Trilium",
+    "next_theme_message": "Estas usando actualmente el tema heredado,  ¿Te gustaría probar el nuevo tema?",
+    "next_theme_button": "Prueba el nuevo tema",
+    "background_effects_title": "Los efectos de fondo son ahora estables",
+    "background_effects_message": "En los dispositivos Windows, los efectos de fondo ya son totalmente estables. Los efectos de fondo añaden un toque de color a la interfaz de usuario difuminando el fondo que hay detrás. Esta técnica también se utiliza en otras aplicaciones como el Explorador de Windows.",
+    "background_effects_button": "Activar efectos de fondo",
+    "dismiss": "Desestimar"
   }
 }

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": "یادداشت"
+  }
+}

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ää"
+  }
+}

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

@@ -1,7 +1,6 @@
 {
   "about": {
     "title": "À propos de Trilium Notes",
-        "close": "Fermer",
     "homepage": "Page d'accueil :",
     "app_version": "Version de l'application :",
     "db_version": "Version de la base de données :",
@@ -28,25 +27,22 @@
   "add_link": {
     "add_link": "Ajouter un lien",
     "help_on_links": "Aide sur les liens",
-        "close": "Fermer",
     "note": "Note",
     "search_note": "rechercher une note par son nom",
     "link_title_mirrors": "le titre du lien reflète le titre actuel de la note",
     "link_title_arbitrary": "le titre du lien peut être modifié arbitrairement",
     "link_title": "Titre du lien",
-        "button_add_link": "Ajouter un lien <kbd>Entrée</kbd>"
+    "button_add_link": "Ajouter un lien"
   },
   "branch_prefix": {
     "edit_branch_prefix": "Modifier le préfixe de branche",
     "help_on_tree_prefix": "Aide sur le préfixe de l'arbre",
-        "close": "Fermer",
     "prefix": "Préfixe : ",
     "save": "Sauvegarder",
     "branch_prefix_saved": "Le préfixe de la branche a été enregistré."
   },
   "bulk_actions": {
     "bulk_actions": "Actions groupées",
-        "close": "Fermer",
     "affected_notes": "Notes concernées",
     "include_descendants": "Inclure les descendants des notes sélectionnées",
     "available_actions": "Actions disponibles",
@@ -61,20 +57,18 @@
   },
   "clone_to": {
     "clone_notes_to": "Cloner les notes dans...",
-        "close": "Fermer",
     "help_on_links": "Aide sur les liens",
     "notes_to_clone": "Notes à cloner",
     "target_parent_note": "Note parent cible",
     "search_for_note_by_its_name": "rechercher une note par son nom",
     "cloned_note_prefix_title": "La note clonée sera affichée dans l'arbre des notes avec le préfixe donné",
     "prefix_optional": "Préfixe (facultatif)",
-        "clone_to_selected_note": "Cloner vers la note sélectionnée <kbd>entrer</kbd>",
+    "clone_to_selected_note": "Cloner vers la note sélectionnée",
     "no_path_to_clone_to": "Aucun chemin vers lequel cloner.",
     "note_cloned": "La note \"{{clonedTitle}}\" a été clonée dans \"{{targetTitle}}\""
   },
   "confirm": {
     "confirmation": "Confirmation",
-        "close": "Fermer",
     "cancel": "Annuler",
     "ok": "OK",
     "are_you_sure_remove_note": "Voulez-vous vraiment supprimer la note « {{title}} » de la carte des relations ? ",
@@ -87,9 +81,9 @@
     "delete_all_clones_description": "Supprimer aussi les clones (peut être annulé dans des modifications récentes)",
     "erase_notes_description": "La suppression normale (douce) marque uniquement les notes comme supprimées et elles peuvent être restaurées (dans la boîte de dialogue des Modifications récentes) dans un délai donné. Cocher cette option effacera les notes immédiatement et il ne sera pas possible de les restaurer.",
     "erase_notes_warning": "Efface les notes de manière permanente (ne peut pas être annulée), y compris les clones. L'application va être rechargée.",
-        "notes_to_be_deleted": "Les notes suivantes seront supprimées ({{- noteCount}})",
+    "notes_to_be_deleted": "Les notes suivantes seront supprimées ({{notesCount}})",
     "no_note_to_delete": "Aucune note ne sera supprimée (uniquement les clones).",
-        "broken_relations_to_be_deleted": "Les relations suivantes seront rompues et supprimées ({{- relationCount}})",
+    "broken_relations_to_be_deleted": "Les relations suivantes seront rompues et supprimées ({{ relationCount}})",
     "cancel": "Annuler",
     "ok": "OK",
     "deleted_relation_text": "Note {{- note}} (à supprimer) est référencée dans la relation {{- relation}} provenant de {{- source}}."
@@ -113,20 +107,18 @@
     "format_pdf": "PDF - pour l'impression ou le partage de documents."
   },
   "help": {
-        "fullDocumentation": "Aide (la documentation complète est disponible <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">en ligne</a>)",
-        "close": "Fermer",
     "noteNavigation": "Navigation dans les notes",
-        "goUpDown": "<kbd>HAUT</kbd>, <kbd>BAS</kbd> - aller vers le haut/bas dans la liste des notes",
-        "collapseExpand": "<kbd>GAUCHE</kbd>, <kbd>DROITE</kbd> - réduire/développer le nœud",
+    "goUpDown": "aller vers le haut/bas dans la liste des notes",
+    "collapseExpand": "réduire/développer le nœud",
     "notSet": "non défini",
     "goBackForwards": "reculer/avancer dans l'historique",
     "showJumpToNoteDialog": "afficher la <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">boîte de dialogue \"Aller à la note\"</a>",
     "scrollToActiveNote": "faire défiler jusqu'à la note active",
-        "jumpToParentNote": "<kbd>Retour arrière</kbd> - aller à la note parent",
+    "jumpToParentNote": "aller à la note parent",
     "collapseWholeTree": "réduire tout l'arbre des notes",
     "collapseSubTree": "réduire le sous-arbre",
     "tabShortcuts": "Raccourcis des onglets",
-        "newTabNoteLink": "<kbd>CTRL+clic</kbd> - (ou clic central de la souris) sur le lien de la note ouvre la note dans un nouvel onglet",
+    "newTabNoteLink": "sur le lien de la note ouvre la note dans un nouvel onglet",
     "onlyInDesktop": "Uniquement sur ordinateur (version Electron)",
     "openEmptyTab": "ouvrir un onglet vide",
     "closeActiveTab": "fermer l'onglet actif",
@@ -141,14 +133,14 @@
     "moveNoteUpHierarchy": "déplacer la note vers le haut dans la hiérarchie",
     "multiSelectNote": "sélectionner plusieurs notes au-dessus/au-dessous",
     "selectAllNotes": "sélectionner toutes les notes du niveau actuel",
-        "selectNote": "<kbd>Shift+clic</kbd> - sélectionner une note",
+    "selectNote": "sélectionner une note",
     "copyNotes": "copier la note active (ou la sélection actuelle) dans le presse-papiers (utilisé pour le <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">clonage</a>)",
     "cutNotes": "couper la note actuelle (ou la sélection actuelle) dans le presse-papiers (utilisé pour déplacer les notes)",
     "pasteNotes": "coller la ou les notes en tant que sous-note dans la note active (qui est soit déplacée, soit clonée selon qu'elle a été copiée ou coupée dans le presse-papiers)",
     "deleteNotes": "supprimer une note / un sous-arbre",
     "editingNotes": "Édition des notes",
     "editNoteTitle": "dans le volet de l'arborescence, basculera du volet au titre de la note. Presser Entrer à partir du titre de la note basculera vers l’éditeur de texte. <kbd>Ctrl+.</kbd> bascule de l'éditeur au volet arborescent.",
-        "createEditLink": "<kbd>Ctrl+K</kbd> - créer/éditer un lien externe",
+    "createEditLink": "créer/éditer un lien externe",
     "createInternalLink": "créer un lien interne",
     "followLink": "suivre le lien sous le curseur",
     "insertDateTime": "insérer la date et l'heure courante à la position du curseur",
@@ -164,11 +156,12 @@
     "showSQLConsole": "afficher la console SQL",
     "other": "Autre",
     "quickSearch": "aller à la recherche rapide",
-        "inPageSearch": "recherche sur la page"
+    "inPageSearch": "recherche sur la page",
+    "title": "Aide-mémoire",
+    "newTabWithActivationNoteLink": "Lorsqu’on clique sur un lien de note, celle-ci s’ouvre et devient active dans un nouvel onglet"
   },
   "import": {
     "importIntoNote": "Importer dans la note",
-        "close": "Fermer",
     "chooseImportFile": "Choisissez le fichier à importer",
     "importDescription": "Le contenu du ou des fichiers sélectionnés sera importé en tant que note(s) enfant dans",
     "options": "Options",
@@ -195,14 +188,13 @@
   },
   "include_note": {
     "dialog_title": "Inclure une note",
-        "close": "Fermer",
     "label_note": "Note",
     "placeholder_search": "rechercher une note par son nom",
     "box_size_prompt": "Taille de la boîte de la note incluse :",
     "box_size_small": "petit (~ 10 lignes)",
     "box_size_medium": "moyen (~ 30 lignes)",
     "box_size_full": "complet (la boîte affiche le texte complet)",
-        "button_include": "Inclure une note <kbd>Entrée</kbd>"
+    "button_include": "Inclure une note"
   },
   "info": {
     "modalTitle": "Message d'information",
@@ -210,42 +202,41 @@
     "okButton": "OK"
   },
   "jump_to_note": {
-        "close": "Fermer",
-        "search_button": "Rechercher dans le texte intégral <kbd>Ctrl+Entrée</kbd>"
+    "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",
-        "close": "Fermer",
     "modal_body_text": "En raison du bac à sable du navigateur, il n'est pas possible de lire directement le presse-papiers à partir de JavaScript. Veuillez coller le Markdown à importer dans la zone de texte ci-dessous et cliquez sur le bouton Importer",
-        "import_button": "Importer Ctrl+Entrée",
+    "import_button": "Importer",
     "import_success": "Le contenu Markdown a été importé dans le document."
   },
   "move_to": {
     "dialog_title": "Déplacer les notes vers...",
-        "close": "Fermer",
     "notes_to_move": "Notes à déplacer",
     "target_parent_note": "Note parent cible",
     "search_placeholder": "rechercher une note par son nom",
-        "move_button": "Déplacer vers la note sélectionnée <kbd>entrer</kbd>",
+    "move_button": "Déplacer vers la note sélectionnée",
     "error_no_path": "Aucun chemin vers lequel déplacer.",
     "move_success_message": "Les notes sélectionnées ont été déplacées dans "
   },
   "note_type_chooser": {
     "modal_title": "Choisissez le type de note",
-        "close": "Fermer",
     "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",
-        "close": "Fermer",
     "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 <a class=\"open-password-options-button\" href=\"javascript:\">ici</a> pour ouvrir les Options et définir votre mot de passe."
+    "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",
-        "close": "Fermer",
-        "ok": "OK <kbd>entrer</kbd>",
+    "ok": "OK",
     "defaultTitle": "Prompt"
   },
   "protected_session_password": {
@@ -253,12 +244,11 @@
     "help_title": "Aide sur les notes protégées",
     "close_label": "Fermer",
     "form_label": "Pour procéder à l'action demandée, vous devez démarrer une session protégée en saisissant le mot de passe :",
-        "start_button": "Démarrer une session protégée <kbd>entrer</kbd>"
+    "start_button": "Démarrer une session protégée"
   },
   "recent_changes": {
     "title": "Modifications récentes",
     "erase_notes_button": "Effacer les notes supprimées maintenant",
-        "close": "Fermer",
     "deleted_notes_message": "Les notes supprimées ont été effacées.",
     "no_changes_message": "Aucun changement pour l'instant...",
     "undelete_link": "annuler la suppression",
@@ -269,7 +259,6 @@
     "delete_all_revisions": "Supprimer toutes les versions de cette note",
     "delete_all_button": "Supprimer toutes les versions",
     "help_title": "Aide sur les versions de notes",
-        "close": "Fermer",
     "revision_last_edited": "Cette version a été modifiée pour la dernière fois le {{date}}",
     "confirm_delete_all": "Voulez-vous supprimer toutes les versions de cette note ?",
     "no_revisions": "Aucune version pour cette note pour l'instant...",
@@ -285,11 +274,12 @@
     "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...",
-        "close": "Fermer",
     "sorting_criteria": "Critères de tri",
     "title": "titre",
     "date_created": "date de création",
@@ -303,13 +293,12 @@
     "sort_with_respect_to_different_character_sorting": "trier en fonction de différentes règles de tri et de classement des caractères dans différentes langues ou régions.",
     "natural_sort_language": "Langage de tri naturel",
     "the_language_code_for_natural_sort": "Le code de langue pour le tri naturel, par ex. \"zh-CN\" pour le chinois.",
-        "sort": "Trier <kbd>Entrée</kbd>"
+    "sort": "Trier"
   },
   "upload_attachments": {
     "upload_attachments_to_note": "Téléverser des pièces jointes à la note",
-        "close": "Fermer",
     "choose_files": "Choisir des fichiers",
-        "files_will_be_uploaded": "Les fichiers seront téléversés sous forme de pièces jointes dans",
+    "files_will_be_uploaded": "Les fichiers seront téléversés sous forme de pièces jointes dans {{noteTitle}}",
     "options": "Options",
     "shrink_images": "Réduire les images",
     "upload": "Téléverser",
@@ -398,7 +387,7 @@
     "share_root": "partage cette note à l'adresse racine /share.",
     "share_description": "définir le texte à ajouter à la balise méta HTML pour la description",
     "share_raw": "la note sera servie dans son format brut, sans wrapper HTML",
-        "share_disallow_robot_indexing": "interdira l'indexation par robot de cette note via l'en-tête <code>X-Robots-Tag: noindex</code>",
+    "share_disallow_robot_indexing": "Interdira l'indexation par robot de cette note via l'en-tête <code>X-Robots-Tag: noindex</code>",
     "share_credentials": "exiger des informations d’identification pour accéder à cette note partagée. La valeur devrait être au format « nom d'utilisateur : mot de passe ». N'oubliez pas de rendre cela héritable pour l'appliquer aux notes/images enfants.",
     "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.",
@@ -437,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>",
@@ -557,7 +547,7 @@
   },
   "attachments_actions": {
     "open_externally": "Ouverture externe",
-        "open_externally_title": "Le fichier sera ouvert dans une application externe et les modifications apportées seront surveillées. \nVous pourrez ensuite téléverser la version modifiée dans Trilium.",
+    "open_externally_title": "Le fichier sera ouvert dans une application externe et surveillé pour détecter les modifications. Vous pourrez ensuite téléverser la version modifiée dans Trilium.",
     "open_custom": "Ouvrir avec",
     "open_custom_title": "Le fichier sera ouvert dans une application externe et surveillé pour les modifications. Vous pourrez ensuite téléverser la version modifiée sur Trilium.",
     "download": "Télécharger",
@@ -596,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"
@@ -740,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",
@@ -751,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à...",
@@ -828,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",
@@ -918,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": {
@@ -1087,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)",
@@ -1103,17 +1101,17 @@
     "title": "Thème de l'application",
     "theme_label": "Thème",
     "override_theme_fonts_label": "Remplacer les polices du thème",
-        "auto_theme": "Auto",
-        "light_theme": "Lumière",
-        "dark_theme": "Sombre",
-        "triliumnext": "TriliumNext Beta (Suit le thème du système)",
-        "triliumnext-light": "TriliumNext Beta (Clair)",
-        "triliumnext-dark": "TriliumNext Beta (sombre)",
+    "triliumnext": "Trilium (Suit le thème du système)",
+    "triliumnext-light": "Trilium (Clair)",
+    "triliumnext-dark": "Trilium (sombre)",
     "layout": "Disposition",
     "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)",
@@ -1158,14 +1156,14 @@
   "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."
   },
   "revisions_snapshot_interval": {
     "note_revisions_snapshot_interval_title": "Délai d'enregistrement automatique d'une version de note",
-        "note_revisions_snapshot_description": "Le délai d'enregistrement automatique des versions de note définit le temps avant la création automatique d'une nouvelle version de note. Consultez le <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki</a> pour plus d'informations.",
+    "note_revisions_snapshot_description": "Le délai d'enregistrement automatique des versions de note définit le temps avant la création automatique d'une nouvelle version de note. Consultez le <doc>wiki</doc> pour plus d'informations.",
     "snapshot_time_interval_label": "Délai d'enregistrement automatique de version de note :"
   },
   "revisions_snapshot_limit": {
@@ -1669,5 +1667,19 @@
   },
   "multi_factor_authentication": {
     "oauth_user_email": "Courriel de l'utilisateur : "
+  },
+  "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": ""
   }
 }

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

@@ -0,0 +1 @@
+{}

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

@@ -1,6 +1,5 @@
 {
     "about": {
-        "close": "Chiudi",
         "app_version": "Versione dell'app:",
         "db_version": "Versione DB:",
         "sync_version": "Versione Sync:",
@@ -27,7 +26,6 @@
     },
     "add_link": {
         "add_link": "Aggiungi un collegamento",
-        "close": "Chiudi",
         "note": "Nota",
         "search_note": "cerca una nota per nome",
         "link_title_mirrors": "il titolo del collegamento rispecchia il titolo della nota corrente",
@@ -39,14 +37,12 @@
     "branch_prefix": {
         "edit_branch_prefix": "Modifica il prefisso del ramo",
         "help_on_tree_prefix": "Aiuto sui prefissi dell'Albero",
-        "close": "Chiudi",
         "prefix": "Prefisso: ",
         "save": "Salva",
         "branch_prefix_saved": "Il prefisso del ramo è stato salvato."
     },
     "bulk_actions": {
         "bulk_actions": "Azioni massive",
-        "close": "Chiudi",
         "affected_notes": "Note influenzate",
         "include_descendants": "Includi i discendenti della nota selezionata",
         "available_actions": "Azioni disponibili",
@@ -61,7 +57,6 @@
     },
     "clone_to": {
         "clone_notes_to": "Clona note in...",
-        "close": "Chiudi",
         "help_on_links": "Aiuto sui collegamenti",
         "notes_to_clone": "Note da clonare",
         "target_parent_note": "Nodo padre obiettivo",
@@ -73,7 +68,6 @@
         "note_cloned": "La nota \"{{clonedTitle}}\" è stata clonata in \"{{targetTitle}}\""
     },
     "confirm": {
-        "close": "Chiudi",
         "cancel": "Annulla",
         "ok": "OK",
         "confirmation": "Conferma",
@@ -106,47 +100,19 @@
         "choose_export_type": "Scegli prima il tipo di esportazione, per favore",
         "export_in_progress": "Esportazione in corso: {{progressCount}}",
         "export_finished_successfully": "Esportazione terminata con successo.",
-        "format_pdf": "PDF- allo scopo di stampa o esportazione."
-    },
-    "help": {
-        "close": "Chiudi",
-        "fullDocumentation": "Aiuto (la documentazione completa è disponibile <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)"
-    },
-    "import": {
-        "close": "Chiudi"
-    },
-    "include_note": {
-        "close": "Chiudi"
-    },
-    "jump_to_note": {
-        "close": "Chiudi"
-    },
-    "markdown_import": {
-        "close": "Chiudi"
-    },
-    "move_to": {
-        "close": "Chiudi"
-    },
-    "note_type_chooser": {
-        "close": "Chiudi"
+        "format_pdf": "PDF- allo scopo di stampa o esportazione.",
+        "export_type_subtree": "Questa nota e tutti i suoi discendenti",
+        "format_html": "HTML - raccomandato in quanto mantiene tutti i formati",
+        "format_html_zip": "HTML in archivio ZIP - questo è raccomandato in quanto conserva tutta la formattazione.",
+        "format_markdown": "MArkdown - questo conserva la maggior parte della formattazione."
     },
     "password_not_set": {
-        "close": "Chiudi",
         "body1": "Le note protette sono crittografate utilizzando una password utente, ma la password non è stata ancora impostata.",
         "body2": "Per proteggere le note, fare clic su <a class=\"open-password-options-button\" href=\"javascript:\">qui</a> per aprire la finestra di dialogo Opzioni e impostare la password."
     },
     "protected_session_password": {
         "close_label": "Chiudi"
     },
-    "prompt": {
-        "close": "Chiudi"
-    },
-    "recent_changes": {
-        "close": "Chiudi"
-    },
-    "revisions": {
-        "close": "Chiudi"
-    },
     "abstract_bulk_action": {
         "remove_this_search_action": "Rimuovi questa azione di ricerca"
     },

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

@@ -0,0 +1,41 @@
+{
+  "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."
+    }
+  },
+  "add_link": {
+    "add_link": "Dodaj link"
+  },
+  "branch_prefix": {
+    "save": "Zapisz"
+  },
+  "bulk_actions": {
+    "labels": "Etykiety",
+    "notes": "Notatki",
+    "other": "Inne",
+    "relations": "Powiązania"
+  },
+  "confirm": {
+    "ok": "OK",
+    "cancel": "Anuluj"
+  },
+  "delete_notes": {
+    "cancel": "Anuluj",
+    "close": "Zamknij"
+  },
+  "export": {
+    "close": "Zamknij"
+  }
+}

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

@@ -6,7 +6,6 @@
   },
   "about": {
     "title": "Sobre o Trilium Notes",
-        "close": "Fechar",
     "homepage": "Página inicial:",
     "app_version": "Versão do App:",
     "db_version": "Versão do db:",
@@ -33,16 +32,14 @@
   "add_link": {
     "add_link": "Adicionar link",
     "help_on_links": "Ajuda sobre links",
-        "close": "Fechar",
     "note": "Nota",
     "search_note": "pesquisar nota pelo nome",
     "link_title_mirrors": "o título do link reflete o título atual da nota",
     "link_title_arbitrary": "o título do link pode ser alterado livremente",
     "link_title": "Titulo do link",
-        "button_add_link": "Adicionar link <kbd>enter</kbd>"
+    "button_add_link": "Adicionar link"
   },
   "branch_prefix": {
-        "close": "Fechar",
     "prefix": "Prefixo: ",
     "save": "Salvar",
     "edit_branch_prefix": "Editar Prefixo do Branch",
@@ -51,7 +48,6 @@
   },
   "bulk_actions": {
     "bulk_actions": "Ações em massa",
-        "close": "Fechar",
     "affected_notes": "Notas Afetadas",
     "include_descendants": "Incluir notas filhas das notas selecionadas",
     "available_actions": "Ações disponíveis",
@@ -66,7 +62,6 @@
   },
   "clone_to": {
     "clone_notes_to": "Clonar notas para...",
-        "close": "Fechar",
     "help_on_links": "Ajuda sobre links",
     "notes_to_clone": "Notas para clonar",
     "search_for_note_by_its_name": "pesquisar nota pelo nome",
@@ -74,7 +69,7 @@
     "prefix_optional": "Prefixo (opcional)",
     "no_path_to_clone_to": "Nenhum caminho para clonar.",
     "target_parent_note": "Nota pai-alvo",
-        "clone_to_selected_note": "Clonar para a nota selecionada <kbd>enter</kbd>",
+    "clone_to_selected_note": "Clonar para a nota selecionada",
     "note_cloned": "A nota \"{{clonedTitle}}\" foi clonada para \"{{targetTitle}}\""
   },
   "ai_llm": {
@@ -87,7 +82,6 @@
   },
   "confirm": {
     "confirmation": "Confirmação",
-        "close": "Fechar",
     "cancel": "Cancelar",
     "ok": "OK",
     "are_you_sure_remove_note": "Tem certeza de que deseja remover a nota '{{title}}' do mapa de relações? ",
@@ -100,9 +94,9 @@
     "delete_all_clones_description": "Excluir também todos os clones (pode ser desfeito em alterações recentes)",
     "erase_notes_description": "A exclusão normal (suave) apenas marca as notas como excluídas, permitindo que sejam recuperadas (no diálogo de alterações recentes) dentro de um período de tempo. Se esta opção for marcada, as notas serão apagadas imediatamente e não será possível restaurá-las.",
     "erase_notes_warning": "Apagar notas permanentemente (não pode ser desfeito), incluindo todos os clones. Isso forçará o recarregamento do aplicativo.",
-        "notes_to_be_deleted": "As seguintes notas serão excluídas ({{- noteCount}})",
+    "notes_to_be_deleted": "As seguintes notas serão excluídas ({{notesCount}})",
     "no_note_to_delete": "Nenhuma nota será excluída (apenas os clones).",
-        "broken_relations_to_be_deleted": "As seguintes relações serão quebradas e excluídas ({{- relationCount}})",
+    "broken_relations_to_be_deleted": "As seguintes relações serão quebradas e excluídas ({{ relationCount}})",
     "cancel": "Cancelar",
     "ok": "OK",
     "deleted_relation_text": "A nota {{- note}} (a ser excluída) está referenciada pela relação {{- relation}} originada de {{- source}}."
@@ -126,21 +120,19 @@
     "format_pdf": "PDF – para impressão ou compartilhamento."
   },
   "help": {
-        "fullDocumentation": "Ajuda (a documentação completa está disponível <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
-        "close": "Fechar",
     "noteNavigation": "Navegação de notas",
-        "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> – subir/descer na lista de notas",
-        "collapseExpand": "<kbd>ESQUERDA</kbd>, <kbd>DIREITA</kbd> – recolher/expandir nó",
+    "goUpDown": "subir/descer na lista de notas",
+    "collapseExpand": "recolher/expandir nó",
     "notSet": "não definido",
     "goBackForwards": "voltar / avançar no histórico",
     "showJumpToNoteDialog": "mostrar diálogo <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Ir para\"</a>",
     "scrollToActiveNote": "rolar até a nota atual",
-        "jumpToParentNote": "<kbd>Backspace</kbd> – ir para a nota pai",
+    "jumpToParentNote": "ir para a nota pai",
     "collapseWholeTree": "recolher toda a árvore de notas",
     "collapseSubTree": "recolher subárvore",
     "tabShortcuts": "Atalhos de abas",
-        "newTabNoteLink": "<kbd>Ctrl+clique</kbd> – (ou <kbd>clique com o botão do meio do mouse</kbd>) em um link de nota abre a nota em uma nova aba",
-        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+clique</kbd> – (ou <kbd>Shift+clique com o botão do meio do mouse</kbd>) em um link de nota abre e ativa a nota em uma nova aba",
+    "newTabNoteLink": "em um link de nota abre a nota em uma nova aba",
+    "newTabWithActivationNoteLink": "em um link de nota abre e ativa a nota em uma nova aba",
     "onlyInDesktop": "Apenas na versão para desktop (compilação Electron)",
     "openEmptyTab": "abrir aba vazia",
     "closeActiveTab": "fechar aba ativa",
@@ -155,14 +147,14 @@
     "moveNoteUpHierarchy": "mover nota para cima na hierarquia",
     "multiSelectNote": "selecionar múltiplas notas acima/abaixo",
     "selectAllNotes": "selecionar todas as notas no nível atual",
-        "selectNote": "<kbd>Shift+clique</kbd> - selecionar nota",
+    "selectNote": "selecionar nota",
     "copyNotes": "copiar nota ativa (ou seleção atual) para a área de transferência (usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">clonar</a>)",
     "cutNotes": "recortar nota atual (ou seleção atual) para a área de transferência (usado para mover notas)",
     "pasteNotes": "colar nota(s) como subnota dentro da nota ativa (o que pode ser mover ou clonar dependendo se foi copiado ou recortado para a área de transferência)",
     "deleteNotes": "excluir nota / subárvore",
     "editingNotes": "Edição de notas",
     "editNoteTitle": "no painel de árvore, a navegação mudará do painel de árvore para o título da nota. Pressionar Enter no título da nota mudará o foco para o editor de texto. <kbd>Ctrl+.</kbd> mudará o foco de volta do editor para o painel de árvore.",
-        "createEditLink": "<kbd>Ctrl+K</kbd> - criar / editar link externo",
+    "createEditLink": "criar / editar link externo",
     "createInternalLink": "criar link interno",
     "followLink": "seguir link sob o cursor",
     "insertDateTime": "inserir data e hora atual na posição do cursor",
@@ -178,11 +170,11 @@
     "showSQLConsole": "mostrar console SQL",
     "other": "Outros",
     "quickSearch": "focar no campo de pesquisa rápida",
-        "inPageSearch": "pesquisa na página"
+    "inPageSearch": "pesquisa na página",
+    "title": "Folha de Dicas"
   },
   "import": {
     "importIntoNote": "Importar para a nota",
-        "close": "Fechar",
     "chooseImportFile": "Escolher arquivo para importar",
     "importDescription": "O conteúdo do(s) arquivo(s) selecionado(s) será importado como nota(s) filha(s) em",
     "options": "Opções",
@@ -209,14 +201,13 @@
   },
   "include_note": {
     "dialog_title": "Incluir nota",
-        "close": "Fechar",
     "label_note": "Nota",
     "placeholder_search": "pesquisar nota pelo nome",
     "box_size_prompt": "Dimensão da caixa da nota incluída:",
     "box_size_small": "pequeno (~ 10 linhas)",
     "box_size_medium": "médio (~ 30 linhas)",
     "box_size_full": "completo (a caixa exibe o texto completo)",
-        "button_include": "Incluir nota <kbd>enter</kbd>"
+    "button_include": "Incluir nota"
   },
   "info": {
     "modalTitle": "Mensagem informativa",
@@ -225,23 +216,20 @@
   },
   "jump_to_note": {
     "search_placeholder": "Pesquise uma nota pelo nome ou digite > para comandos...",
-        "close": "Fechar",
-        "search_button": "Pesquisar em texto completo <kbd>Ctrl+Enter</kbd>"
+    "search_button": "Pesquisar em texto completo"
   },
   "markdown_import": {
     "dialog_title": "Importar Markdown",
-        "close": "Fechar",
     "modal_body_text": "Por motivos de segurança (sandbox do navegador), o JavaScript não pode acessar diretamente a área de transferência. Por favor, cole o conteúdo Markdown na área de texto abaixo e clique em Importar",
-        "import_button": "Importar Ctrl+Enter",
+    "import_button": "Importar",
     "import_success": "O conteúdo Markdown foi importado para o documento."
   },
   "move_to": {
     "dialog_title": "Mover notas para...",
-        "close": "Fechar",
     "notes_to_move": "Notas para mover",
     "target_parent_note": "Nota pai-alvo",
     "search_placeholder": "pesquisar nota pelo nome",
-        "move_button": "Mover para a nota selecionada <kbd>enter</kbd>",
+    "move_button": "Mover para a nota selecionada",
     "error_no_path": "Nenhum caminho para mover.",
     "move_success_message": "As notas selecionadas foram movidas para "
   },
@@ -249,20 +237,19 @@
     "change_path_prompt": "Alterar onde criar a nova nota:",
     "search_placeholder": "buscar caminho pelo nome (valor padrão se não for preenchido)",
     "modal_title": "Escolher tipo de nota",
-        "close": "Fechar",
     "modal_body": "Escolha o tipo/modelo da nova nota:",
-        "templates": "Modelos:"
+    "templates": "Modelos",
+    "builtin_templates": "Modelos Incorporados"
   },
   "password_not_set": {
     "title": "A senha não está definida",
-        "close": "Fechar",
     "body1": "Notas protegidas são criptografadas usando uma senha do usuário, mas a senha ainda não foi definida.",
-        "body2": "Para poder proteger notas, clique <a class=\"open-password-options-button\" href=\"javascript:\">aqui</a> para abrir a caixa de diálogo de Opções e definir sua senha."
+    "body2": "Para poder proteger notas, clique no botão abaixo para abrir a caixa de diálogo de Opções e definir sua senha.",
+    "go_to_password_options": "Ir para opções de Senha"
   },
   "prompt": {
     "title": "Prompt",
-        "close": "Fechar",
-        "ok": "OK <kbd>enter</kbd>",
+    "ok": "OK",
     "defaultTitle": "Prompt"
   },
   "protected_session_password": {
@@ -270,12 +257,11 @@
     "help_title": "Ajuda sobre notas protegidas",
     "close_label": "Fechar",
     "form_label": "Para prosseguir com a ação solicitada, você precisa iniciar uma sessão protegida digitando a senha:",
-        "start_button": "Iniciar sessão protegida <kbd>enter</kbd>"
+    "start_button": "Iniciar sessão protegida"
   },
   "recent_changes": {
     "title": "Alterações recentes",
     "erase_notes_button": "Remover permanentemente as notas excluídas agora",
-        "close": "Fechar",
     "deleted_notes_message": "As notas excluídas foram removidas permanentemente.",
     "no_changes_message": "Nenhuma alteração ainda...",
     "undelete_link": "Restaurar",
@@ -286,7 +272,6 @@
     "delete_all_revisions": "Excluir todas as versões desta nota",
     "delete_all_button": "Excluir todas as versões",
     "help_title": "Ajuda sobre as versões da nota",
-        "close": "Fechar",
     "revision_last_edited": "Esta versão foi editada pela última vez em {{date}}",
     "confirm_delete_all": "Você quer excluir todas as versões desta nota?",
     "no_revisions": "Ainda não há versões para esta nota...",
@@ -308,7 +293,6 @@
   },
   "sort_child_notes": {
     "sort_children_by": "Ordenar notas filhas por...",
-        "close": "Fechar",
     "sorting_criteria": "Critérios de ordenação",
     "title": "título",
     "date_created": "data de criação",
@@ -322,13 +306,12 @@
     "sort_with_respect_to_different_character_sorting": "classificar de acordo com diferentes regras de ordenação de caracteres e colação em diferentes idiomas ou regiões.",
     "natural_sort_language": "Linguagem da ordenação natural",
     "the_language_code_for_natural_sort": "O código do idioma para ordenação natural, por exemplo, \"zh-CN\" para chinês.",
-        "sort": "Ordenar <kbd>enter</kbd>"
+    "sort": "Ordenar"
   },
   "upload_attachments": {
     "upload_attachments_to_note": "Enviar anexos para a nota",
-        "close": "Fechar",
     "choose_files": "Escolher arquivos",
-        "files_will_be_uploaded": "Os arquivos serão enviados como anexos para",
+    "files_will_be_uploaded": "Os arquivos serão enviados como anexos para {{noteTitle}}",
     "options": "Opções",
     "shrink_images": "Reduzir imagens",
     "upload": "Enviar",
@@ -411,6 +394,21 @@
     "sql_console_home": "localização padrão das notas do console SQL",
     "bookmark_folder": "nota com este rótulo aparecerá nos favoritos como uma pasta (permitindo acesso aos seus filhos)",
     "share_hidden_from_tree": "esta nota está oculta na árvore de navegação à esquerda, mas ainda pode ser acessada via sua URL",
-        "share_external_link": "a nota funcionará como um link para um site externo na árvore de compartilhamento"
+    "share_external_link": "a nota funcionará como um link para um site externo na árvore de compartilhamento",
+    "share_alias": "defina um alias por meio do qual a nota ficará disponível em https://your_trilium_host/share/[your_alias]",
+    "share_omit_default_css": "o CSS padrão da página de compartilhamento será omitido. Use quando você fizer alterações extensas de estilo.",
+    "share_root": "marca a nota que é servida na raiz de /share.",
+    "share_description": "defina o texto a ser adicionado à meta tag HTML \"description\"",
+    "share_raw": "a nota será servida em seu formato bruto, sem o wrapper HTML",
+    "share_disallow_robot_indexing": "impedirá que robôs indexem esta nota por meio do cabeçalho <code>X-Robots-Tag: noindex</code>",
+    "share_credentials": "exigir credenciais para acessar esta nota compartilhada. O valor deve estar no formato 'usuário:senha'. Não se esqueça de tornar esta configuração herdável para que seja aplicada às notas-filhas/imagens.",
+    "share_index": "notas com este rótulo irão listar todas as raízes das notas compartilhadas",
+    "display_relations": "nomes das relações separados por vírgula que devem ser exibidos. Todas as outras serão ocultadas.",
+    "hide_relations": "nomes das relações separados por vírgula que devem ser ocultados. Todas as outras serão exibidas.",
+    "title_template": "Título padrão das notas criadas como filhas desta nota. O valor é avaliado como uma string JavaScript e pode ser enriquecido com conteúdo dinâmico usando as variáveis injetadas <code>now</code> e <code>parentNote</code>. Exemplos:\n\n<ul>\n    <li><code>${parentNote.getLabelValue('authorName')}'s literary works</code></li>\n    <li><code>Log for ${now.format('YYYY-MM-DD HH:mm:ss')}</code></li>\n</ul>\n\nVeja a <a href=\"https://triliumnext.github.io/Docs/Wiki/default-note-title.html\">wiki com detalhes</a>, a documentação da API para <a href=\"https://zadam.github.io/trilium/backend_api/Note.html\">parentNote</a> e para <a href=\"https://day.js.org/docs/en/display/format\">now</a> para mais informações.",
+    "template": "Esta nota aparecerá na seleção de modelos disponíveis ao criar uma nova nota",
+    "toc": "<code>#toc</code> ou <code>#toc=show</code> irá forçar a exibição do Sumário, <code>#toc=hide</code> irá forçar que ele fique oculto. Se o rótulo não existir, será considerado o ajuste global",
+    "color": "define a cor da nota na árvore de notas, links etc. Use qualquer valor de cor CSS válido, como 'red' ou #a13d5f",
+    "keyboard_shortcut": "Define um atalho de teclado que irá pular imediatamente para esta nota. Exemplo: 'ctrl+alt+e'. É necessário recarregar o frontend para que a alteração tenha efeito."
   }
 }

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

@@ -7,8 +7,7 @@
     "sync_version": "Versiune sincronizare:",
     "build_date": "Data compilării:",
     "build_revision": "Revizia compilării:",
-        "data_directory": "Directorul de date:",
-        "close": "Închide"
+    "data_directory": "Directorul de date:"
   },
   "abstract_bulk_action": {
     "remove_this_search_action": "Înlătură acesată acțiune la căutare"
@@ -30,14 +29,13 @@
   },
   "add_link": {
     "add_link": "Adaugă legătură",
-        "close": "Închide",
     "help_on_links": "Informații despre legături",
     "link_title": "Titlu legătură",
     "link_title_arbitrary": "titlul legăturii poate fi schimbat în mod arbitrar",
     "link_title_mirrors": "titlul legăturii corespunde titlul curent al notiței",
     "note": "Notiță",
     "search_note": "căutați notița după nume",
-        "button_add_link": "Adaugă legătură <kbd>Enter</kbd>"
+    "button_add_link": "Adaugă legătură"
   },
   "add_relation": {
     "add_relation": "Adaugă relație",
@@ -296,7 +294,6 @@
   },
   "branch_prefix": {
     "branch_prefix_saved": "Prefixul ramurii a fost salvat.",
-        "close": "Închide",
     "edit_branch_prefix": "Editează prefixul ramurii",
     "help_on_tree_prefix": "Informații despre prefixe de ierarhie",
     "prefix": "Prefix: ",
@@ -308,7 +305,6 @@
     "bulk_actions": "Acțiuni în masă",
     "bulk_actions_executed": "Acțiunile în masă au fost executate cu succes.",
     "chosen_actions": "Acțiuni selectate",
-        "close": "Închide",
     "execute_bulk_actions": "Execută acțiunile în masă",
     "include_descendants": "Include descendenții notiței selectate",
     "none_yet": "Nicio acțiune... adăugați una printr-un click pe cele disponibile mai jos.",
@@ -342,7 +338,7 @@
   },
   "clone_to": {
     "clone_notes_to": "Clonează notițele către...",
-        "clone_to_selected_note": "Clonează notița selectată <kbd>enter</kbd>",
+    "clone_to_selected_note": "Clonează notița selectată",
     "cloned_note_prefix_title": "Notița clonată va fi afișată în ierarhia notiței utilizând prefixul dat",
     "help_on_links": "Informații despre legături",
     "no_path_to_clone_to": "Nicio cale de clonat.",
@@ -350,8 +346,7 @@
     "notes_to_clone": "Notițe de clonat",
     "prefix_optional": "Prefix (opțional)",
     "search_for_note_by_its_name": "căutați notița după nume acesteia",
-        "target_parent_note": "Notița părinte țintă",
-        "close": "Închide"
+    "target_parent_note": "Notița părinte țintă"
   },
   "close_pane_button": {
     "close_this_pane": "Închide acest panou"
@@ -378,8 +373,7 @@
     "cancel": "Anulează",
     "confirmation": "Confirm",
     "if_you_dont_check": "Dacă această opțiune nu este bifată, notița va fi ștearsă doar din harta de relații.",
-        "ok": "OK",
-        "close": "Închide"
+    "ok": "OK"
   },
   "consistency_checks": {
     "find_and_fix_button": "Caută și repară probleme de consistență",
@@ -436,14 +430,14 @@
     "undelete_notes_instruction": "După ștergere, se pot recupera din ecranul Schimbări recente."
   },
   "delete_notes": {
-        "broken_relations_to_be_deleted": "Următoarele relații vor fi întrerupte și șterse ({{- relationCount}})",
+    "broken_relations_to_be_deleted": "Următoarele relații vor fi întrerupte și șterse ({{ relationCount}})",
     "cancel": "Anulează",
     "delete_all_clones_description": "Șterge și toate clonele (se pot recupera în ecranul Schimbări recente)",
     "delete_notes_preview": "Previzualizare ștergerea notițelor",
     "erase_notes_description": "Ștergerea obișnuită doar marchează notițele ca fiind șterse și pot fi recuperate (în ecranul Schimbări recente) pentru o perioadă de timp. Dacă se bifează această opțiune, notițele vor fi șterse imediat fără posibilitatea de a le recupera.",
     "erase_notes_warning": "Șterge notițele permanent (nu se mai pot recupera), incluzând toate clonele. Va forța reîncărcarea aplicației.",
     "no_note_to_delete": "Nicio notiță nu va fi ștearsă (doar clonele).",
-        "notes_to_be_deleted": "Următoarele notițe vor fi șterse ({{- noteCount}})",
+    "notes_to_be_deleted": "Următoarele notițe vor fi șterse ({{notesCount}})",
     "ok": "OK",
     "deleted_relation_text": "Notița {{- note}} ce va fi ștearsă este referențiată de relația {{- relation}}, originând din {{- source}}.",
     "close": "Închide"
@@ -615,13 +609,12 @@
     "activatePreviousTab": "activează tabul anterior",
     "blockQuote": "începeți un rând cu <code>></code> urmat de spațiu pentru un bloc de citat",
     "bulletList": "<code>*</code> sau <code>-</code> urmat de spațiu pentru o listă punctată",
-        "close": "Închide",
     "closeActiveTab": "închide tabul activ",
-        "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - minimizează/expandează nodul",
+    "collapseExpand": "minimizează/expandează nodul",
     "collapseSubTree": "minimizează subarborele",
     "collapseWholeTree": "minimizează întregul arbore de notițe",
     "copyNotes": "copiază notița activă (sau selecția curentă) în clipboard (utilizat pentru <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">clonare</a>)",
-        "createEditLink": "<kbd>Ctrl+K</kbd> - crează/editează legătură externă",
+    "createEditLink": "crează/editează legătură externă",
     "createInternalLink": "crează legătură internă",
     "createNoteAfter": "crează o nouă notiță după notița activă",
     "createNoteInto": "crează o subnotiță în notița activă",
@@ -632,20 +625,19 @@
     "editNoteTitle": "va sări de la arborele de notițe către titlul notiței. Enter de la titlul notiței va sări către editorul de text. <kbd>Ctrl+.</kbd> va sări înapoi de la editor către arborele de notițe.",
     "editingNotes": "Editarea notițelor",
     "followLink": "urmărește link-ul sub cursor",
-        "fullDocumentation": "Instrucțiuni (documentația completă se regăsește <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
     "goBackForwards": "mergi înapoi/înainte în istoric",
-        "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> - mergi sus/jos în lista de notițe",
+    "goUpDown": "mergi sus/jos în lista de notițe",
     "headings": "<code>##</code>, <code>###</code>, <code>####</code>  etc. urmat de spațiu pentru titluri",
     "inPageSearch": "caută în interiorul paginii",
     "insertDateTime": "inserează data și timpul curente la poziția cursorului",
-        "jumpToParentNote": "<kbd>Backspace</kbd> - sari la pagina părinte",
+    "jumpToParentNote": "sari la pagina părinte",
     "jumpToTreePane": "sari către arborele de notițe și scrolează către notița activă",
     "markdownAutoformat": "Formatare în stil Markdown",
     "moveNoteUpDown": "mută notița sus/jos în lista de notițe",
     "moveNoteUpHierarchy": "mută notița mai sus în ierarhie",
     "movingCloningNotes": "Mutarea/clonarea notițelor",
     "multiSelectNote": "selectează multiplu notița de sus/jos",
-        "newTabNoteLink": "<kbd>CTRL+clic</kbd> - (sau clic mijlociu) pe o legătură către o notiță va deschide notița într-un tab nou",
+    "newTabNoteLink": "pe o legătură către o notiță va deschide notița într-un tab nou",
     "notSet": "nesetat",
     "noteNavigation": "Navigarea printre notițe",
     "numberedList": "<kbd>1.</code> sau <code>1)</code> urmat de spațiu pentru o listă numerotată",
@@ -657,13 +649,14 @@
     "reloadFrontend": "reîncarcă interfața Trilium",
     "scrollToActiveNote": "scrolează la notița activă",
     "selectAllNotes": "selectează toate notițele din nivelul curent",
-        "selectNote": "<kbd>Shift+Click</kbd> - selectează notița",
+    "selectNote": "selectează notița",
     "showDevTools": "afișează instrumentele de dezvoltatori",
     "showJumpToNoteDialog": "afișează <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">ecranul „Sari la”</a>",
     "showSQLConsole": "afișează consola SQL",
     "tabShortcuts": "Scurtături pentru tab-uri",
     "troubleshooting": "Unelte pentru depanare",
-        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+click</kbd> - (sau <kbd>Shift+click mouse mijlociu</kbd>) 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"
@@ -718,7 +711,6 @@
   },
   "import": {
     "chooseImportFile": "Selectați fișierul de importat",
-        "close": "Închide",
     "codeImportedAsCode": "Importă fișiere identificate drept cod sursă (e.g. <code>.json</code>) drept notițe de tip cod dacă nu este clar din metainformații",
     "explodeArchives": "Citește conținutul arhivelor <code>.zip</code>, <code>.enex</code> și <code>.opml</code>.",
     "explodeArchivesTooltip": "Dacă această opțiune este bifată atunci Trilium va citi fișiere de tip <code>.zip</code>, <code>.enex</code> și <code>.opml</code> și va crea notițe din fișierele din interiorul acestor arhive. Dacă este nebifat, atunci Trilium va atașa arhiva propriu-zisă la notiță.",
@@ -751,11 +743,10 @@
     "box_size_medium": "mediu (~ 30 de rânduri)",
     "box_size_prompt": "Dimensiunea căsuței notiței incluse:",
     "box_size_small": "mică (~ 10 rânduri)",
-        "button_include": "Include notița <kbd>Enter</kbd>",
+    "button_include": "Include notița",
     "dialog_title": "Includere notița",
     "label_note": "Notiță",
-        "placeholder_search": "căutați notița după denumirea ei",
-        "close": "Închide"
+    "placeholder_search": "căutați notița după denumirea ei"
   },
   "info": {
     "closeButton": "Închide",
@@ -767,8 +758,7 @@
     "title": "Atribute moștenite"
   },
   "jump_to_note": {
-        "search_button": "Caută în întregul conținut <kbd>Ctrl+Enter</kbd>",
-        "close": "Închide",
+    "search_button": "Caută în întregul conținut",
     "search_placeholder": "Căutați notițe după nume sau tastați > pentru comenzi..."
   },
   "left_pane_toggle": {
@@ -781,10 +771,9 @@
   },
   "markdown_import": {
     "dialog_title": "Importă Markdown",
-        "import_button": "Importă Ctrl+Enter",
+    "import_button": "Importă",
     "import_success": "Conținutul Markdown a fost importat în document.",
-        "modal_body_text": "Din cauza limitărilor la nivel de navigator, nu este posibilă citirea clipboard-ului din JavaScript. Inserați Markdown-ul pentru a-l importa în caseta de mai jos și dați clic pe butonul Import",
-        "close": "Închide"
+    "modal_body_text": "Din cauza limitărilor la nivel de navigator, nu este posibilă citirea clipboard-ului din JavaScript. Inserați Markdown-ul pentru a-l importa în caseta de mai jos și dați clic pe butonul Import"
   },
   "max_content_width": {
     "apply_changes_description": "Pentru a aplica schimbările de lățime a conținutului, dați click pe",
@@ -817,12 +806,11 @@
   "move_to": {
     "dialog_title": "Mută notițele în...",
     "error_no_path": "Nicio cale la care să poată fi mutate.",
-        "move_button": "Mută la notița selectată <kbd>enter</kbd>",
+    "move_button": "Mută la notița selectată",
     "move_success_message": "Notițele selectate au fost mutate în",
     "notes_to_move": "Notițe de mutat",
     "search_placeholder": "căutați notița după denumirea ei",
-        "target_parent_note": "Notița părinte destinație",
-        "close": "Închide"
+    "target_parent_note": "Notița părinte destinație"
   },
   "native_title_bar": {
     "disabled": "dezactivată",
@@ -897,10 +885,10 @@
   "note_type_chooser": {
     "modal_body": "Selectați tipul notiței/șablonul pentru noua notiță:",
     "modal_title": "Selectați tipul notiței",
-        "templates": "Șabloane:",
-        "close": "Închide",
+    "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ă"
@@ -954,9 +942,9 @@
   },
   "password_not_set": {
     "body1": "Notițele protejate sunt criptate utilizând parola de utilizator, dar nu a fost setată nicio parolă.",
-        "body2": "Pentru a putea să protejați notițe, clic <a class=\"open-password-options-button\" href=\"javascript:\">aici</a> pentru a deschide ecranul de opțiuni și pentru a seta parola.",
     "title": "Parola nu este setată",
-        "close": "Închide"
+    "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",
@@ -971,9 +959,8 @@
   },
   "prompt": {
     "defaultTitle": "Aviz",
-        "ok": "OK <kbd>enter</kbd>",
-        "title": "Aviz",
-        "close": "Închide"
+    "ok": "OK",
+    "title": "Aviz"
   },
   "protected_session": {
     "enter_password_instruction": "Afișarea notițelor protejate necesită introducerea parolei:",
@@ -992,7 +979,7 @@
     "form_label": "Pentru a putea continua cu acțiunea cerută este nevoie să fie pornită sesiunea protejată prin introducerea parolei:",
     "help_title": "Informații despre notițe protejate",
     "modal_title": "Sesiune protejată",
-        "start_button": "Pornește sesiunea protejată <kbd>enter</kbd>"
+    "start_button": "Pornește sesiunea protejată"
   },
   "protected_session_status": {
     "active": "Sesiunea protejată este activă. Clic pentru a închide sesiunea protejată.",
@@ -1004,8 +991,7 @@
     "erase_notes_button": "Elimină notițele șterse",
     "no_changes_message": "Încă nicio schimbare...",
     "title": "Modificări recente",
-        "undelete_link": "restaurare",
-        "close": "Închide"
+    "undelete_link": "restaurare"
   },
   "relation_map": {
     "cannot_match_transform": "Nu s-a putut identifica transformarea: {{transform}}",
@@ -1084,14 +1070,13 @@
     "revisions_deleted": "Notița reviziei a fost ștearsă.",
     "maximum_revisions": "Numărul maxim de revizii pentru notița curentă: {{number}}.",
     "settings": "Setări revizii ale notițelor",
-        "snapshot_interval": "Intervalul de creare a reviziilor pentru notițe: {{seconds}}s.",
-        "close": "Închide"
+    "snapshot_interval": "Intervalul de creare a reviziilor pentru notițe: {{seconds}}s."
   },
   "revisions_button": {
     "note_revisions": "Revizii ale notiței"
   },
   "revisions_snapshot_interval": {
-        "note_revisions_snapshot_description": "Intervalul de salvare a reviziilor este timpul după care se crează o nouă revizie a unei notițe. Vedeți <a href=\"https://triliumnext.github.io/Docs/Wiki/note-revisions.html\" class=\"external\">wiki-ul</a> pentru mai multe informații.",
+    "note_revisions_snapshot_description": "Intervalul de salvare a reviziilor este timpul după care se crează o nouă revizie a unei notițe. Vedeți <doc>wiki-ul</doc> pentru mai multe informații.",
     "note_revisions_snapshot_interval_title": "Intervalul de salvare a reviziilor",
     "snapshot_time_interval_label": "Intervalul de salvare a reviziilor:"
   },
@@ -1193,15 +1178,14 @@
     "folders": "Dosare",
     "natural_sort": "Ordonare naturală",
     "natural_sort_language": "Limba pentru ordonare naturală",
-        "sort": "Ordonare <kbd>Enter</kbd>",
+    "sort": "Ordonare",
     "sort_children_by": "Ordonează subnotițele după...",
     "sort_folders_at_top": "ordonează dosarele primele",
     "sort_with_respect_to_different_character_sorting": "ordonează respectând regulile de sortare și clasificare diferite în funcție de limbă și regiune.",
     "sorting_criteria": "Criterii de ordonare",
     "sorting_direction": "Direcția de ordonare",
     "the_language_code_for_natural_sort": "Codul limbii pentru ordonarea naturală, e.g. „zn-CN” pentru chineză.",
-        "title": "titlu",
-        "close": "Închide"
+    "title": "titlu"
   },
   "spellcheck": {
     "available_language_codes_label": "Coduri de limbă disponibile:",
@@ -1253,12 +1237,9 @@
     "unit": "caractere"
   },
   "theme": {
-        "auto_theme": "Temă auto (se adaptează la schema de culori a sistemului)",
-        "dark_theme": "Temă întunecată",
-        "light_theme": "Temă luminoasă",
-        "triliumnext": "TriliumNext Beta (se adaptează la schema de culori a sistemului)",
-        "triliumnext-light": "TriliumNext Beta (luminoasă)",
-        "triliumnext-dark": "TriliumNext Beta (întunecată)",
+    "triliumnext": "Trilium (se adaptează la schema de culori a sistemului)",
+    "triliumnext-light": "Trilium (luminoasă)",
+    "triliumnext-dark": "Trilium (întunecată)",
     "override_theme_fonts_label": "Suprascrie fonturile temei",
     "theme_label": "Temă",
     "title": "Tema aplicației",
@@ -1266,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": {
@@ -1311,13 +1295,12 @@
   },
   "upload_attachments": {
     "choose_files": "Selectați fișierele",
-        "files_will_be_uploaded": "Fișierele vor fi încărcate ca atașamente în",
+    "files_will_be_uploaded": "Fișierele vor fi încărcate ca atașamente în {{noteTitle}}",
     "options": "Opțuni",
     "shrink_images": "Micșorează imaginile",
     "tooltip": "Dacă această opțiune este bifată, Trilium va încerca micșorarea imaginilor încărcate prin scalarea și optimizarea lor, aspect ce va putea afecta calitatea imaginilor. Dacă nu este bifată, imaginile vor fi încărcate fără nicio schimbare.",
     "upload": "Încărcare",
-        "upload_attachments_to_note": "Încarcă atașamentele la notiță",
-        "close": "Închide"
+    "upload_attachments_to_note": "Încarcă atașamentele la notiță"
   },
   "vacuum_database": {
     "button_text": "Compactează baza de date",
@@ -1673,10 +1656,6 @@
     "note-has-been-deleted": "Notița a fost ștearsă.",
     "quick-edit": "Editare rapidă"
   },
-    "notes": {
-        "duplicate-note-suffix": "(dupl.)",
-        "duplicate-note-title": "{{- noteTitle }} {{ duplicateNoteSuffix }}"
-    },
   "geo-map-context": {
     "open-location": "Deschide locația",
     "remove-from-map": "Înlătură de pe hartă",
@@ -1731,9 +1710,6 @@
     "description": "Selectați una sau mai multe limbi ce vor apărea în selecția limbii din cadrul secțiunii „Proprietăți de bază” pentru notițele de tip text (editabile sau doar în citire).",
     "title": "Limbi pentru conținutul notițelor"
   },
-    "hidden-subtree": {
-        "localization": "Limbă și regiune"
-    },
   "note_language": {
     "configure-languages": "Configurează limbile...",
     "not_set": "Nedefinită"
@@ -1895,7 +1871,7 @@
   },
   "custom_date_time_format": {
     "title": "Format dată/timp personalizat",
-        "description": "Personalizați formatul de dată și timp inserat prin <kbd></kbd> sau din bara de unelte. Vedeți <a href=\"https://day.js.org/docs/en/display/format\" target=\"_blank\" rel=\"noopener noreferrer\">Documentația Day.js</a> pentru câmpurile de formatare disponibile.",
+    "description": "Personalizați formatul de dată și timp inserat prin <shortcut /> sau din bara de unelte. Vedeți <doc>Documentația Day.js</doc> pentru câmpurile de formatare disponibile.",
     "format_string": "Șir de formatare:",
     "formatted_time": "Data și ora formatate:"
   },
@@ -2014,5 +1990,14 @@
   },
   "content_renderer": {
     "open_externally": "Deschide în afara programului"
+  },
+  "modal": {
+    "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"
   }
 }

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

@@ -0,0 +1,9 @@
+{
+    "about": {
+        "title": "Podrobnosti Trilium Notes",
+        "homepage": "Domača stran:",
+        "app_version": "Verzija aplikacije:",
+        "db_version": "Verzija DB:",
+        "sync_version": "Verzija Sync:"
+    }
+}

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

@@ -1,7 +1,6 @@
 {
     "about": {
         "title": "O Trilium Belеškama",
-        "close": "Zatvori",
         "homepage": "Početna stranica:",
         "app_version": "Verzija aplikacije:",
         "db_version": "Verzija baze podataka:",
@@ -28,7 +27,6 @@
     "add_link": {
         "add_link": "Dodaj link",
         "help_on_links": "Pomoć na linkovima",
-        "close": "Zatvori",
         "note": "Beleška",
         "search_note": "potražite belešku po njenom imenu",
         "link_title_mirrors": "naziv linka preslikava trenutan naziv beleške",
@@ -39,14 +37,12 @@
     "branch_prefix": {
         "edit_branch_prefix": "Izmeni prefiks grane",
         "help_on_tree_prefix": "Pomoć na prefiksu Drveta",
-        "close": "Zatvori",
         "prefix": "Prefiks: ",
         "save": "Sačuvaj",
         "branch_prefix_saved": "Prefiks grane je sačuvan."
     },
     "bulk_actions": {
         "bulk_actions": "Grupne akcije",
-        "close": "Zatvori",
         "affected_notes": "Pogođene beleške",
         "include_descendants": "Obuhvati potomke izabranih beleški",
         "available_actions": "Dostupne akcije",
@@ -61,7 +57,6 @@
     },
     "clone_to": {
         "clone_notes_to": "Klonirajte beleške u...",
-        "close": "Zatvori",
         "help_on_links": "Pomoć na linkovima",
         "notes_to_clone": "Beleške za kloniranje",
         "target_parent_note": "Ciljna nadređena beleška",
@@ -74,7 +69,6 @@
     },
     "confirm": {
         "confirmation": "Potvrda",
-        "close": "Zatvori",
         "cancel": "Otkaži",
         "ok": "U redu",
         "are_you_sure_remove_note": "Da li ste sigurni da želite da uklonite belešku \"{{title}}\" iz mape odnosa? ",
@@ -113,8 +107,6 @@
         "format_pdf": "PDF - za namene štampanja ili deljenja."
     },
     "help": {
-        "fullDocumentation": "Pomoć (puna dokumentacija je dostupna <a class=\"external\" href=\"https://triliumnext.github.io/Docs/\">online</a>)",
-        "close": "Zatvori",
         "noteNavigation": "Navigacija beleški",
         "goUpDown": "<kbd>UP</kbd>, <kbd>DOWN</kbd> - kretanje gore/dole u listi sa beleškama",
         "collapseExpand": "<kbd>LEFT</kbd>, <kbd>RIGHT</kbd> - sakupi/proširi čvor",
@@ -122,12 +114,12 @@
         "goBackForwards": "idi u nazad/napred kroz istoriju",
         "showJumpToNoteDialog": "prikaži <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">\"Idi na\" dijalog</a>",
         "scrollToActiveNote": "skroluj do aktivne beleške",
-        "jumpToParentNote": "<kbd>Backspace</kbd> - idi do nadređene beleške",
+        "jumpToParentNote": "idi do nadređene beleške",
         "collapseWholeTree": "sakupi celo drvo beleški",
         "collapseSubTree": "sakupi pod-drvo",
         "tabShortcuts": "Prečice na karticama",
-        "newTabNoteLink": "<kbd>Ctrl+click</kbd> - (ili <kbd>middle mouse click</kbd>) na link beleške otvara belešku u novoj kartici",
-        "newTabWithActivationNoteLink": "<kbd>Ctrl+Shift+click</kbd> - (ili <kbd>Shift+middle mouse click</kbd>) na link beleške otvara i aktivira belešku u novoj kartici",
+        "newTabNoteLink": "na link beleške otvara belešku u novoj kartici",
+        "newTabWithActivationNoteLink": "na link beleške otvara i aktivira belešku u novoj kartici",
         "onlyInDesktop": "Samo na dektop-u (Electron verzija)",
         "openEmptyTab": "otvori praznu karticu",
         "closeActiveTab": "zatvori aktivnu karticu",
@@ -142,14 +134,14 @@
         "moveNoteUpHierarchy": "pomeri belešku na gore u hijerarhiji",
         "multiSelectNote": "višestruki izbor beleški iznad/ispod",
         "selectAllNotes": "izaberi sve beleške u trenutnom nivou",
-        "selectNote": "<kbd>Shift+click</kbd> - izaberi belešku",
+        "selectNote": "izaberi belešku",
         "copyNotes": "kopiraj aktivnu belešku (ili trenutni izbor) u privremenu memoriju (koristi se za <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">kloniranje</a>)",
         "cutNotes": "iseci trenutnu belešku (ili trenutni izbor) u privremenu memoriju (koristi se za premeštanje beleški)",
         "pasteNotes": "nalepi belešku/e kao podbelešku u aktivnoj belešci (koja se ili premešta ili klonira u zavisnosti od toga da li je beleška kopirana ili isečena u privremenu memoriju)",
         "deleteNotes": "obriši belešku / podstablo",
         "editingNotes": "Izmena beleški",
         "editNoteTitle": "u ravni drveta će se prebaciti sa ravni drveta na naslov beleške. Ulaz sa naslova beleške će prebaciti fokus na uređivač teksta. <kbd>Ctrl+.</kbd> će se vratiti sa uređivača na ravan drveta.",
-        "createEditLink": "<kbd>Ctrl+K</kbd> - napravi / izmeni spoljašnji link",
+        "createEditLink": "napravi / izmeni spoljašnji link",
         "createInternalLink": "napravi unutrašnji link",
         "followLink": "prati link ispod kursora",
         "insertDateTime": "ubaci trenutan datum i vreme na poziciju kursora",
@@ -169,7 +161,6 @@
     },
     "import": {
         "importIntoNote": "Uvezi u belešku",
-        "close": "Zatvori",
         "chooseImportFile": "Izaberi datoteku za uvoz",
         "importDescription": "Sadržaj izabranih datoteka će biti uvezen kao podbeleške u",
         "options": "Opcije",
@@ -196,14 +187,13 @@
     },
     "include_note": {
         "dialog_title": "Uključi belešku",
-        "close": "Zatvori",
         "label_note": "Beleška",
         "placeholder_search": "pretraži belešku po njenom imenu",
         "box_size_prompt": "Veličina kutije priložene beleške:",
         "box_size_small": "mala (~ 10 redova)",
         "box_size_medium": "srednja (~ 30 redova)",
         "box_size_full": "puna (kutija prikazuje ceo tekst)",
-        "button_include": "Uključi belešku <kbd>enter</kbd>"
+        "button_include": "Uključi belešku"
     },
     "info": {
         "modalTitle": "Informativna poruka",
@@ -212,23 +202,20 @@
     },
     "jump_to_note": {
         "search_placeholder": "Pretraži belešku po njenom imenu ili unesi > za komande...",
-        "close": "Zatvori",
         "search_button": "Pretraga u punom tekstu <kbd>Ctrl+Enter</kbd>"
     },
     "markdown_import": {
         "dialog_title": "Uvoz za Markdown",
-        "close": "Zatvori",
         "modal_body_text": "Zbog Sandbox-a pretraživača nije moguće direktno učitati privremenu memoriju iz JavaScript-a. Molimo vas da nalepite Markdown za uvoz u tekstualno polje ispod i kliknete na dugme za uvoz",
-        "import_button": "Uvoz Ctrl+Enter",
+        "import_button": "Uvoz",
         "import_success": "Markdown sadržaj je učitan u dokument."
     },
     "move_to": {
         "dialog_title": "Premesti beleške u ...",
-        "close": "Zatvori",
         "notes_to_move": "Beleške za premeštanje",
         "target_parent_note": "Ciljana nadbeleška",
         "search_placeholder": "potraži belešku po njenom imenu",
-        "move_button": "Pređi na izabranu belešku <kbd>enter</kbd>",
+        "move_button": "Pređi na izabranu belešku",
         "error_no_path": "Nema putanje za premeštanje.",
         "move_success_message": "Izabrane beleške su premeštene u "
     },
@@ -236,19 +223,16 @@
         "change_path_prompt": "Promenite gde će se napraviti nova beleška:",
         "search_placeholder": "pretraži putanju po njenom imenu (podrazumevano ako je prazno)",
         "modal_title": "Izaberite tip beleške",
-        "close": "Zatvori",
         "modal_body": "Izaberite tip beleške / šablon za novu belešku:",
-        "templates": "Šabloni:"
+        "templates": "Šabloni"
     },
     "password_not_set": {
         "title": "Lozinka nije podešena",
-        "close": "Zatvori",
         "body1": "Zaštićene beleške su enkriptovane sa korisničkom lozinkom, ali lozinka još uvek nije podešena.",
         "body2": "Za biste mogli da sačuvate beleške, kliknite <a class=\"open-password-options-button\" href=\"javascript:\">ovde</a> da otvorite dijalog sa Opcijama i podesite svoju lozinku."
     },
     "prompt": {
         "title": "Upit",
-        "close": "Zatvori",
         "ok": "U redu <kbd>enter</kbd>",
         "defaultTitle": "Upit"
     },
@@ -257,12 +241,11 @@
         "help_title": "Pomoć za Zaštićene beleške",
         "close_label": "Zatvori",
         "form_label": "Da biste nastavili sa traženom akcijom moraćete započeti zaštićenu sesiju tako što ćete uneti lozinku:",
-        "start_button": "Započni zaštićenu sesiju <kbd>enter</kbd>"
+        "start_button": "Započni zaštićenu sesiju"
     },
     "recent_changes": {
         "title": "Nedavne promene",
         "erase_notes_button": "Obriši izabrane beleške odmah",
-        "close": "Zatvori",
         "deleted_notes_message": "Obrisane beleške su uklonjene.",
         "no_changes_message": "Još uvek nema izmena...",
         "undelete_link": "poništi brisanje",
@@ -273,7 +256,6 @@
         "delete_all_revisions": "Obriši sve revizije ove beleške",
         "delete_all_button": "Obriši sve revizije",
         "help_title": "Pomoć za Revizije beleški",
-        "close": "Zatvori",
         "revision_last_edited": "Ova revizija je poslednji put izmenjena {{date}}",
         "confirm_delete_all": "Da li želite da obrišete sve revizije ove beleške?",
         "no_revisions": "Još uvek nema revizija za ovu belešku...",
@@ -295,7 +277,6 @@
     },
     "sort_child_notes": {
         "sort_children_by": "Sortiranje podbeleški po...",
-        "close": "Zatvori",
         "sorting_criteria": "Kriterijum za sortiranje",
         "title": "naslov",
         "date_created": "datum kreiranja",
@@ -309,13 +290,12 @@
         "sort_with_respect_to_different_character_sorting": "sortiranje sa poštovanjem različitih pravila sortiranja karaktera i kolacija u različitim jezicima ili regionima.",
         "natural_sort_language": "Jezik za prirodno sortiranje",
         "the_language_code_for_natural_sort": "Kod jezika za prirodno sortiranje, npr. \"zh-CN\" za Kineski.",
-        "sort": "Sortiraj <kbd>enter</kbd>"
+        "sort": "Sortiraj"
     },
     "upload_attachments": {
         "upload_attachments_to_note": "Otpremite priloge uz belešku",
-        "close": "Zatvori",
         "choose_files": "Izaberite datoteke",
-        "files_will_be_uploaded": "Datoteke će biti otpremljene kao prilozi u",
+        "files_will_be_uploaded": "Datoteke će biti otpremljene kao prilozi u {{noteTitle}}",
         "options": "Opcije",
         "shrink_images": "Smanji slike",
         "upload": "Otpremi",

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

@@ -1,71 +1,26 @@
 {
     "about": {
-        "close": "Kapat",
         "homepage": "Giriş sayfası:",
         "app_version": "Uygulama versiyonu:",
         "db_version": "Veritabanı versiyonu:"
     },
-    "add_link": {
-        "close": "Kapat"
-    },
     "branch_prefix": {
-        "close": "Kapat",
         "save": "Kaydet"
     },
-    "bulk_actions": {
-        "close": "Kapat"
-    },
-    "clone_to": {
-        "close": "Kapat"
-    },
-    "confirm": {
-        "close": "Kapat"
-    },
-    "recent_changes": {
-        "close": "Kapat"
-    },
     "delete_notes": {
         "close": "Kapat"
     },
     "export": {
         "close": "Kapat"
     },
-    "help": {
-        "close": "Kapat"
-    },
-    "include_note": {
-        "close": "Kapat"
-    },
     "import": {
-        "close": "Kapat",
         "chooseImportFile": "İçe aktarım dosyası",
         "importDescription": "Seçilen dosya(lar) alt not olarak içe aktarılacaktır"
     },
     "info": {
         "closeButton": "Kapat"
     },
-    "jump_to_note": {
-        "close": "Kapat"
-    },
-    "markdown_import": {
-        "close": "Kapat"
-    },
-    "move_to": {
-        "close": "Kapat"
-    },
-    "note_type_chooser": {
-        "close": "Kapat"
-    },
-    "password_not_set": {
-        "close": "Kapat"
-    },
-    "prompt": {
-        "close": "Kapat"
-    },
     "protected_session_password": {
         "close_label": "Kapat"
-    },
-    "revisions": {
-        "close": "Kapat"
     }
 }

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

@@ -0,0 +1,248 @@
+{
+  "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",
+    "sync_version": "Версія синхронізації:"
+  },
+  "global_menu": {
+    "about": "Про Trilium Notes"
+  },
+  "modal": {
+    "help_title": "Показати більше інформації про це вікно"
+  },
+  "toast": {
+    "critical-error": {
+      "title": "Критична помилка",
+      "message": "Сталася критична помилка, яка перешкоджає запуску клієнтської програми:\n\n{{message}}\n\nНайімовірніше, це спричинено несподіваною помилкою скрипту. Спробуйте запустити програму в безпечному режимі та вирішити проблему."
+    },
+    "widget-error": {
+      "title": "Помилка ініціалізації віджета",
+      "message-custom": "Не вдалося ініціалізувати користувацький віджет із нотатки з ID \"{{id}}\" під назвою \"{{title}}\" через:\n\n{{message}}",
+      "message-unknown": "Невідомий віджет не вдалося ініціалізувати через:\n\n{{message}}"
+    },
+    "bundle-error": {
+      "title": "Не вдалося завантажити власний скрипт",
+      "message": "Скрипт із нотатки з ID \"{{id}}\" під назвою \"{{title}}\" не вдалося виконати через:\n\n{{message}}"
+    }
+  },
+  "bulk_actions": {
+    "bulk_actions": "Масові дії",
+    "affected_notes": "Застосовані нотатки",
+    "available_actions": "Доступні дії",
+    "chosen_actions": "Обрані дії",
+    "execute_bulk_actions": "Виконання масових дій",
+    "bulk_actions_executed": "Масові дії успішно виконано.",
+    "none_yet": "Поки що немає... додайте дію, натиснувши одну з доступних вище.",
+    "include_descendants": "Включити нащадків вибраних нотаток",
+    "labels": "Мітки",
+    "relations": "Відносини",
+    "notes": "Нотатки",
+    "other": "Інше"
+  },
+  "clone_to": {
+    "clone_notes_to": "Клонувати нотатки до...",
+    "target_parent_note": "Цільова батьківська нотатка",
+    "search_for_note_by_its_name": "Знайти нотатку за назвою",
+    "help_on_links": "Допомога з посиланнями",
+    "notes_to_clone": "Нотатки для клонування",
+    "cloned_note_prefix_title": "Клонована нотатка буде відображатися в дереві нотаток із заданим префіксом",
+    "prefix_optional": "Префікс (необов'язково)",
+    "clone_to_selected_note": "Клонувати до вибраної нотатки",
+    "no_path_to_clone_to": "Немає шляху для клонування.",
+    "note_cloned": "Нотатку \"{{clonedTitle}}\" було клоновано в \"{{targetTitle}}\""
+  },
+  "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": "Панель інструментів форматування"
+    }
+  },
+  "confirm": {
+    "confirmation": "Підтвердження",
+    "cancel": "Скасувати",
+    "ok": "ОК",
+    "are_you_sure_remove_note": "Ви впевнені, що хочете видалити нотатку \"{{title}}\" з карти зв'язків? ",
+    "if_you_dont_check": "Якщо ви не позначите цей пункт, нотатку буде видалено лише з карти зв'язків.",
+    "also_delete_note": "Також видалити нотатку"
+  },
+  "delete_notes": {
+    "delete_notes_preview": "Видалити попередній перегляд нотаток",
+    "close": "Закрити",
+    "delete_all_clones_description": "Видалити також усі клони (можна скасувати в останніх змінах)",
+    "erase_notes_description": "Звичайне (м’яке) видалення лише позначає нотатки як видалені, і їх можна відновити (у діалоговому вікні останніх змін) протягом певного періоду часу. Якщо позначити цю опцію, нотатки будуть видалені негайно, і їх неможливо буде відновити.",
+    "erase_notes_warning": "Стерти нотатки назавжди (скасувати не можна), включаючи всі клони. Це призведе до перезавантаження програми.",
+    "notes_to_be_deleted": "Наступні нотатки будуть видалені ({{notesCount}})",
+    "no_note_to_delete": "Жодну нотатку не буде видалено (лише клони).",
+    "broken_relations_to_be_deleted": "Наступні зв'язки будуть розірвані та видалені ({{ relationCount}})",
+    "cancel": "Скасувати",
+    "ok": "ОК",
+    "deleted_relation_text": "Нотатка {{- note}} (буде видалена) посилається на зв'язок {{- relation}}, що походить з {{- source}}."
+  },
+  "export": {
+    "export_note_title": "Експорт нотатки",
+    "close": "Закрити",
+    "export_type_subtree": "Ця нотатка та всі її нащадки",
+    "format_html": "HTML – рекомендовано, оскільки він зберігає всі формати",
+    "format_html_zip": "HTML у ZIP-архіві – це рекомендовано, оскільки це зберігає все форматування.",
+    "format_markdown": "Markdown – це зберігає більшу частину форматування.",
+    "format_opml": "OPML – формат обміну структурами лише для тексту. Форматування, зображення та файли не включено.",
+    "opml_version_1": "OPML версії 1.0 – лише звичайний текст",
+    "opml_version_2": "OPML v2.0 - також дозволяє HTML",
+    "export_type_single": "Тільки ця нотатка без її нащадків",
+    "export": "Експорт",
+    "choose_export_type": "Спочатку виберіть тип експорту",
+    "export_status": "Стан експорту",
+    "export_in_progress": "Триває експорт: {{progressCount}}",
+    "export_finished_successfully": "Експорт успішно завершено.",
+    "format_pdf": "PDF – для друку або спільного використання."
+  },
+  "help": {
+    "title": "Шпаргалка",
+    "noteNavigation": "Навігація по нотатках",
+    "goUpDown": "переміститись вгору/вниз у списку нотаток",
+    "collapseExpand": "згорнути/розгорнути вузол",
+    "notSet": "не встановлено",
+    "goBackForwards": "повернутися назад / вперед в історії",
+    "showJumpToNoteDialog": "показати <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/note-navigation.html#jump-to-note\">діалогове вікно \"Перейти до\"</a>",
+    "scrollToActiveNote": "прокрутити до активної нотатки",
+    "jumpToParentNote": "перейти до батьківської нотатки",
+    "collapseWholeTree": "згорнути все дерево нотаток",
+    "collapseSubTree": "згорнути піддерево",
+    "tabShortcuts": "Швидкі клавіші вкладки",
+    "newTabNoteLink": "посилання на нотатку відкриває нотатку в новій вкладці",
+    "newTabWithActivationNoteLink": "посилання на нотатку відкривається та активує нотатку в новій вкладці",
+    "onlyInDesktop": "Тільки для ПК (збірка Electron)",
+    "openEmptyTab": "відкрити порожню вкладку",
+    "closeActiveTab": "закрити активну вкладку",
+    "activateNextTab": "активувати наступну вкладку",
+    "activatePreviousTab": "активувати попередню вкладку",
+    "creatingNotes": "Створення нотаток",
+    "createNoteAfter": "створити нову нотатку після активної нотатки",
+    "createNoteInto": "створити нову піднотатку в активній нотатці",
+    "editBranchPrefix": "редагувати <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/tree-concepts.html#prefix\">префікс</a> активного клону нотатки",
+    "movingCloningNotes": "Переміщення / клонування нотаток",
+    "moveNoteUpDown": "переміщення нотатки вгору/вниз у списку нотаток",
+    "moveNoteUpHierarchy": "перемістити нотатку вище в ієрархії",
+    "multiSelectNote": "множинний вибір нотатки вище/нижче",
+    "selectAllNotes": "вибрати всі нотатки на поточному рівні",
+    "selectNote": "вибрати нотатку",
+    "copyNotes": "копіювати активну нотатку (або поточний вибір) у буфер обміну (використовується для <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/cloning-notes.html#cloning-notes\">клонування</a>)",
+    "cutNotes": "вирізати поточну нотатку (або поточний вибір) у буфер обміну (використовується для переміщення нотаток)",
+    "pasteNotes": "вставити нотатку(и) як піднотатку в активну нотатку (яка або переміщується, або клонується залежно від того, чи була вона скопійована, чи вирізана в буфер обміну)",
+    "deleteNotes": "видалити нотатку / піддерево",
+    "editingNotes": "Редагування нотаток",
+    "editNoteTitle": "На панелі дерева перемкнеться з панелі дерева на назву нотатки. Введення з назви нотатки перемкне фокус на текстовий редактор. <kbd>Ctrl+.</kbd> перемкнеться назад з редактора на панель дерева.",
+    "createEditLink": "створити / редагувати зовнішнє посилання",
+    "createInternalLink": "створити внутрішнє посилання",
+    "followLink": "перейти за посиланням під курсором",
+    "insertDateTime": "вставити поточну дату та час у позицію курсору",
+    "jumpToTreePane": "перейти до панелі дерева та прокрутити до активної нотатки",
+    "markdownAutoformat": "Автоформатування, подібне до Markdown",
+    "headings": "<code>##</code>, <code>###</code>, <code>####</code> тощо, а потім пробіл для заголовків",
+    "bulletList": "<code>*</code> або <code>-</code> з пробілом для маркованого списку",
+    "numberedList": "<code>1.</code> або <code>1)</code>, а потім пробіл для нумерованого списку",
+    "blockQuote": "починайте рядок з <code>></code>, а потім пробіл для цитування блоку",
+    "troubleshooting": "Усунення несправностей",
+    "reloadFrontend": "перезавантажити інтерфейс Trilium",
+    "showDevTools": "показати інструменти розробника",
+    "showSQLConsole": "показати консоль SQL",
+    "other": "Інше",
+    "quickSearch": "зосередження на швидкому введенні пошукового запиту",
+    "inPageSearch": "пошук на сторінці"
+  },
+  "import": {
+    "importIntoNote": "Імпортувати в нотатку",
+    "chooseImportFile": "Вибрати файл імпорту",
+    "importDescription": "Вміст вибраного(их) файлу(ів) буде імпортовано як дочірню(і) нотатку(и) до",
+    "options": "Опції",
+    "safeImportTooltip": "Експортовані файли Trilium <code>.zip</code> можуть містити виконувані скрипти, які можуть мати шкідливу поведінку. Безпечний імпорт деактивує автоматичне виконання всіх імпортованих скриптів. Зніміть позначку \"Безпечний імпорт\", лише якщо імпортований архів має містити виконувані скрипти, і ви повністю довіряєте вмісту файлу імпорту.",
+    "safeImport": "Безпечний імпорт",
+    "explodeArchivesTooltip": "Якщо цей прапорець позначено, Trilium читатиме файли <code>.zip</code>, <code>.enex</code> та <code>.opml</code> і створюватиме нотатки з файлів усередині цих архівів. Якщо прапорець знято, Trilium додаватиме самі архіви до нотатки.",
+    "explodeArchives": "Зчитати вміст архівів <code>.zip</code>, <code>.enex</code> та <code>.opml</code>.",
+    "shrinkImagesTooltip": "<p>Якщо ви позначите цей параметр, Trilium спробує зменшити імпортовані зображення шляхом масштабування та оптимізації, що може вплинути на сприйняту якість зображення. Якщо не позначити, зображення будуть імпортовані без змін.</p><p>Це не стосується імпорту <code>.zip</code> з метаданими, оскільки передбачається, що ці файли вже оптимізовані.</p>",
+    "shrinkImages": "Зменшити зображення",
+    "textImportedAsText": "Імпортувати HTML, Markdown та TXT як текстові нотатки, якщо це незрозуміло з метаданих",
+    "codeImportedAsCode": "Імпортувати розпізнані файли коду (наприклад, <code>.json</code>) як нотатки до коду, якщо це незрозуміло з метаданих",
+    "replaceUnderscoresWithSpaces": "Замінити підкреслення пробілами в назвах імпортованих нотаток",
+    "import": "Імпорт",
+    "failed": "Помилка імпорту: {{message}}."
+  },
+  "prompt": {
+    "title": "Підказка",
+    "ok": "ОК",
+    "defaultTitle": "Підказка"
+  },
+  "protected_session_password": {
+    "modal_title": "Захищений сеанс",
+    "help_title": "Довідка щодо захищених нотаток",
+    "close_label": "Закрити",
+    "form_label": "Щоб продовжити запитувану дію, вам потрібно розпочати захищений сеанс, ввівши пароль:",
+    "start_button": "Розпочати захищений сеанс"
+  },
+  "recent_changes": {
+    "title": "Останні зміни",
+    "erase_notes_button": "Стерти видалені нотатки зараз",
+    "deleted_notes_message": "Видалені нотатки стерто.",
+    "no_changes_message": "Поки що жодних змін...",
+    "undelete_link": "відновити",
+    "confirm_undelete": "Ви хочете відновити цю нотатку та її піднотатки?"
+  },
+  "revisions": {
+    "note_revisions": "Зміни нотаток",
+    "delete_all_revisions": "Видалити всі редакції цієї нотатки"
+  }
+}

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

@@ -0,0 +1,80 @@
+{
+  "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"
+  },
+  "call_to_action": {
+    "dismiss": "Bỏ qua"
+  }
+}

apps/client/src/widgets/bulk_actions/BulkAction.tsx

@@ -0,0 +1,54 @@
+import { ComponentChildren } from "preact";
+import { memo } from "preact/compat";
+import AbstractBulkAction from "./abstract_bulk_action";
+
+interface BulkActionProps {
+    label: string | ComponentChildren;   
+    children?: ComponentChildren;
+    helpText?: ComponentChildren;
+    bulkAction: AbstractBulkAction;
+}
+
+// Define styles as constants to prevent recreation
+const flexContainerStyle = { display: "flex", alignItems: "center" } as const;
+const labelStyle = { marginRight: "10px" } as const;
+const textStyle = { marginRight: "10px", marginLeft: "10px" } as const;
+
+const BulkAction = memo(({ label, children, helpText, bulkAction }: BulkActionProps) => {
+    return (
+        <tr>
+            <td colSpan={2}>
+                <div style={flexContainerStyle}>
+                    <div style={labelStyle} className="text-nowrap">{label}</div>
+
+                    {children}
+                </div>
+            </td>
+            <td className="button-column">
+                {helpText && <div className="dropdown help-dropdown">
+                    <span className="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
+                    <div className="dropdown-menu dropdown-menu-right p-4">
+                        {helpText}
+                    </div>
+                </div>}
+
+                <span
+                    className="bx bx-x icon-action action-conf-del"
+                    onClick={() => bulkAction?.deleteAction()}
+                />
+            </td>
+        </tr>
+    );
+});
+
+export default BulkAction;
+
+export const BulkActionText = memo(({ text }: { text: string }) => {
+    return (
+        <div
+            style={textStyle}
+            className="text-nowrap">
+                {text}
+            </div>
+    );
+});

apps/client/src/widgets/bulk_actions/abstract_bulk_action.ts

@@ -1,10 +1,9 @@
-import { t } from "../../services/i18n.js";
 import server from "../../services/server.js";
 import ws from "../../services/ws.js";
-import utils from "../../services/utils.js";
 import type FAttribute from "../../entities/fattribute.js";
+import { VNode } from "preact";
 
-interface ActionDefinition {
+export interface ActionDefinition {
     script: string;
     relationName: string;
     targetNoteId: string;
@@ -27,26 +26,9 @@ export default abstract class AbstractBulkAction {
         this.actionDef = actionDef;
     }
 
-    render() {
-        try {
-            const $rendered = this.doRender();
-
-            $rendered
-                .find(".action-conf-del")
-                .on("click", () => this.deleteAction())
-                .attr("title", t("abstract_bulk_action.remove_this_search_action"));
-
-            utils.initHelpDropdown($rendered);
-
-            return $rendered;
-        } catch (e: any) {
-            logError(`Failed rendering search action: ${JSON.stringify(this.attribute.dto)} with error: ${e.message} ${e.stack}`);
-            return null;
-        }
-    }
-
     // to be overridden
-    abstract doRender(): JQuery<HTMLElement>;
+    abstract doRender(): VNode;
+
     static get actionName() {
         return "";
     }
@@ -66,9 +48,6 @@ export default abstract class AbstractBulkAction {
 
     async deleteAction() {
         await server.remove(`notes/${this.attribute.noteId}/attributes/${this.attribute.attributeId}`);
-
         await ws.waitForMaxKnownEntityChangeId();
-
-        //await this.triggerCommand('refreshSearchDefinition');
     }
 }

apps/client/src/widgets/bulk_actions/execute_script.ts

@@ -1,58 +0,0 @@
-import { t } from "../../services/i18n.js";
-import SpacedUpdate from "../../services/spaced_update.js";
-import AbstractBulkAction from "./abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td>
-        ${t("execute_script.execute_script")}
-    </td>
-    <td>
-        <input type="text"
-           class="form-control script"
-           placeholder="note.title = note.title + '- suffix';"/>
-    </td>
-    <td class="button-column">
-        <div style="display: flex; align-items: center; justify-content: space-between;">
-            <div class="dropdown help-dropdown">
-              <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-              <div class="dropdown-menu dropdown-menu-right p-4">
-                ${t("execute_script.help_text")}
-
-                ${t("execute_script.example_1")}
-
-                <pre>note.title = note.title + ' - suffix';</pre>
-
-                ${t("execute_script.example_2")}
-
-                <pre>for (const attr of note.getOwnedAttributes) { attr.markAsDeleted(); }</pre>
-              </div>
-            </div>
-
-            <span class="bx bx-x icon-action action-conf-del"></span>
-        </div>
-    </td>
-</tr>`;
-
-export default class ExecuteScriptBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "executeScript";
-    }
-    static get actionTitle() {
-        return t("execute_script.execute_script");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-        const $script = $action.find(".script");
-        $script.val(this.actionDef.script || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({ script: $script.val() });
-        }, 1000);
-
-        $script.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/execute_script.tsx

@@ -0,0 +1,50 @@
+import { useEffect, useState } from "preact/hooks";
+import { t } from "../../services/i18n.js";
+import FormTextBox from "../react/FormTextBox.jsx";
+import AbstractBulkAction, { ActionDefinition } from "./abstract_bulk_action.js";
+import BulkAction from "./BulkAction.jsx";
+import { useSpacedUpdate } from "../react/hooks.jsx";
+
+function ExecuteScriptBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ script, setScript ] = useState(actionDef.script);
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ script }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ script ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("execute_script.execute_script")}
+            helpText={<>
+                {t("execute_script.help_text")}
+
+                {t("execute_script.example_1")}
+
+                <pre>note.title = note.title + ' - suffix';</pre>
+
+                {t("execute_script.example_2")}
+
+                <pre>{"for (const attr of note.getOwnedAttributes) { attr.markAsDeleted(); }"}</pre>
+            </>}
+        >
+            <FormTextBox
+                placeholder="note.title = note.title + '- suffix';"
+                currentValue={script} onChange={setScript}
+            />
+        </BulkAction>
+    );
+}
+
+export default class ExecuteScriptBulkAction extends AbstractBulkAction {
+
+    static get actionName() {
+        return "executeScript";
+    }
+    static get actionTitle() {
+        return t("execute_script.execute_script");
+    }
+
+    doRender() {
+        return <ExecuteScriptBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+
+}

apps/client/src/widgets/bulk_actions/label/add_label.ts

@@ -1,70 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px;" class="text-nowrap">${t("add_label.add_label")}</div>
-
-            <input type="text"
-                class="form-control label-name"
-                placeholder="${t("add_label.label_name_placeholder")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                title="${t("add_label.label_name_title")}"/>
-
-            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">${t("add_label.to_value")}</div>
-
-            <input type="text" class="form-control label-value" placeholder="${t("add_label.new_value_placeholder")}"/>
-        </div>
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                <p>${t("add_label.help_text")}</p>
-
-                <ul>
-                    <li>${t("add_label.help_text_item1")}</li>
-                    <li>${t("add_label.help_text_item2")}</li>
-                </ul>
-
-                ${t("add_label.help_text_note")}
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class AddLabelBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "addLabel";
-    }
-    static get actionTitle() {
-        return t("add_label.add_label");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $labelName = $action.find(".label-name");
-        $labelName.val(this.actionDef.labelName || "");
-
-        const $labelValue = $action.find(".label-value");
-        $labelValue.val(this.actionDef.labelValue || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                labelName: $labelName.val(),
-                labelValue: $labelValue.val()
-            });
-        }, 1000);
-
-        $labelName.on("input", () => spacedUpdate.scheduleUpdate());
-        $labelValue.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/label/add_label.tsx

@@ -0,0 +1,57 @@
+import { useEffect, useState } from "preact/hooks";
+import { t } from "../../../services/i18n";
+import FormTextBox from "../../react/FormTextBox";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action";
+import BulkAction, { BulkActionText } from "../BulkAction";
+import { useSpacedUpdate } from "../../react/hooks";
+
+function AddLabelBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ labelName, setLabelName ] = useState<string>(actionDef.labelName ?? "");
+    const [ labelValue, setLabelValue ] = useState<string>(actionDef.labelValue ?? "");
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ labelName, labelValue }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [labelName, labelValue]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("add_label.add_label")}
+            helpText={<>
+                <p>{t("add_label.help_text")}</p>
+
+                <ul>
+                    <li>{t("add_label.help_text_item1")}</li>
+                    <li>{t("add_label.help_text_item2")}</li>
+                </ul>
+
+                {t("add_label.help_text_note")}
+            </>}
+        >
+            <FormTextBox
+                placeholder={t("add_label.label_name_placeholder")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("add_label.label_name_title")}
+                currentValue={labelName} onChange={setLabelName}
+            />
+            <BulkActionText text={t("add_label.to_value")} />
+            <FormTextBox
+                placeholder={t("add_label.new_value_placeholder")}
+                currentValue={labelValue} onChange={setLabelValue}
+            />
+        </BulkAction>
+    )
+}
+
+export default class AddLabelBulkAction extends AbstractBulkAction {
+
+    doRender() {
+        return <AddLabelBulkActionComponent bulkAction={this} actionDef={this.actionDef} />;
+    }
+
+    static get actionName() {
+        return "addLabel";
+    }
+
+    static get actionTitle() {
+        return t("add_label.add_label");
+    }
+}

apps/client/src/widgets/bulk_actions/label/delete_label.ts

@@ -1,43 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td>
-        ${t("delete_label.delete_label")}
-    </td>
-    <td>
-        <input type="text"
-           class="form-control label-name"
-           pattern="[\\p{L}\\p{N}_:]+"
-           title="${t("delete_label.label_name_title")}"
-           placeholder="${t("delete_label.label_name_placeholder")}"/>
-    </td>
-    <td class="button-column">
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class DeleteLabelBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "deleteLabel";
-    }
-    static get actionTitle() {
-        return t("delete_label.delete_label");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-        const $labelName = $action.find(".label-name");
-        $labelName.val(this.actionDef.labelName || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({ labelName: $labelName.val() });
-        }, 1000);
-
-        $labelName.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/label/delete_label.tsx

@@ -0,0 +1,39 @@
+import { useEffect, useState } from "preact/hooks";
+import { t } from "../../../services/i18n.js";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+import BulkAction from "../BulkAction.jsx";
+
+function DeleteLabelBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition}) {
+    const [ labelName, setLabelName ] = useState<string>(actionDef.labelName ?? "");
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ labelName }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [labelName]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("delete_label.delete_label")}
+        >
+            <FormTextBox
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("delete_label.label_name_title")}
+                placeholder={t("delete_label.label_name_placeholder")}
+                currentValue={labelName} onChange={setLabelName}
+            />
+        </BulkAction>
+    );
+}
+
+export default class DeleteLabelBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "deleteLabel";
+    }
+    static get actionTitle() {
+        return t("delete_label.delete_label");
+    }
+
+    doRender() {
+        return <DeleteLabelBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+}

apps/client/src/widgets/bulk_actions/label/rename_label.ts

@@ -1,60 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px; flex-shrink: 0;">${t("rename_label.rename_label_from")}</div>
-
-            <input type="text"
-                class="form-control old-label-name"
-                placeholder="${t("rename_label.old_name_placeholder")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                title="${t("rename_label.name_title")}"/>
-
-            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">${t("rename_label.to")}</div>
-
-            <input type="text"
-                class="form-control new-label-name"
-                placeholder="${t("rename_label.new_name_placeholder")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                title="${t("rename_label.name_title")}"/>
-        </div>
-    </td>
-    <td class="button-column">
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class RenameLabelBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "renameLabel";
-    }
-    static get actionTitle() {
-        return t("rename_label.rename_label");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $oldLabelName = $action.find(".old-label-name");
-        $oldLabelName.val(this.actionDef.oldLabelName || "");
-
-        const $newLabelName = $action.find(".new-label-name");
-        $newLabelName.val(this.actionDef.newLabelName || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                oldLabelName: $oldLabelName.val(),
-                newLabelName: $newLabelName.val()
-            });
-        }, 1000);
-
-        $oldLabelName.on("input", () => spacedUpdate.scheduleUpdate());
-        $newLabelName.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/label/rename_label.tsx

@@ -0,0 +1,49 @@
+import { useEffect, useState } from "preact/hooks";
+import { t } from "../../../services/i18n.js";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import BulkAction, { BulkActionText } from "../BulkAction.jsx";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+
+function RenameLabelBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition}) {
+    const [ oldLabelName, setOldLabelName ] = useState(actionDef.oldLabelName);
+    const [ newLabelName, setNewLabelName ] = useState(actionDef.newLabelName);
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ oldLabelName, newLabelName }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ oldLabelName, newLabelName ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("rename_label.rename_label_from")}
+        >
+            <FormTextBox
+                placeholder={t("rename_label.old_name_placeholder")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("rename_label.name_title")}
+                currentValue={oldLabelName} onChange={setOldLabelName}
+            />
+
+            <BulkActionText text={t("rename_label.to")} />
+
+            <FormTextBox
+                placeholder={t("rename_label.new_name_placeholder")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("rename_label.name_title")}
+                currentValue={newLabelName} onChange={setNewLabelName}
+            />
+        </BulkAction>
+    )
+}
+
+export default class RenameLabelBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "renameLabel";
+    }
+    static get actionTitle() {
+        return t("rename_label.rename_label");
+    }
+
+    doRender() {
+        return <RenameLabelBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+}

apps/client/src/widgets/bulk_actions/label/update_label_value.ts

@@ -1,65 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px;" class="text-nowrap">${t("update_label_value.update_label_value")}</div>
-
-            <input type="text"
-                class="form-control label-name"
-                placeholder="${t("update_label_value.label_name_placeholder")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                title="${t("update_label_value.label_name_title")}"/>
-
-            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">${t("update_label_value.to_value")}</div>
-
-            <input type="text" class="form-control label-value" placeholder="${t("update_label_value.new_value_placeholder")}"/>
-        </div>
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                <p>${t("update_label_value.help_text")}</p>
-
-                ${t("update_label_value.help_text_note")}
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class UpdateLabelValueBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "updateLabelValue";
-    }
-    static get actionTitle() {
-        return t("update_label_value.update_label_value");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $labelName = $action.find(".label-name");
-        $labelName.val(this.actionDef.labelName || "");
-
-        const $labelValue = $action.find(".label-value");
-        $labelValue.val(this.actionDef.labelValue || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                labelName: $labelName.val(),
-                labelValue: $labelValue.val()
-            });
-        }, 1000);
-
-        $labelName.on("input", () => spacedUpdate.scheduleUpdate());
-        $labelValue.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/label/update_label_value.tsx

@@ -0,0 +1,50 @@
+import { t } from "../../../services/i18n.js";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import BulkAction, { BulkActionText } from "../BulkAction.jsx";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+import { useEffect, useState } from "preact/hooks";
+
+function UpdateLabelValueComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition}) {
+    const [ labelName, setLabelName ] = useState<string>(actionDef.labelName ?? "");
+    const [ labelValue, setLabelValue ] = useState<string>(actionDef.labelValue ?? "");
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ labelName, labelValue }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [labelName, labelValue]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("update_label_value.update_label_value")}
+            helpText={<>
+                <p>{t("update_label_value.help_text")}</p>
+
+                {t("update_label_value.help_text_note")}
+            </>}
+        >
+            <FormTextBox
+                placeholder={t("update_label_value.label_name_placeholder")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("update_label_value.label_name_title")}
+                currentValue={labelName} onChange={setLabelName}
+            />
+            <BulkActionText text={t("update_label_value.to_value")} />
+            <FormTextBox
+                placeholder={t("update_label_value.new_value_placeholder")}
+                currentValue={labelValue} onChange={setLabelValue}
+            />
+        </BulkAction>
+    )
+}
+
+export default class UpdateLabelValueBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "updateLabelValue";
+    }
+    static get actionTitle() {
+        return t("update_label_value.update_label_value");
+    }
+
+    doRender() {
+        return <UpdateLabelValueComponent bulkAction={this} actionDef={this.actionDef} />;
+    }
+}

apps/client/src/widgets/bulk_actions/note/delete_note.ts

@@ -1,38 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <span class="bx bx-trash"></span>
-
-        ${t("delete_note.delete_matched_notes")}
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                <p>${t("delete_note.delete_matched_notes_description")}</p>
-
-                <p>${t("delete_note.undelete_notes_instruction")}</p>
-
-                ${t("delete_note.erase_notes_instruction")}
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class DeleteNoteBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "deleteNote";
-    }
-    static get actionTitle() {
-        return t("delete_note.delete_note");
-    }
-
-    doRender() {
-        return $(TPL);
-    }
-}

apps/client/src/widgets/bulk_actions/note/delete_note.tsx

@@ -0,0 +1,33 @@
+import { t } from "../../../services/i18n.js";
+import AbstractBulkAction from "../abstract_bulk_action.js";
+import BulkAction from "../BulkAction.jsx";
+import Icon from "../../react/Icon.jsx";
+
+function DeleteNoteBulkActionComponent({ bulkAction }: { bulkAction: AbstractBulkAction }) {
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={<><Icon icon="bx bx-trash" /> {t("delete_note.delete_matched_notes")}</>}
+            helpText={<>
+                <p>{t("delete_note.delete_matched_notes_description")}</p>
+
+                <p>{t("delete_note.undelete_notes_instruction")}</p>
+
+                {t("delete_note.erase_notes_instruction")}
+            </>}
+        />
+    );
+}
+
+export default class DeleteNoteBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "deleteNote";
+    }
+    static get actionTitle() {
+        return t("delete_note.delete_note");
+    }
+
+    doRender() {
+        return <DeleteNoteBulkActionComponent bulkAction={this} />
+    }
+}

apps/client/src/widgets/bulk_actions/note/delete_revisions.ts

@@ -1,32 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <span class="bx bx-trash"></span>
-        ${t("delete_revisions.delete_note_revisions")}
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                ${t("delete_revisions.all_past_note_revisions")}
-            </div>
-        </div>
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class DeleteRevisionsBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "deleteRevisions";
-    }
-    static get actionTitle() {
-        return t("delete_revisions.delete_note_revisions");
-    }
-
-    doRender() {
-        return $(TPL);
-    }
-}

apps/client/src/widgets/bulk_actions/note/delete_revisions.tsx

@@ -0,0 +1,28 @@
+import { t } from "../../../services/i18n.js";
+import Icon from "../../react/Icon.jsx";
+import AbstractBulkAction from "../abstract_bulk_action.js";
+import BulkAction from "../BulkAction.jsx";
+
+function DeleteRevisionsBulkActionComponent({ bulkAction }: { bulkAction: AbstractBulkAction }) {
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={<><Icon icon="bx bx-trash" /> {t("delete_revisions.delete_note_revisions")}</>}
+            helpText={t("delete_revisions.all_past_note_revisions")}
+        />
+    )
+}
+
+
+export default class DeleteRevisionsBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "deleteRevisions";
+    }
+    static get actionTitle() {
+        return t("delete_revisions.delete_note_revisions");
+    }
+
+    doRender() {
+        return <DeleteRevisionsBulkActionComponent bulkAction={this} />
+    }
+}

apps/client/src/widgets/bulk_actions/note/move_note.ts

@@ -1,64 +0,0 @@
-import { t } from "../../../services/i18n.js";
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-import noteAutocompleteService from "../../../services/note_autocomplete.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px;" class="text-nowrap">${t("move_note.move_note")}</div>
-
-            <div style="margin-right: 10px;" class="text-nowrap">${t("move_note.to")}</div>
-
-            <div class="input-group">
-                <input type="text" class="form-control target-parent-note" placeholder="${t("move_note.target_parent_note")}"/>
-            </div>
-        </div>
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                <p>${t("move_note.on_all_matched_notes")}:</p>
-
-                <ul style="margin-bottom: 0;">
-                    <li>${t("move_note.move_note_new_parent")}</li>
-                    <li>${t("move_note.clone_note_new_parent")}</li>
-                    <li>${t("move_note.nothing_will_happen")}</li>
-                </ul>
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class MoveNoteBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "moveNote";
-    }
-    static get actionTitle() {
-        return t("move_note.move_note");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $targetParentNote = $action.find(".target-parent-note");
-        noteAutocompleteService.initNoteAutocomplete($targetParentNote);
-        $targetParentNote.setNote(this.actionDef.targetParentNoteId);
-
-        $targetParentNote.on("autocomplete:closed", () => spacedUpdate.scheduleUpdate());
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                targetParentNoteId: $targetParentNote.getSelectedNoteId()
-            });
-        }, 1000);
-
-        $targetParentNote.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/note/move_note.tsx

@@ -0,0 +1,50 @@
+import { t } from "../../../services/i18n.js";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import BulkAction, { BulkActionText } from "../BulkAction.jsx";
+import NoteAutocomplete from "../../react/NoteAutocomplete.jsx";
+import { useEffect, useState } from "preact/hooks";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+
+function MoveNoteBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ targetParentNoteId, setTargetParentNoteId ] = useState<string>();
+    const spacedUpdate = useSpacedUpdate(() => {
+        return bulkAction.saveAction({ targetParentNoteId: targetParentNoteId })
+    });
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ targetParentNoteId ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("move_note.move_note")}
+            helpText={<>
+                <p>{t("move_note.on_all_matched_notes")}:</p>
+
+                <ul style="margin-bottom: 0;">
+                    <li>{t("move_note.move_note_new_parent")}</li>
+                    <li>{t("move_note.clone_note_new_parent")}</li>
+                    <li>{t("move_note.nothing_will_happen")}</li>
+                </ul>
+            </>}
+        >
+            <BulkActionText text={t("move_note.to")} />
+
+            <NoteAutocomplete
+                placeholder={t("move_note.target_parent_note")}
+                noteId={targetParentNoteId} noteIdChanged={setTargetParentNoteId}
+            />
+        </BulkAction>
+    )
+}
+
+export default class MoveNoteBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "moveNote";
+    }
+    static get actionTitle() {
+        return t("move_note.move_note");
+    }
+
+    doRender() {
+        return <MoveNoteBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+}

apps/client/src/widgets/bulk_actions/note/rename_note.ts

@@ -1,61 +0,0 @@
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-import { t } from "../../../services/i18n.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px; flex-shrink: 0;">${t("rename_note.rename_note_title_to")}</div>
-
-            <input type="text"
-                class="form-control new-title"
-                placeholder="${t("rename_note.new_note_title")}"
-                title="${t("rename_note.click_help_icon")}"/>
-        </div>
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                <p>${t("rename_note.evaluated_as_js_string")}</p>
-
-                <ul>
-                    <li>${t("rename_note.example_note")}</li>
-                    <li>${t("rename_note.example_new_title")}</li>
-                    <li>${t("rename_note.example_date_prefix")}</li>
-                </ul>
-
-                ${t("rename_note.api_docs")}
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class RenameNoteBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "renameNote";
-    }
-    static get actionTitle() {
-        return t("rename_note.rename_note");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $newTitle = $action.find(".new-title");
-        $newTitle.val(this.actionDef.newTitle || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                newTitle: $newTitle.val()
-            });
-        }, 1000);
-
-        $newTitle.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/note/rename_note.tsx

@@ -0,0 +1,53 @@
+import SpacedUpdate from "../../../services/spaced_update.js";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import { t } from "../../../services/i18n.js";
+import BulkAction from "../BulkAction.jsx";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import { useEffect, useState } from "preact/hooks";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+import RawHtml from "../../react/RawHtml.jsx";
+
+function RenameNoteBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition}) {
+    const [ newTitle, setNewTitle ] = useState<string>(actionDef.newTitle ?? "");
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ newTitle }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ newTitle ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("rename_note.rename_note_title_to")}
+            helpText={<>
+                <p>{t("rename_note.evaluated_as_js_string")}</p>
+
+                <ul>
+                    <li><RawHtml html={t("rename_note.example_note")} /></li>
+                    <li><RawHtml html={t("rename_note.example_new_title")} /></li>
+                    <li><RawHtml html={t("rename_note.example_date_prefix")} /></li>
+                </ul>
+
+                <RawHtml html={t("rename_note.api_docs")} />
+            </>}
+        >
+            <FormTextBox
+                placeholder={t("rename_note.new_note_title")}
+                title={("rename_note.click_help_icon")}
+                currentValue={newTitle} onChange={setNewTitle}
+            />
+        </BulkAction>
+    )
+}
+
+export default class RenameNoteBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "renameNote";
+    }
+
+    static get actionTitle() {
+        return t("rename_note.rename_note");
+    }
+
+    doRender() {
+        return <RenameNoteBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+
+}

apps/client/src/widgets/bulk_actions/relation/add_relation.ts

@@ -1,70 +0,0 @@
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-import noteAutocompleteService from "../../../services/note_autocomplete.js";
-import { t } from "../../../services/i18n.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px;" class="text-nowrap">${t("add_relation.add_relation")}</div>
-
-            <input type="text"
-                class="form-control relation-name"
-                placeholder="${t("add_relation.relation_name")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                style="flex-shrink: 3"
-                title="${t("add_relation.allowed_characters")}"/>
-
-            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">${t("add_relation.to")}</div>
-
-            <div class="input-group" style="flex-shrink: 2">
-                <input type="text" class="form-control target-note" placeholder="${t("add_relation.target_note")}"/>
-            </div>
-        </div>
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                ${t("add_relation.create_relation_on_all_matched_notes")}
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class AddRelationBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "addRelation";
-    }
-    static get actionTitle() {
-        return t("add_relation.add_relation");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $relationName = $action.find(".relation-name");
-        $relationName.val(this.actionDef.relationName || "");
-
-        const $targetNote = $action.find(".target-note");
-        noteAutocompleteService.initNoteAutocomplete($targetNote);
-        $targetNote.setNote(this.actionDef.targetNoteId);
-
-        $targetNote.on("autocomplete:closed", () => spacedUpdate.scheduleUpdate());
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                relationName: $relationName.val(),
-                targetNoteId: $targetNote.getSelectedNoteId()
-            });
-        }, 1000);
-
-        $relationName.on("input", () => spacedUpdate.scheduleUpdate());
-        $targetNote.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/relation/add_relation.tsx

@@ -0,0 +1,53 @@
+import SpacedUpdate from "../../../services/spaced_update.js";
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import noteAutocompleteService from "../../../services/note_autocomplete.js";
+import { t } from "../../../services/i18n.js";
+import BulkAction, { BulkActionText } from "../BulkAction.jsx";
+import NoteAutocomplete from "../../react/NoteAutocomplete.jsx";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import { useEffect, useState } from "preact/hooks";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+
+function AddRelationBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ relationName, setRelationName ] = useState<string>(actionDef.relationName);
+    const [ targetNoteId, setTargetNoteId ] = useState<string>(actionDef.targetNoteId);
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ relationName, targetNoteId }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ relationName, targetNoteId ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("add_relation.add_relation")}
+            helpText={t("add_relation.create_relation_on_all_matched_notes")}
+        >
+            <FormTextBox 
+                placeholder={t("add_relation.relation_name")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                style={{ flexShrink: 3 }}
+                title={t("add_relation.allowed_characters")}
+                currentValue={relationName} onChange={setRelationName}
+            />
+
+            <BulkActionText text={t("add_relation.to")} />
+
+            <NoteAutocomplete
+                placeholder={t("add_relation.target_note")}
+                noteId={targetNoteId} noteIdChanged={setTargetNoteId}
+            />
+        </BulkAction>
+    )  
+}
+
+export default class AddRelationBulkAction extends AbstractBulkAction {
+
+    static get actionName() {
+        return "addRelation";
+    }
+    static get actionTitle() {
+        return t("add_relation.add_relation");
+    }
+
+    doRender() {
+        return <AddRelationBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+}

apps/client/src/widgets/bulk_actions/relation/delete_relation.ts

@@ -1,45 +0,0 @@
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-import { t } from "../../../services/i18n.js";
-
-const TPL = /*html*/`
-<tr>
-    <td>
-        ${t("delete_relation.delete_relation")}
-    </td>
-    <td>
-        <div style="display: flex; align-items: center">
-            <input type="text"
-                class="form-control relation-name"
-                pattern="[\\p{L}\\p{N}_:]+"
-                placeholder="${t("delete_relation.relation_name")}"
-                title="${t("delete_relation.allowed_characters")}"/>
-        </div>
-    </td>
-    <td class="button-column">
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class DeleteRelationBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "deleteRelation";
-    }
-    static get actionTitle() {
-        return t("delete_relation.delete_relation");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-        const $relationName = $action.find(".relation-name");
-        $relationName.val(this.actionDef.relationName || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({ relationName: $relationName.val() });
-        }, 1000);
-
-        $relationName.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/relation/delete_relation.tsx

@@ -0,0 +1,41 @@
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import { t } from "../../../services/i18n.js";
+import BulkAction from "../BulkAction.jsx";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import { useEffect, useState } from "preact/hooks";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+
+function DeleteRelationBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ relationName, setRelationName ] = useState(actionDef.relationName);
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ relationName }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ relationName ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("delete_relation.delete_relation")}
+        >
+            <FormTextBox
+                pattern="[\\p{L}\\p{N}_:]+"
+                placeholder={t("delete_relation.relation_name")}
+                title={t("delete_relation.allowed_characters")}
+                currentValue={relationName} onChange={setRelationName}
+            />
+        </BulkAction>
+    )
+}
+
+export default class DeleteRelationBulkAction extends AbstractBulkAction {
+
+    static get actionName() {
+        return "deleteRelation";
+    }
+
+    static get actionTitle() {
+        return t("delete_relation.delete_relation");
+    }
+
+    doRender() {
+        return <DeleteRelationBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+}

apps/client/src/widgets/bulk_actions/relation/rename_relation.ts

@@ -1,60 +0,0 @@
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-import { t } from "../../../services/i18n.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px; flex-shrink: 0;">${t("rename_relation.rename_relation_from")}</div>
-
-            <input type="text"
-                class="form-control old-relation-name"
-                placeholder="${t("rename_relation.old_name")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                title="${t("rename_relation.allowed_characters")}"/>
-
-            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">${t("rename_relation.to")}</div>
-
-            <input type="text"
-                class="form-control new-relation-name"
-                placeholder="${t("rename_relation.new_name")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                title="${t("rename_relation.allowed_characters")}"/>
-        </div>
-    </td>
-    <td class="button-column">
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class RenameRelationBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "renameRelation";
-    }
-    static get actionTitle() {
-        return t("rename_relation.rename_relation");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $oldRelationName = $action.find(".old-relation-name");
-        $oldRelationName.val(this.actionDef.oldRelationName || "");
-
-        const $newRelationName = $action.find(".new-relation-name");
-        $newRelationName.val(this.actionDef.newRelationName || "");
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                oldRelationName: $oldRelationName.val(),
-                newRelationName: $newRelationName.val()
-            });
-        }, 1000);
-
-        $oldRelationName.on("input", () => spacedUpdate.scheduleUpdate());
-        $newRelationName.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/relation/rename_relation.tsx

@@ -0,0 +1,49 @@
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import { t } from "../../../services/i18n.js";
+import BulkAction, { BulkActionText } from "../BulkAction.jsx";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import { useEffect, useState } from "preact/hooks";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+
+function RenameRelationBulkActionComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ oldRelationName, setOldRelationName ] = useState(actionDef.oldRelationName);
+    const [ newRelationName, setNewRelationName ] = useState(actionDef.newRelationName);
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ oldRelationName, newRelationName }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ oldRelationName, newRelationName ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("rename_relation.rename_relation_from")}
+        >
+            <FormTextBox
+                placeholder={t("rename_relation.old_name")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("rename_relation.allowed_characters")}
+                currentValue={oldRelationName} onChange={setOldRelationName}
+            />
+
+            <BulkActionText text={t("rename_relation.to")} />
+
+            <FormTextBox
+                placeholder={t("rename_relation.new_name")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                title={t("rename_relation.allowed_characters")}
+                currentValue={newRelationName} onChange={setNewRelationName}
+            />
+        </BulkAction>
+    )
+}
+
+export default class RenameRelationBulkAction extends AbstractBulkAction {
+    static get actionName() {
+        return "renameRelation";
+    }
+    static get actionTitle() {
+        return t("rename_relation.rename_relation");
+    }
+
+    doRender() {
+        return <RenameRelationBulkActionComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+}

apps/client/src/widgets/bulk_actions/relation/update_relation_target.ts

@@ -1,74 +0,0 @@
-import SpacedUpdate from "../../../services/spaced_update.js";
-import AbstractBulkAction from "../abstract_bulk_action.js";
-import noteAutocompleteService from "../../../services/note_autocomplete.js";
-import { t } from "../../../services/i18n.js";
-
-const TPL = /*html*/`
-<tr>
-    <td colspan="2">
-        <div style="display: flex; align-items: center">
-            <div style="margin-right: 10px;" class="text-nowrap">${t("update_relation_target.update_relation")}</div>
-
-            <input type="text"
-                class="form-control relation-name"
-                placeholder="${t("update_relation_target.relation_name")}"
-                pattern="[\\p{L}\\p{N}_:]+"
-                style="flex-shrink: 3"
-                title="${t("update_relation_target.allowed_characters")}"/>
-
-            <div style="margin-right: 10px; margin-left: 10px;" class="text-nowrap">${t("update_relation_target.to")}</div>
-
-            <div class="input-group" style="flex-shrink: 2">
-                <input type="text" class="form-control target-note" placeholder="${t("update_relation_target.target_note")}"/>
-            </div>
-        </div>
-    </td>
-    <td class="button-column">
-        <div class="dropdown help-dropdown">
-            <span class="bx bx-help-circle icon-action" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></span>
-            <div class="dropdown-menu dropdown-menu-right p-4">
-                <p>${t("update_relation_target.on_all_matched_notes")}:</p>
-
-                <ul style="margin-bottom: 0;">
-                    <li>${t("update_relation_target.change_target_note")}</li>
-                </ul>
-            </div>
-        </div>
-
-        <span class="bx bx-x icon-action action-conf-del"></span>
-    </td>
-</tr>`;
-
-export default class UpdateRelationTargetBulkAction extends AbstractBulkAction {
-    static get actionName() {
-        return "updateRelationTarget";
-    }
-    static get actionTitle() {
-        return t("update_relation_target.update_relation_target");
-    }
-
-    doRender() {
-        const $action = $(TPL);
-
-        const $relationName = $action.find(".relation-name");
-        $relationName.val(this.actionDef.relationName || "");
-
-        const $targetNote = $action.find(".target-note");
-        noteAutocompleteService.initNoteAutocomplete($targetNote);
-        $targetNote.setNote(this.actionDef.targetNoteId);
-
-        $targetNote.on("autocomplete:closed", () => spacedUpdate.scheduleUpdate());
-
-        const spacedUpdate = new SpacedUpdate(async () => {
-            await this.saveAction({
-                relationName: $relationName.val(),
-                targetNoteId: $targetNote.getSelectedNoteId()
-            });
-        }, 1000);
-
-        $relationName.on("input", () => spacedUpdate.scheduleUpdate());
-        $targetNote.on("input", () => spacedUpdate.scheduleUpdate());
-
-        return $action;
-    }
-}

apps/client/src/widgets/bulk_actions/relation/update_relation_target.tsx

@@ -0,0 +1,60 @@
+import AbstractBulkAction, { ActionDefinition } from "../abstract_bulk_action.js";
+import { t } from "../../../services/i18n.js";
+import BulkAction, { BulkActionText } from "../BulkAction.jsx";
+import FormTextBox from "../../react/FormTextBox.jsx";
+import NoteAutocomplete from "../../react/NoteAutocomplete.jsx";
+import { useEffect, useState } from "preact/hooks";
+import { useSpacedUpdate } from "../../react/hooks.jsx";
+
+function UpdateRelationTargetComponent({ bulkAction, actionDef }: { bulkAction: AbstractBulkAction, actionDef: ActionDefinition }) {
+    const [ relationName, setRelationName ] = useState(actionDef.relationName);
+    const [ targetNoteId, setTargetNoteId ] = useState(actionDef.targetNoteId);
+    const spacedUpdate = useSpacedUpdate(() => bulkAction.saveAction({ relationName, targetNoteId }));
+    useEffect(() => spacedUpdate.scheduleUpdate(), [ relationName, targetNoteId ]);
+
+    return (
+        <BulkAction
+            bulkAction={bulkAction}
+            label={t("update_relation_target.update_relation")}
+            helpText={<>
+                <p>{t("update_relation_target.on_all_matched_notes")}:</p>
+
+                <ul style="margin-bottom: 0;">
+                    <li>{t("update_relation_target.change_target_note")}</li>
+                </ul>
+            </>}
+        >
+            <FormTextBox
+                placeholder={t("update_relation_target.relation_name")}
+                pattern="[\\p{L}\\p{N}_:]+"
+                style={{ flexShrink: 3 }}
+                title={t("update_relation_target.allowed_characters")}
+                currentValue={relationName} onChange={setRelationName}
+            />
+
+            <BulkActionText text={t("update_relation_target.to")} />
+
+            <NoteAutocomplete
+                placeholder={t("update_relation_target.target_note")}
+                containerStyle={{ flexShrink: 2 }}
+                noteId={targetNoteId} noteIdChanged={setTargetNoteId}
+            />
+        </BulkAction>
+    )
+}
+
+export default class UpdateRelationTargetBulkAction extends AbstractBulkAction {
+
+    static get actionName() {
+        return "updateRelationTarget";
+    }
+
+    static get actionTitle() {
+        return t("update_relation_target.update_relation_target");
+    }
+
+    doRender() {
+        return <UpdateRelationTargetComponent bulkAction={this} actionDef={this.actionDef} />
+    }
+
+}

apps/client/src/widgets/buttons/global_menu.ts

@@ -363,7 +363,6 @@ export default class GlobalMenuWidget extends BasicWidget {
 
         this.$zoomState = this.$widget.find(".zoom-state");
         this.$toggleZenMode = this.$widget.find('[data-trigger-command="toggleZenMode"');
-        this.$toggleZenMode.toggle(!utils.isMobile());
         this.$widget.on("show.bs.dropdown", () => this.#onShown());
         if (this.tooltip) {
             this.$widget.on("hide.bs.dropdown", () => this.tooltip.enable());
@@ -415,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();

apps/client/src/widgets/close_zen_button.ts

@@ -1,5 +1,6 @@
 import BasicWidget from "./basic_widget.js";
 import { t } from "../services/i18n.js";
+import utils from "../services/utils.js";
 
 const TPL = /*html*/`\
 <div class="close-zen-container">
@@ -28,6 +29,10 @@ const TPL = /*html*/`\
         -webkit-app-region: no-drag;
     }
 
+    body.zen.mobile .close-zen-container {
+        top: -2px;
+    }
+
     body.zen.electron:not(.platform-darwin):not(.native-titlebar) .close-zen-container {
         left: calc(env(titlebar-area-width) - var(--zen-button-size) - 2px);
         right: unset;

apps/client/src/widgets/containers/split_note_container.ts

@@ -2,6 +2,7 @@ import FlexContainer from "./flex_container.js";
 import appContext, { type CommandData, type CommandListenerData, type EventData, type EventNames, type NoteSwitchedContext } from "../../components/app_context.js";
 import type BasicWidget from "../basic_widget.js";
 import type NoteContext from "../../components/note_context.js";
+import Component from "../../components/component.js";
 
 interface NoteContextEvent {
     noteContext: NoteContext;
@@ -152,6 +153,8 @@ export default class SplitNoteContainer extends FlexContainer<SplitNoteWidget> {
         for (const ntxId of ntxIds) {
             this.$widget.find(`[data-ntx-id="${ntxId}"]`).remove();
 
+            const widget = this.widgets[ntxId];
+            recursiveCleanup(widget);
             delete this.widgets[ntxId];
         }
     }
@@ -237,3 +240,12 @@ export default class SplitNoteContainer extends FlexContainer<SplitNoteWidget> {
         return Promise.all(promises);
     }
 }
+
+function recursiveCleanup(widget: Component) {
+    for (const child of widget.children) {
+        recursiveCleanup(child);
+    }
+    if ("cleanup" in widget && typeof widget.cleanup === "function") {
+        widget.cleanup();
+    }
+}

apps/client/src/widgets/dialogs/about.tsx

@@ -1,4 +1,3 @@
-import { openDialog } from "../../services/dialog.js";
 import ReactBasicWidget from "../react/ReactBasicWidget.js";
 import Modal from "../react/Modal.js";
 import { t } from "../../services/i18n.js";
@@ -9,20 +8,26 @@ import openService from "../../services/open.js";
 import { useState } from "preact/hooks";
 import type { CSSProperties } from "preact/compat";
 import type { AppInfo } from "@triliumnext/commons";
+import useTriliumEvent from "../react/hooks.jsx";
 
 function AboutDialogComponent() {
     let [appInfo, setAppInfo] = useState<AppInfo | null>(null);
-
-    async function onShown() {
-        const appInfo = await server.get<AppInfo>("app-info");
-        setAppInfo(appInfo);
-    }
-
+    let [shown, setShown] = useState(false);
     const forceWordBreak: CSSProperties = { wordBreak: "break-all" };
 
+    useTriliumEvent("openAboutDialog", () => setShown(true));
+
     return (
-        <Modal className="about-dialog" size="lg" title={t("about.title")} onShown={onShown}>
-            {(appInfo !== null) ? (
+        <Modal className="about-dialog"
+            size="lg"
+            title={t("about.title")}
+            show={shown}
+            onShown={async () => {
+                const appInfo = await server.get<AppInfo>("app-info");
+                setAppInfo(appInfo);
+            }}
+            onHidden={() => setShown(false)}
+        >
             <table className="table table-borderless">
                 <tbody>
                     <tr>
@@ -31,37 +36,36 @@ function AboutDialogComponent() {
                     </tr>
                     <tr>
                         <th>{t("about.app_version")}</th>
-                            <td className="app-version">{appInfo.appVersion}</td>
+                        <td className="app-version">{appInfo?.appVersion}</td>
                     </tr>
                     <tr>
                         <th>{t("about.db_version")}</th>
-                            <td className="db-version">{appInfo.dbVersion}</td>
+                        <td className="db-version">{appInfo?.dbVersion}</td>
                     </tr>
                     <tr>
                         <th>{t("about.sync_version")}</th>
-                            <td className="sync-version">{appInfo.syncVersion}</td>
+                        <td className="sync-version">{appInfo?.syncVersion}</td>
                     </tr>
                     <tr>
                         <th>{t("about.build_date")}</th>
-                            <td className="build-date">{formatDateTime(appInfo.buildDate)}</td>
+                        <td className="build-date">
+                            {appInfo?.buildDate ? formatDateTime(appInfo.buildDate) : ""}
+                        </td>
                     </tr>
                     <tr>
                         <th>{t("about.build_revision")}</th>
                         <td>
-                                <a className="tn-link build-revision external" href={`https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`} target="_blank" style={forceWordBreak}>{appInfo.buildRevision}</a>
+                            {appInfo?.buildRevision && <a className="tn-link build-revision external" href={`https://github.com/TriliumNext/Trilium/commit/${appInfo.buildRevision}`} target="_blank" style={forceWordBreak}>{appInfo.buildRevision}</a>}
                         </td>
                     </tr>
                     <tr>
                         <th>{t("about.data_directory")}</th>
                         <td className="data-directory">
-                                <DirectoryLink directory={appInfo.dataDirectory} style={forceWordBreak} />
+                            {appInfo?.dataDirectory && (<DirectoryLink directory={appInfo.dataDirectory} style={forceWordBreak} />)}
                         </td>
                     </tr>
                 </tbody>
             </table>
-            ) : (
-                <div className="loading-spinner"></div>
-            )}
         </Modal>
     );
 }
@@ -85,7 +89,4 @@ export default class AboutDialog extends ReactBasicWidget {
         return <AboutDialogComponent />;
     }
 
-    async openAboutDialogEvent() {
-        openDialog(this.$widget);
-    }
 }

apps/client/src/widgets/dialogs/add_link.ts

@@ -1,188 +0,0 @@
-import { t } from "../../services/i18n.js";
-import treeService from "../../services/tree.js";
-import noteAutocompleteService from "../../services/note_autocomplete.js";
-import BasicWidget from "../basic_widget.js";
-import type { Suggestion } from "../../services/note_autocomplete.js";
-import type { default as TextTypeWidget } from "../type_widgets/editable_text.js";
-import type { EventData } from "../../components/app_context.js";
-import { openDialog } from "../../services/dialog.js";
-
-const TPL = /*html*/`
-<div class="add-link-dialog modal mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-lg" style="max-width: 1000px" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title flex-grow-1">${t("add_link.add_link")}</h5>
-                <button type="button" class="help-button" title="${t("add_link.help_on_links")}" data-help-page="links.html">?</button>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${t("add_link.close")}"></button>
-            </div>
-            <form class="add-link-form">
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="add-link-note-autocomplete">${t("add_link.note")}</label>
-
-                        <div class="input-group">
-                            <input class="add-link-note-autocomplete form-control" placeholder="${t("add_link.search_note")}">
-                        </div>
-                    </div>
-
-                    <div class="add-link-title-settings">
-                        <div class="add-link-title-radios form-check">
-                            <label class="form-check-label">
-                                <input class="form-check-input" type="radio" name="link-type" value="reference-link" checked>
-                                ${t("add_link.link_title_mirrors")}
-                            </label>
-                        </div>
-                        <div class="add-link-title-radios form-check">
-                            <label class="form-check-label">
-                                <input class="form-check-input" type="radio" name="link-type" value="hyper-link">
-                                ${t("add_link.link_title_arbitrary")}
-                            </label>
-                        </div>
-
-                        <div class="add-link-title-form-group form-group">
-                            <br/>
-                            <label>
-                                ${t("add_link.link_title")}
-
-                                <input class="link-title form-control" style="width: 100%;">
-                            </label>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="submit" class="btn btn-primary">${t("add_link.button_add_link")}</button>
-                </div>
-            </form>
-        </div>
-    </div>
-</div>`;
-
-export default class AddLinkDialog extends BasicWidget {
-    private $form!: JQuery<HTMLElement>;
-    private $autoComplete!: JQuery<HTMLElement>;
-    private $linkTitle!: JQuery<HTMLElement>;
-    private $addLinkTitleSettings!: JQuery<HTMLElement>;
-    private $addLinkTitleRadios!: JQuery<HTMLElement>;
-    private $addLinkTitleFormGroup!: JQuery<HTMLElement>;
-    private textTypeWidget: TextTypeWidget | null = null;
-
-    doRender() {
-        this.$widget = $(TPL);
-        this.$form = this.$widget.find(".add-link-form");
-        this.$autoComplete = this.$widget.find(".add-link-note-autocomplete");
-        this.$linkTitle = this.$widget.find(".link-title");
-        this.$addLinkTitleSettings = this.$widget.find(".add-link-title-settings");
-        this.$addLinkTitleRadios = this.$widget.find(".add-link-title-radios");
-        this.$addLinkTitleFormGroup = this.$widget.find(".add-link-title-form-group");
-
-        this.$form.on("submit", () => {
-            if (this.$autoComplete.getSelectedNotePath()) {
-                this.$widget.modal("hide");
-
-                const linkTitle = this.getLinkType() === "reference-link" ? null : this.$linkTitle.val() as string;
-
-                this.textTypeWidget?.addLink(this.$autoComplete.getSelectedNotePath()!, linkTitle);
-            } else if (this.$autoComplete.getSelectedExternalLink()) {
-                this.$widget.modal("hide");
-
-                this.textTypeWidget?.addLink(this.$autoComplete.getSelectedExternalLink()!, this.$linkTitle.val() as string, true);
-            } else {
-                logError("No link to add.");
-            }
-
-            return false;
-        });
-    }
-
-    async showAddLinkDialogEvent({ textTypeWidget, text = "" }: EventData<"showAddLinkDialog">) {
-        this.textTypeWidget = textTypeWidget;
-
-        this.$addLinkTitleSettings.toggle(!this.textTypeWidget.hasSelection());
-
-        this.$addLinkTitleSettings.find("input[type=radio]").on("change", () => this.updateTitleSettingsVisibility());
-
-        // with selection hyperlink is implied
-        if (this.textTypeWidget.hasSelection()) {
-            this.$addLinkTitleSettings.find("input[value='hyper-link']").prop("checked", true);
-        } else {
-            this.$addLinkTitleSettings.find("input[value='reference-link']").prop("checked", true);
-        }
-
-        this.updateTitleSettingsVisibility();
-
-        await openDialog(this.$widget);
-
-        this.$autoComplete.val("");
-        this.$linkTitle.val("");
-
-        const setDefaultLinkTitle = async (noteId: string) => {
-            const noteTitle = await treeService.getNoteTitle(noteId);
-            this.$linkTitle.val(noteTitle);
-        };
-
-        noteAutocompleteService.initNoteAutocomplete(this.$autoComplete, {
-            allowExternalLinks: true,
-            allowCreatingNotes: true
-        });
-
-        this.$autoComplete.on("autocomplete:noteselected", (event: JQuery.Event, suggestion: Suggestion) => {
-            if (!suggestion.notePath) {
-                return false;
-            }
-
-            this.updateTitleSettingsVisibility();
-
-            const noteId = treeService.getNoteIdFromUrl(suggestion.notePath);
-
-            if (noteId) {
-                setDefaultLinkTitle(noteId);
-            }
-        });
-
-        this.$autoComplete.on("autocomplete:externallinkselected", (event: JQuery.Event, suggestion: Suggestion) => {
-            if (!suggestion.externalLink) {
-                return false;
-            }
-
-            this.updateTitleSettingsVisibility();
-
-            this.$linkTitle.val(suggestion.externalLink);
-        });
-
-        this.$autoComplete.on("autocomplete:cursorchanged", (event: JQuery.Event, suggestion: Suggestion) => {
-            if (suggestion.externalLink) {
-                this.$linkTitle.val(suggestion.externalLink);
-            } else {
-                const noteId = treeService.getNoteIdFromUrl(suggestion.notePath!);
-
-                if (noteId) {
-                    setDefaultLinkTitle(noteId);
-                }
-            }
-        });
-
-        if (text && text.trim()) {
-            noteAutocompleteService.setText(this.$autoComplete, text);
-        } else {
-            noteAutocompleteService.showRecentNotes(this.$autoComplete);
-        }
-
-        this.$autoComplete.trigger("focus").trigger("select"); // to be able to quickly remove entered text
-    }
-
-    private getLinkType() {
-        if (this.$autoComplete.getSelectedExternalLink()) {
-            return "external-link";
-        }
-
-        return this.$addLinkTitleSettings.find("input[type=radio]:checked").val();
-    }
-
-    private updateTitleSettingsVisibility() {
-        const linkType = this.getLinkType();
-
-        this.$addLinkTitleFormGroup.toggle(linkType !== "reference-link");
-        this.$addLinkTitleRadios.toggle(linkType !== "external-link");
-    }
-}

apps/client/src/widgets/dialogs/add_link.tsx

@@ -0,0 +1,162 @@
+import { t } from "../../services/i18n";
+import Modal from "../react/Modal";
+import ReactBasicWidget from "../react/ReactBasicWidget";
+import Button from "../react/Button";
+import FormRadioGroup from "../react/FormRadioGroup";
+import NoteAutocomplete from "../react/NoteAutocomplete";
+import { useRef, useState, useEffect } from "preact/hooks";
+import tree from "../../services/tree";
+import note_autocomplete, { Suggestion } from "../../services/note_autocomplete";
+import { default as TextTypeWidget } from "../type_widgets/editable_text.js";
+import { logError } from "../../services/ws";
+import FormGroup from "../react/FormGroup.js";
+import { refToJQuerySelector } from "../react/react_utils";
+import useTriliumEvent from "../react/hooks";
+
+type LinkType = "reference-link" | "external-link" | "hyper-link";
+
+function AddLinkDialogComponent() {
+    const [ textTypeWidget, setTextTypeWidget ] = useState<TextTypeWidget>();
+    const initialText = useRef<string>();
+    const [ linkTitle, setLinkTitle ] = useState("");
+    const hasSelection = textTypeWidget?.hasSelection();
+    const [ linkType, setLinkType ] = useState<LinkType>(hasSelection ? "hyper-link" : "reference-link");
+    const [ suggestion, setSuggestion ] = useState<Suggestion | null>(null);
+    const [ shown, setShown ] = useState(false);
+
+    useTriliumEvent("showAddLinkDialog", ( { textTypeWidget, text }) => {
+        setTextTypeWidget(textTypeWidget);
+        initialText.current = text;
+        setShown(true);
+    });
+
+    async function setDefaultLinkTitle(noteId: string) {
+        const noteTitle = await tree.getNoteTitle(noteId);
+        setLinkTitle(noteTitle);
+    }
+
+    function resetExternalLink() {
+        if (linkType === "external-link") {
+            setLinkType("reference-link");
+        }
+    }
+
+    useEffect(() => {
+        if (!suggestion) {
+            resetExternalLink();
+            return;
+        }
+
+        if (suggestion.notePath) {
+            const noteId = tree.getNoteIdFromUrl(suggestion.notePath);
+            if (noteId) {
+                setDefaultLinkTitle(noteId);
+            }
+            resetExternalLink();
+        }
+
+        if (suggestion.externalLink) {
+            setLinkTitle(suggestion.externalLink);
+            setLinkType("external-link");
+        }
+    }, [suggestion]);
+
+    function onShown() {
+        const $autocompleteEl = refToJQuerySelector(autocompleteRef);
+        if (!initialText.current) {
+            note_autocomplete.showRecentNotes($autocompleteEl);
+        } else {
+            note_autocomplete.setText($autocompleteEl, initialText.current);
+        }
+
+        // to be able to quickly remove entered text
+        $autocompleteEl
+            .trigger("focus")
+            .trigger("select");
+    }
+
+    function onSubmit() {
+        if (suggestion?.notePath) {
+            // Handle note link
+            setShown(false);
+            textTypeWidget?.addLink(suggestion.notePath, linkType === "reference-link" ? null : linkTitle);
+        } else if (suggestion?.externalLink) {
+            // Handle external link
+            setShown(false);
+            textTypeWidget?.addLink(suggestion.externalLink, linkTitle, true);
+        } else {
+            logError("No link to add.");
+        }
+    }
+
+    const autocompleteRef = useRef<HTMLInputElement>(null);
+
+    return (
+        <Modal
+            className="add-link-dialog"
+            size="lg"
+            maxWidth={1000}
+            title={t("add_link.add_link")}
+            helpPageId="QEAPj01N5f7w"
+            footer={<Button text={t("add_link.button_add_link")} keyboardShortcut="Enter" />}
+            onSubmit={onSubmit}
+            onShown={onShown}
+            onHidden={() => {
+                setSuggestion(null);
+                setShown(false);
+            }}
+            show={shown}
+        >
+            <FormGroup label={t("add_link.note")} name="note">
+                <NoteAutocomplete
+                    inputRef={autocompleteRef}
+                    onChange={setSuggestion}
+                    opts={{
+                        allowExternalLinks: true,
+                        allowCreatingNotes: true
+                    }}
+                />
+            </FormGroup>
+
+            {!hasSelection && (
+                <div className="add-link-title-settings">
+                    {(linkType !== "external-link") && (
+                        <>
+                            <FormRadioGroup
+                                name="link-type"
+                                currentValue={linkType}
+                                values={[
+                                    { value: "reference-link", label: t("add_link.link_title_mirrors") },
+                                    { value: "hyper-link", label: t("add_link.link_title_arbitrary") }
+                                ]}
+                                onChange={(newValue) => setLinkType(newValue as LinkType)}
+                            />
+                        </>
+                    )}
+
+                    {(linkType !== "reference-link" && (
+                        <div className="add-link-title-form-group form-group">
+                            <br/>
+                            <label>
+                                {t("add_link.link_title")}
+
+                                <input className="link-title form-control" style={{ width: "100%" }}
+                                    value={linkTitle}
+                                    onInput={e => setLinkTitle((e.target as HTMLInputElement)?.value ?? "")}
+                                />
+                            </label>
+                        </div>
+                    ))}
+                </div>
+            )}
+        </Modal>
+    );
+}
+
+export default class AddLinkDialog extends ReactBasicWidget {
+    
+    get component() {
+        return <AddLinkDialogComponent />;
+    }
+
+}

apps/client/src/widgets/dialogs/branch_prefix.ts

@@ -1,108 +0,0 @@
-import treeService from "../../services/tree.js";
-import server from "../../services/server.js";
-import froca from "../../services/froca.js";
-import toastService from "../../services/toast.js";
-import BasicWidget from "../basic_widget.js";
-import appContext from "../../components/app_context.js";
-import { t } from "../../services/i18n.js";
-import { Modal } from "bootstrap";
-import { openDialog } from "../../services/dialog.js";
-
-const TPL = /*html*/`<div class="branch-prefix-dialog modal fade mx-auto" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-lg" role="document">
-        <form class="branch-prefix-form">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title flex-grow-1">${t("branch_prefix.edit_branch_prefix")}</h5>
-                    <button class="help-button" type="button" data-help-page="tree-concepts.html#prefix" title="${t("branch_prefix.help_on_tree_prefix")}">?</button>
-                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${t("branch_prefix.close")}"></button>
-                </div>
-                <div class="modal-body">
-                    <div class="form-group">
-                        <label for="branch-prefix-input">${t("branch_prefix.prefix")}</label> &nbsp;
-
-                        <div class="input-group">
-                            <input class="branch-prefix-input form-control">
-                            <div class="branch-prefix-note-title input-group-text"></div>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button class="btn btn-primary btn-sm">${t("branch_prefix.save")}</button>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>`;
-
-export default class BranchPrefixDialog extends BasicWidget {
-    private modal!: Modal;
-    private $form!: JQuery<HTMLElement>;
-    private $treePrefixInput!: JQuery<HTMLElement>;
-    private $noteTitle!: JQuery<HTMLElement>;
-    private branchId: string | null = null;
-
-    doRender() {
-        this.$widget = $(TPL);
-        this.modal = Modal.getOrCreateInstance(this.$widget[0]);
-        this.$form = this.$widget.find(".branch-prefix-form");
-        this.$treePrefixInput = this.$widget.find(".branch-prefix-input");
-        this.$noteTitle = this.$widget.find(".branch-prefix-note-title");
-
-        this.$form.on("submit", () => {
-            this.savePrefix();
-            return false;
-        });
-
-        this.$widget.on("shown.bs.modal", () => this.$treePrefixInput.trigger("focus"));
-    }
-
-    async refresh(notePath: string) {
-        const { noteId, parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(notePath);
-
-        if (!noteId || !parentNoteId) {
-            return;
-        }
-
-        const newBranchId = await froca.getBranchId(parentNoteId, noteId);
-        if (!newBranchId) {
-            return;
-        }
-        this.branchId = newBranchId;
-
-        const branch = froca.getBranch(this.branchId);
-        if (!branch || branch.noteId === "root") {
-            return;
-        }
-
-        const parentNote = await froca.getNote(branch.parentNoteId);
-        if (!parentNote || parentNote.type === "search") {
-            return;
-        }
-
-        this.$treePrefixInput.val(branch.prefix || "");
-
-        const noteTitle = await treeService.getNoteTitle(noteId);
-        this.$noteTitle.text(` - ${noteTitle}`);
-    }
-
-    async editBranchPrefixEvent() {
-        const notePath = appContext.tabManager.getActiveContextNotePath();
-        if (!notePath) {
-            return;
-        }
-
-        await this.refresh(notePath);
-        openDialog(this.$widget);
-    }
-
-    async savePrefix() {
-        const prefix = this.$treePrefixInput.val();
-
-        await server.put(`branches/${this.branchId}/set-prefix`, { prefix: prefix });
-
-        this.modal.hide();
-
-        toastService.showMessage(t("branch_prefix.branch_prefix_saved"));
-    }
-}

apps/client/src/widgets/dialogs/branch_prefix.tsx

@@ -0,0 +1,89 @@
+import { useRef, useState } from "preact/hooks";
+import appContext from "../../components/app_context.js";
+import { t } from "../../services/i18n.js";
+import server from "../../services/server.js";
+import toast from "../../services/toast.js";
+import Modal from "../react/Modal.jsx";
+import ReactBasicWidget from "../react/ReactBasicWidget.js";
+import froca from "../../services/froca.js";
+import tree from "../../services/tree.js";
+import Button from "../react/Button.jsx";
+import FormGroup from "../react/FormGroup.js";
+import useTriliumEvent from "../react/hooks.jsx";
+import FBranch from "../../entities/fbranch.js";
+
+function BranchPrefixDialogComponent() {
+    const [ shown, setShown ] = useState(false);
+    const [ branch, setBranch ] = useState<FBranch>();
+    const [ prefix, setPrefix ] = useState(branch?.prefix ?? "");
+    const branchInput = useRef<HTMLInputElement>(null);
+
+    useTriliumEvent("editBranchPrefix", async () => {
+        const notePath = appContext.tabManager.getActiveContextNotePath();
+        if (!notePath) {
+            return;
+        }
+
+        const { noteId, parentNoteId } = tree.getNoteIdAndParentIdFromUrl(notePath);
+
+        if (!noteId || !parentNoteId) {
+            return;
+        }
+
+        const newBranchId = await froca.getBranchId(parentNoteId, noteId);
+        if (!newBranchId) {
+            return;
+        }    
+        const parentNote = await froca.getNote(parentNoteId);
+        if (!parentNote || parentNote.type === "search") {
+            return;
+        }
+
+        setBranch(froca.getBranch(newBranchId));
+        setShown(true);
+    });
+
+    async function onSubmit() {
+        if (!branch) {
+            return;
+        }
+
+        savePrefix(branch.branchId, prefix);
+        setShown(false);
+    }
+
+    return (
+        <Modal
+            className="branch-prefix-dialog"
+            title={t("branch_prefix.edit_branch_prefix")}
+            size="lg"
+            onShown={() => branchInput.current?.focus()}
+            onHidden={() => setShown(false)}
+            onSubmit={onSubmit}
+            helpPageId="TBwsyfadTA18"
+            footer={<Button text={t("branch_prefix.save")} />}
+            show={shown}
+        >
+            <FormGroup label={t("branch_prefix.prefix")} name="prefix">
+                <div class="input-group">
+                    <input class="branch-prefix-input form-control" value={prefix} ref={branchInput}
+                        onChange={(e) => setPrefix((e.target as HTMLInputElement).value)} />
+                    <div class="branch-prefix-note-title input-group-text"> - {branch && branch.getNoteFromCache().title}</div>
+                </div>
+            </FormGroup>
+        </Modal>
+    );
+}
+
+export default class BranchPrefixDialog extends ReactBasicWidget {
+
+    get component() {
+        return <BranchPrefixDialogComponent />;
+    }
+
+}
+
+async function savePrefix(branchId: string, prefix: string) {
+    await server.put(`branches/${branchId}/set-prefix`, { prefix: prefix });
+    toast.showMessage(t("branch_prefix.branch_prefix_saved"));
+}