ui/pager: fix some issues

; Conflicts:
;	apps/client/src/widgets/note_bars/CollectionProperties.tsx
;	apps/client/src/widgets/ribbon/collection-properties-config.tsx

.envrc

@@ -0,0 +1,3 @@
+if has nix; then
+    use flake
+fi

.github/workflows/checks.yml

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

.github/workflows/deploy-docs.yml

@@ -67,7 +67,7 @@ jobs:
 
       - name: Deploy
         uses: ./.github/actions/deploy-to-cloudflare-pages
-        if: github.repository == ${{ vars.REPO_MAIN }}
+        if: ${{ github.repository == vars.REPO_MAIN }}
         with:
           project_name: "trilium-docs"
           comment_body: "📚 Documentation preview is ready"

.github/workflows/i18n.yml

@@ -0,0 +1,30 @@
+name: Internationalization
+on:
+  push:
+    branches:
+      - "weblate:*"
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - "apps/client/src/translations/**"
+      - ".github/workflows/i18n.yml"
+
+permissions:
+  contents: read
+
+jobs:
+  i18n-check:
+    name: Check i18n translations
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: pnpm/action-setup@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Check translations
+        run: pnpm tsx scripts/translation/check-translation-coverage.ts

.github/workflows/main-docker.yml

@@ -86,12 +86,12 @@ jobs:
 
       - name: Upload Playwright trace
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: Playwright trace (${{ matrix.dockerfile }})
           path: test-output/playwright/output
 
-      - uses: actions/upload-artifact@v5
+      - uses: actions/upload-artifact@v6
         if: ${{ !cancelled() }}
         with:
           name: Playwright report (${{ matrix.dockerfile }})
@@ -213,7 +213,7 @@ jobs:
           touch "/tmp/digests/${digest#sha256:}"
 
       - name: Upload digest
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: digests-${{ env.PLATFORM_PAIR }}-${{ matrix.dockerfile }}
           path: /tmp/digests/*
@@ -227,7 +227,7 @@ jobs:
       - build
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           path: /tmp/digests
           pattern: digests-*

.github/workflows/nightly.yml

@@ -26,7 +26,7 @@ permissions:
 
 jobs:
   nightly-electron:
-    if: github.repository == ${{ vars.REPO_MAIN }}
+    if: ${{ github.repository == vars.REPO_MAIN }}
     name: Deploy nightly
     strategy:
       fail-fast: false
@@ -102,14 +102,14 @@ jobs:
           name: Nightly Build
 
       - name: Publish artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         if: ${{ github.event_name == 'pull_request' }}
         with:
           name: TriliumNotes ${{ matrix.os.name }} ${{ matrix.arch }}
           path: apps/desktop/upload
 
   nightly-server:
-    if: github.repository == ${{ vars.REPO_MAIN }}
+    if: ${{ github.repository == vars.REPO_MAIN }}
     name: Deploy server nightly
     strategy:
       fail-fast: false

.github/workflows/playwright.yml

@@ -77,7 +77,7 @@ jobs:
 
       - name: Upload test report
         if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: e2e report ${{ matrix.arch }}
           path: apps/server-e2e/test-output

.github/workflows/release.yml

@@ -11,6 +11,14 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  sanity-check:
+    name: Sanity Check
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Check version consistency
+        run: pnpm tsx ${{ github.workspace }}/scripts/check-version-consistency.ts ${{ github.ref_name }}
   make-electron:
     name: Make Electron
     strategy:
@@ -73,7 +81,7 @@ jobs:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGN_KEY }}
 
       - name: Upload the artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: release-desktop-${{ matrix.os.name }}-${{ matrix.arch }}
           path: apps/desktop/upload/*.*
@@ -100,7 +108,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: Upload the artifact
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: release-server-linux-${{ matrix.arch }}
           path: upload/*.*
@@ -120,7 +128,7 @@ jobs:
             docs/Release Notes
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           merge-multiple: true
           pattern: release-*

.github/workflows/web-clipper.yml

@@ -0,0 +1,69 @@
+name: Deploy web clipper extension
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "apps/web-clipper/**"
+    tags:
+      - "web-clipper-v*"
+
+  pull_request:
+    paths:
+      - "apps/web-clipper/**"
+
+permissions:
+  contents: write
+  discussions: write
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    name: Build web clipper extension
+
+    permissions:
+      contents: read
+      deployments: write
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: pnpm/action-setup@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v6
+        with:
+          node-version: 24
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --filter web-clipper --frozen-lockfile --ignore-scripts
+
+      - name: Build the web clipper extension
+        run: |
+          pnpm --filter web-clipper zip
+          pnpm --filter web-clipper zip:firefox
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v6
+        if: ${{ !startsWith(github.ref, 'refs/tags/web-clipper-v') }}
+        with:
+          name: web-clipper-extension
+          path: apps/web-clipper/.output/*.zip
+          include-hidden-files: true
+          if-no-files-found: error
+          compression-level: 0
+
+      - name: Release web clipper extension
+        uses: softprops/action-gh-release@v2.5.0
+        if: ${{ startsWith(github.ref, 'refs/tags/web-clipper-v') }}
+        with:
+          draft: false
+          fail_on_unmatched_files: true
+          files: apps/web-clipper/.output/*.zip
+          discussion_category_name: Releases
+          make_latest: false
+          token: ${{ secrets.RELEASE_PAT }}

.github/workflows/website.yml

@@ -34,7 +34,7 @@ jobs:
           cache: "pnpm"
 
       - name: Install dependencies
-        run: pnpm install --filter website --frozen-lockfile
+        run: pnpm install --filter website --frozen-lockfile --ignore-scripts
 
       - name: Build the website
         run: pnpm website:build

.gitignore

@@ -44,9 +44,11 @@ upload
 .rollup.cache
 *.tsbuildinfo
 
+/.direnv
 /result
 .svelte-kit
 
 # docs
 site/
-apps/*/coverage
+apps/*/coverage
+scripts/translation/.language*.json

.nvmrc

@@ -1 +1 @@
-24.11.1
+24.13.1

.vscode/settings.json

@@ -37,7 +37,13 @@
         "apps/server/src/assets/doc_notes/**": true,
         "apps/edit-docs/demo/**": true
     },
+    "editor.codeActionsOnSave": {
+        "source.fixAll.eslint": "explicit"
+    },
     "eslint.rules.customizations": [
         { "rule": "*", "severity": "warn" }
+    ],
+    "cSpell.words": [
+      "Trilium"
     ]
-}
+}

README.md

@@ -165,6 +165,17 @@ pnpm install
 pnpm edit-docs:edit-docs
 ```
 
+Alternatively, if you have Nix installed:
+```shell
+# Run directly
+nix run .#edit-docs
+
+# Or install to your profile
+nix profile install .#edit-docs
+trilium-edit-docs
+```
+
+
 ### Building the Executable
 Download the repository, install dependencies using `pnpm` and then build the desktop app for Windows:
 ```shell

apps/build-docs/package.json

@@ -9,14 +9,14 @@
   "keywords": [],
   "author": "Elian Doran <contact@eliandoran.me>",
   "license": "AGPL-3.0-only",
-  "packageManager": "pnpm@10.24.0",
+  "packageManager": "pnpm@10.29.3",
   "devDependencies": {
-    "@redocly/cli": "2.12.3",
+    "@redocly/cli": "2.18.1",
     "archiver": "7.0.1",
-    "fs-extra": "11.3.2",
-    "react": "19.2.1",
-    "react-dom": "19.2.1",
-    "typedoc": "0.28.15",
+    "fs-extra": "11.3.3",
+    "react": "19.2.4",
+    "react-dom": "19.2.4",
+    "typedoc": "0.28.17",
     "typedoc-plugin-missing-exports": "4.1.2"
   }
 }

apps/client/index.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <link rel="shortcut icon" href="favicon.ico">
+        <meta name="mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, viewport-fit=cover, interactive-widget=resizes-content" />
+        <link rel="manifest" crossorigin="use-credentials" href="manifest.webmanifest">
+        <title>Trilium Notes</title>
+    </head>
+
+    <body id="trilium-app">
+        <noscript>Trilium requires JavaScript to be enabled.</noscript>
+
+        <div id="context-menu-cover"></div>
+        <div class="dropdown-menu dropdown-menu-sm" id="context-menu-container" style="display: none"></div>
+
+        <!-- Required to match the PWA's top bar color with the theme -->
+        <!-- This works even when the user directly changes --root-background in CSS -->
+        <div id="background-color-tracker" style="position: absolute; visibility: hidden; color: var(--root-background); transition: color 1ms;"></div>
+
+        <script src="./src/index.ts" type="module"></script>
+
+        <!-- Required for correct loading of scripts in Electron -->
+        <script>
+            if (typeof module === 'object') {window.module = module; module = undefined;}
+        </script>
+    </body>
+</html>

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/client",
-  "version": "0.100.0",
+  "version": "0.101.3",
   "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
   "private": true,
   "license": "AGPL-3.0-only",
@@ -17,24 +17,24 @@
   },
   "dependencies": {
     "@excalidraw/excalidraw": "0.18.0",
-    "@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",
+    "@fullcalendar/core": "6.1.20",
+    "@fullcalendar/daygrid": "6.1.20",
+    "@fullcalendar/interaction": "6.1.20",
+    "@fullcalendar/list": "6.1.20",
+    "@fullcalendar/multimonth": "6.1.20",
+    "@fullcalendar/timegrid": "6.1.20",
     "@maplibre/maplibre-gl-leaflet": "0.1.3",
     "@mermaid-js/layout-elk": "0.2.0",
     "@mind-elixir/node-menu": "5.0.1",
     "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.5.1",
+    "@preact/signals": "2.8.0",
     "@triliumnext/ckeditor5": "workspace:*",
     "@triliumnext/codemirror": "workspace:*",
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/highlightjs": "workspace:*",
     "@triliumnext/share-theme": "workspace:*",
     "@triliumnext/split.js": "workspace:*",
-    "@zumer/snapdom": "2.0.1",
+    "@zumer/snapdom": "2.0.2",
     "autocomplete.js": "0.38.1",
     "bootstrap": "5.3.8",
     "boxicons": "2.1.4",
@@ -42,25 +42,26 @@
     "color": "5.0.3",
     "debounce": "3.0.0",
     "draggabilly": "3.0.0",
-    "force-graph": "1.51.0",
-    "globals": "16.5.0",
-    "i18next": "25.7.1",
+    "force-graph": "1.51.1",
+    "globals": "17.3.0",
+    "i18next": "25.8.7",
     "i18next-http-backend": "3.0.2",
-    "jquery": "3.7.1",
+    "jquery": "4.0.0",
     "jquery.fancytree": "2.38.5",
     "jsplumb": "2.15.6",
-    "katex": "0.16.27",
+    "katex": "0.16.28",
     "knockout": "3.5.1",
     "leaflet": "1.9.4",
     "leaflet-gpx": "2.2.0",
     "mark.js": "8.11.1",
-    "marked": "17.0.1",
+    "marked": "17.0.2",
     "mermaid": "11.12.2",
-    "mind-elixir": "5.3.7",
+    "mind-elixir": "5.8.0",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
-    "preact": "10.28.0",
-    "react-i18next": "16.4.0",
+    "preact": "10.28.3",
+    "react-i18next": "16.5.4",
+    "react-window": "2.2.7",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",
@@ -68,17 +69,18 @@
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@preact/preset-vite": "2.10.2",
+    "@prefresh/vite": "2.4.11",
     "@types/bootstrap": "5.2.10",
     "@types/jquery": "3.5.33",
     "@types/leaflet": "1.9.21",
     "@types/leaflet-gpx": "1.3.8",
     "@types/mark.js": "8.11.12",
     "@types/reveal.js": "5.2.2",
-    "@types/tabulator-tables": "6.3.0",
+    "@types/tabulator-tables": "6.3.1",
     "copy-webpack-plugin": "13.0.1",
-    "happy-dom": "20.0.11",
+    "happy-dom": "20.6.1",
+    "lightningcss": "1.31.1",
     "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.4"
+    "vite-plugin-static-copy": "3.2.0"
   }
 }

apps/client/src/components/app_context.ts

@@ -1,40 +1,41 @@
-import froca from "../services/froca.js";
-import RootCommandExecutor from "./root_command_executor.js";
-import Entrypoints from "./entrypoints.js";
-import options from "../services/options.js";
-import utils, { hasTouchBar } from "../services/utils.js";
-import zoomComponent from "./zoom.js";
-import TabManager from "./tab_manager.js";
-import Component from "./component.js";
-import keyboardActionsService from "../services/keyboard_actions.js";
-import linkService, { type ViewScope } from "../services/link.js";
-import MobileScreenSwitcherExecutor, { type Screen } from "./mobile_screen_switcher.js";
-import MainTreeExecutors from "./main_tree_executors.js";
-import toast from "../services/toast.js";
-import ShortcutComponent from "./shortcut_component.js";
-import { t, initLocale } from "../services/i18n.js";
-import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
-import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
-import type { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
-import type LoadResults from "../services/load_results.js";
-import type { Attribute } from "../services/attribute_parser.js";
-import type NoteTreeWidget from "../widgets/note_tree.js";
-import type { default as NoteContext, GetTextEditorCallback } from "./note_context.js";
-import type { NativeImage, TouchBar } from "electron";
-import TouchBarComponent from "./touch_bar.js";
 import type { CKTextEditor } from "@triliumnext/ckeditor5";
 import type CodeMirror from "@triliumnext/codemirror";
-import { StartupChecks } from "./startup_checks.js";
-import type { CreateNoteOpts } from "../services/note_create.js";
+import { SqlExecuteResponse } from "@triliumnext/commons";
+import type { NativeImage, TouchBar } from "electron";
 import { ColumnComponent } from "tabulator-tables";
-import { ChooseNoteTypeCallback } from "../widgets/dialogs/note_type_chooser.jsx";
-import type RootContainer from "../widgets/containers/root_container.js";
-import { SqlExecuteResults } from "@triliumnext/commons";
-import { AddLinkOpts } from "../widgets/dialogs/add_link.jsx";
-import { IncludeNoteOpts } from "../widgets/dialogs/include_note.jsx";
+
+import type { Attribute } from "../services/attribute_parser.js";
+import froca from "../services/froca.js";
+import { initLocale, t } from "../services/i18n.js";
+import keyboardActionsService from "../services/keyboard_actions.js";
+import linkService, { type ViewScope } from "../services/link.js";
+import type LoadResults from "../services/load_results.js";
+import type { CreateNoteOpts } from "../services/note_create.js";
+import options from "../services/options.js";
+import toast from "../services/toast.js";
+import utils, { hasTouchBar } from "../services/utils.js";
 import { ReactWrappedWidget } from "../widgets/basic_widget.js";
-import type { MarkdownImportOpts } from "../widgets/dialogs/markdown_import.jsx";
+import type RootContainer from "../widgets/containers/root_container.js";
+import { AddLinkOpts } from "../widgets/dialogs/add_link.jsx";
+import type { ConfirmWithMessageOptions, ConfirmWithTitleOptions } from "../widgets/dialogs/confirm.js";
+import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
+import { IncludeNoteOpts } from "../widgets/dialogs/include_note.jsx";
 import type { InfoProps } from "../widgets/dialogs/info.jsx";
+import type { MarkdownImportOpts } from "../widgets/dialogs/markdown_import.jsx";
+import { ChooseNoteTypeCallback } from "../widgets/dialogs/note_type_chooser.jsx";
+import type { PromptDialogOptions } from "../widgets/dialogs/prompt.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import Component from "./component.js";
+import Entrypoints from "./entrypoints.js";
+import MainTreeExecutors from "./main_tree_executors.js";
+import MobileScreenSwitcherExecutor, { type Screen } from "./mobile_screen_switcher.js";
+import type { default as NoteContext, GetTextEditorCallback } from "./note_context.js";
+import RootCommandExecutor from "./root_command_executor.js";
+import ShortcutComponent from "./shortcut_component.js";
+import { StartupChecks } from "./startup_checks.js";
+import TabManager from "./tab_manager.js";
+import TouchBarComponent from "./touch_bar.js";
+import zoomComponent from "./zoom.js";
 
 interface Layout {
     getRootWidget: (appContext: AppContext) => RootContainer;
@@ -153,6 +154,7 @@ export type CommandMappings = {
     };
     openInTab: ContextMenuCommandData;
     openNoteInSplit: ContextMenuCommandData;
+    openNoteInWindow: ContextMenuCommandData;
     openNoteInPopup: ContextMenuCommandData;
     toggleNoteHoisting: ContextMenuCommandData;
     insertNoteAfter: ContextMenuCommandData;
@@ -265,7 +267,7 @@ export type CommandMappings = {
 
     reEvaluateRightPaneVisibility: CommandData;
     runActiveNote: CommandData;
-    scrollContainerToCommand: CommandData & {
+    scrollContainerTo: CommandData & {
         position: number;
     };
     scrollToEnd: CommandData;
@@ -381,7 +383,8 @@ export type CommandMappings = {
     reloadTextEditor: CommandData;
     chooseNoteType: CommandData & {
         callback: ChooseNoteTypeCallback
-    }
+    };
+    customDownload: CommandData;
 };
 
 type EventMappings = {
@@ -407,7 +410,7 @@ type EventMappings = {
     addNewLabel: CommandData;
     addNewRelation: CommandData;
     sqlQueryResults: CommandData & {
-        results: SqlExecuteResults;
+        response: SqlExecuteResponse;
     };
     readOnlyTemporarilyDisabled: {
         noteContext: NoteContext;
@@ -447,6 +450,7 @@ type EventMappings = {
     };
     searchRefreshed: { ntxId?: string | null };
     textEditorRefreshed: { ntxId?: string | null, editor: CKTextEditor };
+    contentElRefreshed: { ntxId?: string | null, contentEl: HTMLElement };
     hoistedNoteChanged: {
         noteId: string;
         ntxId: string | null;
@@ -471,6 +475,11 @@ type EventMappings = {
     noteContextRemoved: {
         ntxIds: string[];
     };
+    contextDataChanged: {
+        noteContext: NoteContext;
+        key: string;
+        value: unknown;
+    };
     exportSvg: { ntxId: string | null | undefined; };
     exportPng: { ntxId: string | null | undefined; };
     geoMapCreateChildNote: {
@@ -498,6 +507,10 @@ type EventMappings = {
         noteIds: string[];
     };
     refreshData: { ntxId: string | null | undefined };
+    contentSafeMarginChanged: {
+        top: number;
+        noteContext: NoteContext;
+    }
 };
 
 export type EventListener<T extends EventNames> = {
@@ -691,10 +704,8 @@ $(window).on("beforeunload", () => {
                 console.log(`Component ${component.componentId} is not finished saving its state.`);
                 allSaved = false;
             }
-        } else {
-            if (!listener()) {
-                allSaved = false;
-            }
+        } else if (!listener()) {
+            allSaved = false;
         }
     }
 
@@ -704,7 +715,7 @@ $(window).on("beforeunload", () => {
     }
 });
 
-$(window).on("hashchange", function () {
+$(window).on("hashchange", () => {
     const { notePath, ntxId, viewScope, searchString } = linkService.parseNavigationStateFromUrl(window.location.href);
 
     if (notePath || ntxId) {

apps/client/src/components/component.ts

@@ -57,6 +57,18 @@ export class TypedComponent<ChildT extends TypedComponent<ChildT>> {
         return this;
     }
 
+    /**
+     * Removes a child component from this component's children array.
+     * This is used for cleanup when a widget is unmounted to prevent event listener accumulation.
+     */
+    removeChild(component: ChildT) {
+        const index = this.children.indexOf(component);
+        if (index !== -1) {
+            this.children.splice(index, 1);
+            component.parent = undefined;
+        }
+    }
+
     handleEvent<T extends EventNames>(name: T, data: EventData<T>): Promise<unknown[] | unknown> | null | undefined {
         try {
             const callMethodPromise = this.initialized ? this.initialized.then(() => this.callMethod((this as any)[`${name}Event`], data)) : this.callMethod((this as any)[`${name}Event`], data);
@@ -65,8 +77,8 @@ export class TypedComponent<ChildT extends TypedComponent<ChildT>> {
 
             // don't create promises if not needed (optimization)
             return callMethodPromise && childrenPromise ? Promise.all([callMethodPromise, childrenPromise]) : callMethodPromise || childrenPromise;
-        } catch (e: any) {
-            console.error(`Handling of event '${name}' failed in ${this.constructor.name} with error ${e.message} ${e.stack}`);
+        } catch (e: unknown) {
+            console.error(`Handling of event '${name}' failed in ${this.constructor.name} with error`, e);
 
             return null;
         }

apps/client/src/components/entrypoints.ts

@@ -1,16 +1,17 @@
-import utils from "../services/utils.js";
+import { CreateChildrenResponse, SqlExecuteResponse } from "@triliumnext/commons";
+
+import bundleService from "../services/bundle.js";
 import dateNoteService from "../services/date_notes.js";
+import froca from "../services/froca.js";
+import { t } from "../services/i18n.js";
+import linkService from "../services/link.js";
 import protectedSessionHolder from "../services/protected_session_holder.js";
 import server from "../services/server.js";
+import toastService from "../services/toast.js";
+import utils from "../services/utils.js";
+import ws from "../services/ws.js";
 import appContext, { type NoteCommandData } from "./app_context.js";
 import Component from "./component.js";
-import toastService from "../services/toast.js";
-import ws from "../services/ws.js";
-import bundleService from "../services/bundle.js";
-import froca from "../services/froca.js";
-import linkService from "../services/link.js";
-import { t } from "../services/i18n.js";
-import { CreateChildrenResponse, SqlExecuteResponse } from "@triliumnext/commons";
 
 export default class Entrypoints extends Component {
     constructor() {
@@ -187,13 +188,8 @@ export default class Entrypoints extends Component {
         } else if (note.mime.endsWith("env=backend")) {
             await server.post(`script/run/${note.noteId}`);
         } else if (note.mime === "text/x-sqlite;schema=trilium") {
-            const resp = await server.post<SqlExecuteResponse>(`sql/execute/${note.noteId}`);
-
-            if (!resp.success) {
-                toastService.showError(t("entrypoints.sql-error", { message: resp.error }));
-            }
-
-            await appContext.triggerEvent("sqlQueryResults", { ntxId: ntxId, results: resp.results });
+            const response = await server.post<SqlExecuteResponse>(`sql/execute/${note.noteId}`);
+            await appContext.triggerEvent("sqlQueryResults", { ntxId, response });
         }
 
         toastService.showMessage(t("entrypoints.note-executed"));

apps/client/src/components/note_context.ts

@@ -1,18 +1,20 @@
-import protectedSessionHolder from "../services/protected_session_holder.js";
-import server from "../services/server.js";
-import utils from "../services/utils.js";
-import appContext, { type EventData, type EventListener } from "./app_context.js";
-import treeService from "../services/tree.js";
-import Component from "./component.js";
-import froca from "../services/froca.js";
-import hoistedNoteService from "../services/hoisted_note.js";
-import options from "../services/options.js";
-import type { ViewScope } from "../services/link.js";
-import type FNote from "../entities/fnote.js";
 import type { CKTextEditor } from "@triliumnext/ckeditor5";
 import type CodeMirror from "@triliumnext/codemirror";
+
+import type FNote from "../entities/fnote.js";
 import { closeActiveDialog } from "../services/dialog.js";
+import froca from "../services/froca.js";
+import hoistedNoteService from "../services/hoisted_note.js";
+import type { ViewScope } from "../services/link.js";
+import options from "../services/options.js";
+import protectedSessionHolder from "../services/protected_session_holder.js";
+import server from "../services/server.js";
+import treeService from "../services/tree.js";
+import utils from "../services/utils.js";
 import { ReactWrappedWidget } from "../widgets/basic_widget.js";
+import type { HeadingContext } from "../widgets/sidebar/TableOfContents.js";
+import appContext, { type EventData, type EventListener } from "./app_context.js";
+import Component from "./component.js";
 
 export interface SetNoteOpts {
     triggerSwitchEvent?: unknown;
@@ -21,6 +23,31 @@ export interface SetNoteOpts {
 
 export type GetTextEditorCallback = (editor: CKTextEditor) => void;
 
+export type SaveState = "saved" | "saving" | "unsaved" | "error";
+
+export interface NoteContextDataMap {
+    toc: HeadingContext;
+    pdfPages: {
+        totalPages: number;
+        currentPage: number;
+        scrollToPage(page: number): void;
+        requestThumbnail(page: number): void;
+    };
+    pdfAttachments: {
+        attachments: PdfAttachment[];
+        downloadAttachment(filename: string): void;
+    };
+    pdfLayers: {
+        layers: PdfLayer[];
+        toggleLayer(layerId: string, visible: boolean): void;
+    };
+    saveState: {
+        state: SaveState;
+    };
+}
+
+type ContextDataKey = keyof NoteContextDataMap;
+
 class NoteContext extends Component implements EventListener<"entitiesReloaded"> {
     ntxId: string | null;
     hoistedNoteId: string;
@@ -31,6 +58,13 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
     parentNoteId?: string | null;
     viewScope?: ViewScope;
 
+    /**
+     * Metadata storage for UI components (e.g., table of contents, PDF page list, code outline).
+     * This allows type widgets to publish data that sidebar/toolbar components can consume.
+     * Data is automatically cleared when navigating to a different note.
+     */
+    private contextData: Map<string, unknown> = new Map();
+
     constructor(ntxId: string | null = null, hoistedNoteId: string = "root", mainNtxId: string | null = null) {
         super();
 
@@ -90,6 +124,22 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
         this.viewScope = opts.viewScope;
         ({ noteId: this.noteId, parentNoteId: this.parentNoteId } = treeService.getNoteIdAndParentIdFromUrl(resolvedNotePath));
 
+        // Clear context data when switching notes and notify subscribers
+        const oldKeys = Array.from(this.contextData.keys());
+        this.contextData.clear();
+        if (oldKeys.length > 0) {
+            // Notify subscribers asynchronously to avoid blocking navigation
+            window.setTimeout(() => {
+                for (const key of oldKeys) {
+                    this.triggerEvent("contextDataChanged", {
+                        noteContext: this,
+                        key,
+                        value: undefined
+                    });
+                }
+            }, 0);
+        }
+
         this.saveToRecentNotes(resolvedNotePath);
 
         protectedSessionHolder.touchProtectedSessionIfNecessary(this.note);
@@ -389,7 +439,7 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
      * If no content could be determined `null` is returned instead.
      */
     async getContentElement() {
-        return this.timeout<JQuery<HTMLElement>>(
+        return this.timeout<JQuery<HTMLElement> | null>(
             new Promise((resolve) =>
                 appContext.triggerCommand("executeWithContentElement", {
                     resolve,
@@ -442,6 +492,52 @@ class NoteContext extends Component implements EventListener<"entitiesReloaded">
 
         return title;
     }
+
+    /**
+     * Set metadata for this note context (e.g., table of contents, PDF pages, code outline).
+     * This data can be consumed by sidebar/toolbar components.
+     *
+     * @param key - Unique identifier for the data type (e.g., "toc", "pdfPages", "codeOutline")
+     * @param value - The data to store (will be cleared when switching notes)
+     */
+    setContextData<K extends ContextDataKey>(key: K, value: NoteContextDataMap[K]): void {
+        this.contextData.set(key, value);
+        // Trigger event so subscribers can react
+        this.triggerEvent("contextDataChanged", {
+            noteContext: this,
+            key,
+            value
+        });
+    }
+
+    /**
+     * Get metadata for this note context.
+     *
+     * @param key - The data key to retrieve
+     * @returns The stored data, or undefined if not found
+     */
+    getContextData<K extends ContextDataKey>(key: K): NoteContextDataMap[K] | undefined {
+        return this.contextData.get(key) as NoteContextDataMap[K] | undefined;
+    }
+
+    /**
+     * Check if context data exists for a given key.
+     */
+    hasContextData(key: ContextDataKey): boolean {
+        return this.contextData.has(key);
+    }
+
+    /**
+     * Clear specific context data.
+     */
+    clearContextData(key: ContextDataKey): void {
+        this.contextData.delete(key);
+        this.triggerEvent("contextDataChanged", {
+            noteContext: this,
+            key,
+            value: undefined
+        });
+    }
 }
 
 export function openInCurrentNoteContext(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDownEvent | React.PointerEvent<HTMLCanvasElement> | null, notePath: string, viewScope?: ViewScope) {

apps/client/src/components/root_command_executor.ts

@@ -1,14 +1,14 @@
-import Component from "./component.js";
-import appContext, { type CommandData, type CommandListenerData } from "./app_context.js";
 import dateNoteService from "../services/date_notes.js";
-import treeService from "../services/tree.js";
-import openService from "../services/open.js";
-import protectedSessionService from "../services/protected_session.js";
-import options from "../services/options.js";
 import froca from "../services/froca.js";
-import utils from "../services/utils.js";
-import toastService from "../services/toast.js";
 import noteCreateService from "../services/note_create.js";
+import openService from "../services/open.js";
+import options from "../services/options.js";
+import protectedSessionService from "../services/protected_session.js";
+import toastService from "../services/toast.js";
+import treeService from "../services/tree.js";
+import utils, { openInReusableSplit } from "../services/utils.js";
+import appContext, { type CommandListenerData } from "./app_context.js";
+import Component from "./component.js";
 
 export default class RootCommandExecutor extends Component {
     editReadOnlyNoteCommand() {
@@ -193,6 +193,19 @@ export default class RootCommandExecutor extends Component {
         appContext.triggerEvent("zenModeChanged", { isEnabled });
     }
 
+    async toggleRibbonTabNoteMapCommand(data: CommandListenerData<"toggleRibbonTabNoteMap">) {
+        const { isExperimentalFeatureEnabled } = await import("../services/experimental_features.js");
+        const isNewLayout = isExperimentalFeatureEnabled("new-layout");
+        if (!isNewLayout) {
+            this.triggerEvent("toggleRibbonTabNoteMap", data);
+            return;
+        }
+
+        const activeContext = appContext.tabManager.getActiveContext();
+        if (!activeContext?.notePath) return;
+        openInReusableSplit(activeContext.notePath, "note-map");
+    }
+
     firstTabCommand() {
         this.#goToTab(1);
     }
@@ -262,7 +275,7 @@ export default class RootCommandExecutor extends Component {
         }
         catch (e) {
             console.error("Error creating AI Chat note:", e);
-            toastService.showError("Failed to create AI Chat note: " + (e as Error).message);
+            toastService.showError(`Failed to create AI Chat note: ${(e as Error).message}`);
         }
     }
 }

apps/client/src/desktop.ts

@@ -1,17 +1,18 @@
-import appContext from "./components/app_context.js";
-import utils from "./services/utils.js";
-import noteTooltipService from "./services/note_tooltip.js";
-import bundleService from "./services/bundle.js";
-import toastService from "./services/toast.js";
-import noteAutocompleteService from "./services/note_autocomplete.js";
-import electronContextMenu from "./menus/electron_context_menu.js";
-import glob from "./services/glob.js";
-import { t } from "./services/i18n.js";
-import options from "./services/options.js";
+import "autocomplete.js/index_jquery.js";
+
 import type ElectronRemote from "@electron/remote";
 import type Electron from "electron";
-import "boxicons/css/boxicons.min.css";
-import "autocomplete.js/index_jquery.js";
+
+import appContext from "./components/app_context.js";
+import electronContextMenu from "./menus/electron_context_menu.js";
+import bundleService from "./services/bundle.js";
+import glob from "./services/glob.js";
+import { t } from "./services/i18n.js";
+import noteAutocompleteService from "./services/note_autocomplete.js";
+import noteTooltipService from "./services/note_tooltip.js";
+import options from "./services/options.js";
+import toastService from "./services/toast.js";
+import utils from "./services/utils.js";
 
 await appContext.earlyInit();
 
@@ -45,10 +46,6 @@ if (utils.isElectron()) {
     electronContextMenu.setupContextMenu();
 }
 
-if (utils.isPWA()) {
-    initPWATopbarColor();
-}
-
 function initOnElectron() {
     const electron: typeof Electron = utils.dynamicRequire("electron");
     electron.ipcRenderer.on("globalShortcut", async (event, actionName) => appContext.triggerCommand(actionName));
@@ -98,15 +95,22 @@ function initFullScreenDetection(currentWindow: Electron.BrowserWindow) {
 }
 
 function initTransparencyEffects(style: CSSStyleDeclaration, currentWindow: Electron.BrowserWindow) {
+    const material = style.getPropertyValue("--background-material").trim();
     if (window.glob.platform === "win32") {
-        const material = style.getPropertyValue("--background-material");
-        // TriliumNextTODO: find a nicer way to make TypeScript happy – unfortunately TS did not like Array.includes here
         const bgMaterialOptions = ["auto", "none", "mica", "acrylic", "tabbed"] as const;
         const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
         if (foundBgMaterialOption) {
             currentWindow.setBackgroundMaterial(foundBgMaterialOption);
         }
     }
+
+    if (window.glob.platform === "darwin") {
+        const bgMaterialOptions = [ "popover", "tooltip", "titlebar", "selection", "menu", "sidebar", "header", "sheet", "window", "hud", "fullscreen-ui", "content", "under-window", "under-page" ] as const;
+        const foundBgMaterialOption = bgMaterialOptions.find((bgMaterialOption) => material === bgMaterialOption);
+        if (foundBgMaterialOption) {
+            currentWindow.setVibrancy(foundBgMaterialOption);
+        }
+    }
 }
 
 /**
@@ -126,20 +130,3 @@ function initDarkOrLightMode(style: CSSStyleDeclaration) {
     const { nativeTheme } = utils.dynamicRequire("@electron/remote") as typeof ElectronRemote;
     nativeTheme.themeSource = themeSource;
 }
-
-function initPWATopbarColor() {
-    const tracker = $("#background-color-tracker");
-
-    if (tracker.length) {
-        const applyThemeColor = () => {
-            let meta = $("meta[name='theme-color']");
-            if (!meta.length) {
-                meta = $(`<meta name="theme-color">`).appendTo($("head"));
-            }
-            meta.attr("content", tracker.css("color"));
-        };
-
-        tracker.on("transitionend", applyThemeColor);
-        applyThemeColor();
-    }
-}

apps/client/src/entities/fnote.ts

@@ -1,35 +1,18 @@
-import server from "../services/server.js";
-import noteAttributeCache from "../services/note_attribute_cache.js";
-import protectedSessionHolder from "../services/protected_session_holder.js";
+import { getNoteIcon } from "@triliumnext/commons";
+
 import cssClassManager from "../services/css_class_manager.js";
 import type { Froca } from "../services/froca-interface.js";
-import type FAttachment from "./fattachment.js";
-import type { default as FAttribute, AttributeType } from "./fattribute.js";
-import utils from "../services/utils.js";
+import noteAttributeCache from "../services/note_attribute_cache.js";
+import protectedSessionHolder from "../services/protected_session_holder.js";
 import search from "../services/search.js";
+import server from "../services/server.js";
+import utils from "../services/utils.js";
+import type FAttachment from "./fattachment.js";
+import type { AttributeType, default as FAttribute } from "./fattribute.js";
 
 const LABEL = "label";
 const RELATION = "relation";
 
-const NOTE_TYPE_ICONS = {
-    file: "bx bx-file",
-    image: "bx bx-image",
-    code: "bx bx-code",
-    render: "bx bx-extension",
-    search: "bx bx-file-find",
-    relationMap: "bx bxs-network-chart",
-    book: "bx bx-book",
-    noteMap: "bx bxs-network-chart",
-    mermaid: "bx bx-selection",
-    canvas: "bx bx-pen",
-    webView: "bx bx-globe-alt",
-    launcher: "bx bx-link",
-    doc: "bx bxs-file-doc",
-    contentWidget: "bx bxs-widget",
-    mindMap: "bx bx-sitemap",
-    aiChat: "bx bx-bot"
-};
-
 /**
  * There are many different Note types, some of which are entirely opaque to the
  * end user. Those types should be used only for checking against, they are
@@ -268,13 +251,12 @@ export default class FNote {
                 }
             }
             return results;
-        } else {
-            return this.children;
         }
+        return this.children;
     }
 
     async getSubtreeNoteIds(includeArchived = false) {
-        let noteIds: (string | string[])[] = [];
+        const noteIds: (string | string[])[] = [];
         for (const child of await this.getChildNotes()) {
             if (child.isArchived && !includeArchived) continue;
 
@@ -471,9 +453,8 @@ export default class FNote {
                 return a.isHidden ? 1 : -1;
             } else if (a.isSearch !== b.isSearch) {
                 return a.isSearch ? 1 : -1;
-            } else {
-                return a.notePath.length - b.notePath.length;
             }
+            return a.notePath.length - b.notePath.length;
         });
 
         return notePaths;
@@ -585,26 +566,15 @@ export default class FNote {
         const iconClassLabels = this.getLabels("iconClass");
         const workspaceIconClass = this.getWorkspaceIconClass();
 
-        if (iconClassLabels && iconClassLabels.length > 0) {
-            return iconClassLabels[0].value;
-        } else if (workspaceIconClass) {
-            return workspaceIconClass;
-        } else if (this.noteId === "root") {
-            return "bx bx-home-alt-2";
-        }
-        if (this.noteId === "_share") {
-            return "bx bx-share-alt";
-        } else if (this.type === "text") {
-            if (this.isFolder()) {
-                return "bx bx-folder";
-            } else {
-                return "bx bx-note";
-            }
-        } else if (this.type === "code" && this.mime.startsWith("text/x-sql")) {
-            return "bx bx-data";
-        } else {
-            return NOTE_TYPE_ICONS[this.type];
-        }
+        const icon = getNoteIcon({
+            noteId: this.noteId,
+            type: this.type,
+            mime: this.mime,
+            iconClass: iconClassLabels.length > 0 ? iconClassLabels[0].value : undefined,
+            workspaceIconClass,
+            isFolder: this.isFolder.bind(this)
+        });
+        return `tn-icon ${icon}`;
     }
 
     getColorClass() {
@@ -613,11 +583,13 @@ export default class FNote {
     }
 
     isFolder() {
-        return this.type === "search" || this.getFilteredChildBranches().length > 0;
+        if (this.isLabelTruthy("subtreeHidden")) return false;
+        if (this.type === "search") return true;
+        return this.getFilteredChildBranches().length > 0;
     }
 
     getFilteredChildBranches() {
-        let childBranches = this.getChildBranches();
+        const childBranches = this.getChildBranches();
 
         if (!childBranches) {
             console.error(`No children for '${this.noteId}'. This shouldn't happen.`);
@@ -728,6 +700,15 @@ export default class FNote {
         return this.hasAttribute(LABEL, name);
     }
 
+    /**
+     * Returns `true` if the note has a label with the given name (same as {@link hasOwnedLabel}), or it has a label with the `disabled:` prefix (for example due to a safe import).
+     * @param name the name of the label to look for.
+     * @returns `true` if the label exists, or its version with the `disabled:` prefix.
+     */
+    hasLabelOrDisabled(name: string) {
+        return this.hasLabel(name) || this.hasLabel(`disabled:${name}`);
+    }
+
     /**
      * @param name - label name
      * @returns true if label exists (including inherited) and does not have "false" value.
@@ -811,9 +792,9 @@ export default class FNote {
             return this.getLabelValue(nameWithPrefix.substring(1));
         } else if (nameWithPrefix.startsWith("~")) {
             return this.getRelationValue(nameWithPrefix.substring(1));
-        } else {
-            return this.getLabelValue(nameWithPrefix);
         }
+        return this.getLabelValue(nameWithPrefix);
+
     }
 
     /**
@@ -878,10 +859,10 @@ export default class FNote {
         promotedAttrs.sort((a, b) => {
             if (a.noteId === b.noteId) {
                 return a.position < b.position ? -1 : 1;
-            } else {
-                // inherited promoted attributes should stay grouped: https://github.com/zadam/trilium/issues/3761
-                return a.noteId < b.noteId ? -1 : 1;
             }
+            // inherited promoted attributes should stay grouped: https://github.com/zadam/trilium/issues/3761
+            return a.noteId < b.noteId ? -1 : 1;
+
         });
 
         return promotedAttrs;
@@ -993,6 +974,10 @@ export default class FNote {
         );
     }
 
+    isJsx() {
+        return (this.type === "code" && this.mime === "text/jsx");
+    }
+
     /** @returns true if this note is HTML */
     isHtml() {
         return (this.type === "code" || this.type === "file" || this.type === "render") && this.mime === "text/html";
@@ -1000,7 +985,7 @@ export default class FNote {
 
     /** @returns JS script environment - either "frontend" or "backend" */
     getScriptEnv() {
-        if (this.isHtml() || (this.isJavaScript() && this.mime.endsWith("env=frontend"))) {
+        if (this.isHtml() || (this.isJavaScript() && this.mime.endsWith("env=frontend")) || this.isJsx()) {
             return "frontend";
         }
 
@@ -1022,7 +1007,7 @@ export default class FNote {
      * @returns a promise that resolves when the script has been run. Additionally, for front-end notes, the promise will contain the value that is returned by the script.
      */
     async executeScript() {
-        if (!this.isJavaScript()) {
+        if (!(this.isJavaScript() || this.isJsx())) {
             throw new Error(`Note ${this.noteId} is of type ${this.type} and mime ${this.mime} and thus cannot be executed`);
         }
 

apps/client/src/index.ts

@@ -0,0 +1,131 @@
+async function bootstrap() {
+    showSplash();
+    await setupGlob();
+    await Promise.all([
+        initJQuery(),
+        loadBootstrapCss()
+    ]);
+    loadStylesheets();
+    loadIcons();
+    setBodyAttributes();
+    await loadScripts();
+    hideSplash();
+}
+
+async function initJQuery() {
+    const $ = (await import("jquery")).default;
+    window.$ = $;
+    window.jQuery = $;
+
+    // Polyfill removed jQuery methods for autocomplete.js compatibility
+    ($ as any).isArray = Array.isArray;
+    ($ as any).isFunction = function(obj: any) { return typeof obj === 'function'; };
+    ($ as any).isPlainObject = function(obj: any) {
+        if (obj == null || typeof obj !== 'object') { return false; }
+        const proto = Object.getPrototypeOf(obj);
+        if (proto === null) { return true; }
+        const Ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') && proto.constructor;
+        return typeof Ctor === 'function' && Ctor === Object;
+    };
+}
+
+async function setupGlob() {
+    const response = await fetch(`./bootstrap${window.location.search}`);
+    const json = await response.json();
+
+    window.global = globalThis; /* fixes https://github.com/webpack/webpack/issues/10035 */
+    window.glob = {
+        ...json,
+        activeDialog: null
+    };
+}
+
+async function loadBootstrapCss() {
+    // We have to selectively import Bootstrap CSS based on text direction.
+    if (glob.isRtl) {
+        await import("bootstrap/dist/css/bootstrap.rtl.min.css");
+    } else {
+        await import("bootstrap/dist/css/bootstrap.min.css");
+    }
+}
+
+function loadStylesheets() {
+    const { device, assetPath, themeCssUrl, themeUseNextAsBase } = window.glob;
+
+    const cssToLoad: string[] = [];
+    if (device !== "print") {
+        cssToLoad.push(`${assetPath}/stylesheets/ckeditor-theme.css`);
+        cssToLoad.push(`api/fonts`);
+        cssToLoad.push(`${assetPath}/stylesheets/theme-light.css`);
+        if (themeCssUrl) {
+            cssToLoad.push(themeCssUrl);
+        }
+        if (themeUseNextAsBase === "next") {
+            cssToLoad.push(`${assetPath}/stylesheets/theme-next.css`);
+        } else if (themeUseNextAsBase === "next-dark") {
+            cssToLoad.push(`${assetPath}/stylesheets/theme-next-dark.css`);
+        } else if (themeUseNextAsBase === "next-light") {
+            cssToLoad.push(`${assetPath}/stylesheets/theme-next-light.css`);
+        }
+        cssToLoad.push(`${assetPath}/stylesheets/style.css`);
+    }
+
+    for (const href of cssToLoad) {
+        const linkEl = document.createElement("link");
+        linkEl.href = href;
+        linkEl.rel = "stylesheet";
+        document.head.appendChild(linkEl);
+    }
+}
+
+function loadIcons() {
+    const styleEl = document.createElement("style");
+    styleEl.innerText = window.glob.iconPackCss;
+    document.head.appendChild(styleEl);
+}
+
+function setBodyAttributes() {
+    const { device, headingStyle, layoutOrientation, platform, isElectron, hasNativeTitleBar, hasBackgroundEffects, currentLocale } = window.glob;
+    const classesToSet = [
+        device,
+        `heading-style-${headingStyle}`,
+        `layout-${layoutOrientation}`,
+        `platform-${platform}`,
+        isElectron && "electron",
+        hasNativeTitleBar && "native-titlebar",
+        hasBackgroundEffects && "background-effects"
+    ].filter(Boolean) as string[];
+
+    for (const classToSet of classesToSet) {
+        document.body.classList.add(classToSet);
+    }
+
+    document.body.lang = currentLocale.id;
+    document.body.dir = currentLocale.rtl ? "rtl" : "ltr";
+}
+
+async function loadScripts() {
+    switch (glob.device) {
+        case "mobile":
+            await import("./mobile.js");
+            break;
+        case "print":
+            await import("./print.js");
+            break;
+        case "desktop":
+        default:
+            await import("./desktop.js");
+            break;
+    }
+}
+
+function showSplash() {
+    // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
+    document.body.style.display = "none";
+}
+
+function hideSplash() {
+    document.body.style.display = "block";
+}
+
+bootstrap();

apps/client/src/layouts/desktop_layout.tsx

@@ -1,51 +1,57 @@
-import { applyModals } from "./layout_commons.js";
-import { DESKTOP_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
+import type { AppContext } from "../components/app_context.js";
+import type { WidgetsByParent } from "../services/bundle.js";
+import { isExperimentalFeatureEnabled } from "../services/experimental_features.js";
+import options from "../services/options.js";
+import utils from "../services/utils.js";
 import ApiLog from "../widgets/api_log.jsx";
 import ClosePaneButton from "../widgets/buttons/close_pane_button.js";
-import CloseZenModeButton from "../widgets/close_zen_button.jsx";
-import ContentHeader from "../widgets/containers/content_header.js";
 import CreatePaneButton from "../widgets/buttons/create_pane_button.js";
-import FindWidget from "../widgets/find.js";
-import FlexContainer from "../widgets/containers/flex_container.js";
-import FloatingButtons from "../widgets/FloatingButtons.jsx";
 import GlobalMenu from "../widgets/buttons/global_menu.jsx";
-import HighlightsListWidget from "../widgets/highlights_list.js";
-import LeftPaneContainer from "../widgets/containers/left_pane_container.js";
 import LeftPaneToggle from "../widgets/buttons/left_pane_toggle.js";
 import MovePaneButton from "../widgets/buttons/move_pane_button.js";
-import NoteIconWidget from "../widgets/note_icon.jsx";
+import RightPaneToggle from "../widgets/buttons/right_pane_toggle.jsx";
+import CloseZenModeButton from "../widgets/close_zen_button.jsx";
 import NoteList from "../widgets/collections/NoteList.jsx";
-import NoteTitleWidget from "../widgets/note_title.jsx";
-import NoteTreeWidget from "../widgets/note_tree.js";
-import NoteWrapperWidget from "../widgets/note_wrapper.js";
-import options from "../services/options.js";
-import PasswordNoteSetDialog from "../widgets/dialogs/password_not_set.js";
-import QuickSearchWidget from "../widgets/quick_search.js";
-import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
-import Ribbon from "../widgets/ribbon/Ribbon.jsx";
+import ContentHeader from "../widgets/containers/content_header.js";
+import FlexContainer from "../widgets/containers/flex_container.js";
+import LeftPaneContainer from "../widgets/containers/left_pane_container.js";
 import RightPaneContainer from "../widgets/containers/right_pane_container.js";
 import RootContainer from "../widgets/containers/root_container.js";
 import ScrollingContainer from "../widgets/containers/scrolling_container.js";
+import SplitNoteContainer from "../widgets/containers/split_note_container.js";
+import PasswordNoteSetDialog from "../widgets/dialogs/password_not_set.js";
+import UploadAttachmentsDialog from "../widgets/dialogs/upload_attachments.js";
+import FindWidget from "../widgets/find.js";
+import FloatingButtons from "../widgets/FloatingButtons.jsx";
+import { DESKTOP_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
+import HighlightsListWidget from "../widgets/highlights_list.js";
+import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
+import SpacerWidget from "../widgets/launch_bar/SpacerWidget.jsx";
+import InlineTitle from "../widgets/layout/InlineTitle.jsx";
+import NoteBadges from "../widgets/layout/NoteBadges.jsx";
+import NoteTitleActions from "../widgets/layout/NoteTitleActions.jsx";
+import StatusBar from "../widgets/layout/StatusBar.jsx";
+import NoteIconWidget from "../widgets/note_icon.jsx";
+import NoteTitleWidget from "../widgets/note_title.jsx";
+import NoteTreeWidget from "../widgets/note_tree.js";
+import NoteWrapperWidget from "../widgets/note_wrapper.js";
+import NoteDetail from "../widgets/NoteDetail.jsx";
+import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
+import QuickSearchWidget from "../widgets/quick_search.js";
+import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
+import { FixedFormattingToolbar } from "../widgets/ribbon/FormattingToolbar.jsx";
+import NoteActions from "../widgets/ribbon/NoteActions.jsx";
+import Ribbon from "../widgets/ribbon/Ribbon.jsx";
 import ScrollPadding from "../widgets/scroll_padding.js";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
-import SplitNoteContainer from "../widgets/containers/split_note_container.js";
-import SqlResults from "../widgets/sql_result.js";
-import SqlTableSchemas from "../widgets/sql_table_schemas.js";
+import RightPanelContainer from "../widgets/sidebar/RightPanelContainer.jsx";
 import TabRowWidget from "../widgets/tab_row.js";
+import TabHistoryNavigationButtons from "../widgets/TabHistoryNavigationButtons.jsx";
 import TitleBarButtons from "../widgets/title_bar_buttons.jsx";
 import TocWidget from "../widgets/toc.js";
-import type { AppContext } from "../components/app_context.js";
-import type { WidgetsByParent } from "../services/bundle.js";
-import UploadAttachmentsDialog from "../widgets/dialogs/upload_attachments.js";
-import utils from "../services/utils.js";
 import WatchedFileUpdateStatusWidget from "../widgets/watched_file_update_status.js";
-import NoteDetail from "../widgets/NoteDetail.jsx";
-import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
-import SpacerWidget from "../widgets/launch_bar/SpacerWidget.jsx";
-import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
-import Breadcrumb from "../widgets/Breadcrumb.jsx";
-import TabHistoryNavigationButtons from "../widgets/TabHistoryNavigationButtons.jsx";
+import { applyModals } from "./layout_commons.js";
 
 export default class DesktopLayout {
 
@@ -71,10 +77,11 @@ export default class DesktopLayout {
          */
         const fullWidthTabBar = launcherPaneIsHorizontal || (isElectron && !hasNativeTitleBar && isMac);
         const customTitleBarButtons = !hasNativeTitleBar && !isMac && !isWindows;
+        const isNewLayout = isExperimentalFeatureEnabled("new-layout");
 
         const rootContainer = new RootContainer(true)
             .setParent(appContext)
-            .class((launcherPaneIsHorizontal ? "horizontal" : "vertical") + "-layout")
+            .class(`${launcherPaneIsHorizontal ? "horizontal" : "vertical"  }-layout`)
             .optChild(
                 fullWidthTabBar,
                 new FlexContainer("row")
@@ -83,6 +90,7 @@ export default class DesktopLayout {
                     .optChild(launcherPaneIsHorizontal, <LeftPaneToggle isHorizontalLayout={true} />)
                     .child(<TabHistoryNavigationButtons />)
                     .child(new TabRowWidget().class("full-width"))
+                    .optChild(isNewLayout, <RightPaneToggle />)
                     .optChild(customTitleBarButtons, <TitleBarButtons />)
                     .css("height", "40px")
                     .css("background-color", "var(--launcher-pane-background-color)")
@@ -106,10 +114,15 @@ export default class DesktopLayout {
                             .css("flex-grow", "1")
                             .optChild(!fullWidthTabBar,
                                 new FlexContainer("row")
+                                    .class("tab-row-container")
                                     .child(<TabHistoryNavigationButtons />)
                                     .child(new TabRowWidget())
+                                    .optChild(isNewLayout, <RightPaneToggle />)
                                     .optChild(customTitleBarButtons, <TitleBarButtons />)
-                                    .css("height", "40px"))
+                                    .css("height", "40px")
+                                    .css("align-items", "center")
+                            )
+                            .optChild(isNewLayout, <FixedFormattingToolbar />)
                             .child(
                                 new FlexContainer("row")
                                     .filling()
@@ -123,63 +136,56 @@ export default class DesktopLayout {
                                             .child(
                                                 new SplitNoteContainer(() =>
                                                     new NoteWrapperWidget()
-                                                        .child(
-                                                            new FlexContainer("row")
-                                                                .class("breadcrumb-row")
-                                                                .css("height", "30px")
-                                                                .css("min-height", "30px")
-                                                                .css("align-items", "center")
-                                                                .css("padding", "10px")
-                                                                .cssBlock(".breadcrumb-row > * { margin: 5px; }")
-                                                                .child(<Breadcrumb />)
-                                                                .child(<SpacerWidget baseSize={0} growthFactor={1} />)
-                                                                .child(<MovePaneButton direction="left" />)
-                                                                .child(<MovePaneButton direction="right" />)
-                                                                .child(<ClosePaneButton />)
-                                                                .child(<CreatePaneButton />)
-                                                        )
+                                                        .child(new FlexContainer("row")
+                                                            .class("title-row note-split-title")
+                                                            .cssBlock(".title-row > * { margin: 5px; }")
+                                                            .child(<NoteIconWidget />)
+                                                            .child(<NoteTitleWidget />)
+                                                            .optChild(isNewLayout, <NoteBadges />)
+                                                            .child(<SpacerWidget baseSize={0} growthFactor={1} />)
+                                                            .optChild(!isNewLayout, <MovePaneButton direction="left" />)
+                                                            .optChild(!isNewLayout, <MovePaneButton direction="right" />)
+                                                            .optChild(!isNewLayout, <ClosePaneButton />)
+                                                            .optChild(!isNewLayout, <CreatePaneButton />)
+                                                            .optChild(isNewLayout, <NoteActions />))
+                                                        .optChild(!isNewLayout, <Ribbon />)
                                                         .child(new WatchedFileUpdateStatusWidget())
-                                                        .child(<FloatingButtons items={DESKTOP_FLOATING_BUTTONS} />)
+                                                        .optChild(!isNewLayout, <FloatingButtons items={DESKTOP_FLOATING_BUTTONS} />)
                                                         .child(
                                                             new ScrollingContainer()
                                                                 .filling()
-                                                                .child(new ContentHeader()
-                                                                    .child(new FlexContainer("row")
-                                                                        .class("title-row")
-                                                                        .child(<NoteIconWidget />)
-                                                                        .child(<NoteTitleWidget />)
-                                                                    )
+                                                                .optChild(isNewLayout, <InlineTitle />)
+                                                                .optChild(isNewLayout, <NoteTitleActions />)
+                                                                .optChild(!isNewLayout, new ContentHeader()
                                                                     .child(<ReadOnlyNoteInfoBar />)
                                                                     .child(<SharedInfo />)
                                                                 )
-                                                                .child(<Ribbon />)
-                                                                .child(<PromotedAttributes />)
-                                                                .child(<SqlTableSchemas />)
+                                                                .optChild(!isNewLayout, <PromotedAttributes />)
                                                                 .child(<NoteDetail />)
                                                                 .child(<NoteList media="screen" />)
                                                                 .child(<SearchResult />)
-                                                                .child(<SqlResults />)
                                                                 .child(<ScrollPadding />)
                                                         )
                                                         .child(<ApiLog />)
                                                         .child(new FindWidget())
-                                                        .child(
-                                                            ...this.customWidgets.get("node-detail-pane"), // typo, let's keep it for a while as BC
-                                                            ...this.customWidgets.get("note-detail-pane")
-                                                        )
+                                                        .child(...this.customWidgets.get("note-detail-pane"))
                                                 )
                                             )
                                             .child(...this.customWidgets.get("center-pane"))
+
                                     )
-                                    .child(
+                                    .optChild(!isNewLayout,
                                         new RightPaneContainer()
                                             .child(new TocWidget())
                                             .child(new HighlightsListWidget())
                                             .child(...this.customWidgets.get("right-pane"))
                                     )
+                                    .optChild(isNewLayout, <RightPanelContainer widgetsByParent={this.customWidgets} />)
                             )
+                            .optChild(!launcherPaneIsHorizontal && isNewLayout, <StatusBar />)
                     )
             )
+            .optChild(launcherPaneIsHorizontal && isNewLayout, <StatusBar />)
             .child(<CloseZenModeButton />)
 
             // Desktop-specific dialogs.

apps/client/src/layouts/layout_commons.tsx

@@ -52,5 +52,5 @@ export function applyModals(rootContainer: RootContainer) {
         .child(<IncorrectCpuArchDialog />)
         .child(<PopupEditorDialog />)
         .child(<CallToActionDialog />)
-        .child(<ToastContainer />)
+        .child(<ToastContainer />);
 }

apps/client/src/layouts/mobile_layout.css

@@ -0,0 +1,76 @@
+#background-color-tracker {
+    color: var(--main-background-color) !important;
+}
+
+span.keyboard-shortcut,
+kbd {
+    display: none;
+}
+
+.dropdown-menu {
+    font-size: larger;
+}
+
+.action-button {
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-size: 1.25em;
+    padding-inline-start: 0.5em;
+    padding-inline-end: 0.5em;
+    color: var(--main-text-color);
+}
+.quick-search {
+    margin: 0;
+}
+.quick-search .dropdown-menu {
+    max-width: 350px;
+}
+
+/* #region Tree */
+.tree-wrapper {
+    max-height: 100%;
+    margin-top: 0px;
+    overflow-y: auto;
+    contain: content;
+    padding-inline-start: 10px;
+}
+
+.fancytree-title {
+    margin-inline-start: 0.6em !important;
+}
+
+.fancytree-node {
+    padding: 5px;
+}
+
+span.fancytree-expander {
+    width: 24px !important;
+    margin-inline-end: 5px;
+}
+
+.fancytree-loading span.fancytree-expander {
+    width: 24px;
+    height: 32px;
+}
+
+.fancytree-loading  span.fancytree-expander:after {
+    width: 20px;
+    height: 20px;
+    margin-top: 4px;
+    border-width: 2px;
+    border-style: solid;
+}
+
+.tree-wrapper .collapse-tree-button,
+.tree-wrapper .scroll-to-active-note-button,
+.tree-wrapper .tree-settings-button {
+    position: fixed;
+    margin-inline-end: 16px;
+    display: none;
+}
+
+.tree-wrapper .unhoist-button {
+    font-size: 200%;
+}
+/* #endregion */

apps/client/src/layouts/mobile_layout.tsx

@@ -1,128 +1,40 @@
-import { applyModals } from "./layout_commons.js";
-import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
-import { useNoteContext } from "../widgets/react/hooks.jsx";
-import CloseZenModeButton from "../widgets/close_zen_button.js";
-import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
-import FlexContainer from "../widgets/containers/flex_container.js";
-import FloatingButtons from "../widgets/FloatingButtons.jsx";
+import "./mobile_layout.css";
+
+import type AppContext from "../components/app_context.js";
 import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
-import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
+import CloseZenModeButton from "../widgets/close_zen_button.js";
 import NoteList from "../widgets/collections/NoteList.jsx";
+import FlexContainer from "../widgets/containers/flex_container.js";
+import RootContainer from "../widgets/containers/root_container.js";
+import ScrollingContainer from "../widgets/containers/scrolling_container.js";
+import SplitNoteContainer from "../widgets/containers/split_note_container.js";
+import FindWidget from "../widgets/find.js";
+import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
+import InlineTitle from "../widgets/layout/InlineTitle.jsx";
+import NoteBadges from "../widgets/layout/NoteBadges.jsx";
+import NoteTitleActions from "../widgets/layout/NoteTitleActions.jsx";
+import MobileDetailMenu from "../widgets/mobile_widgets/mobile_detail_menu.js";
+import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
+import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
+import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
+import NoteIconWidget from "../widgets/note_icon.jsx";
 import NoteTitleWidget from "../widgets/note_title.js";
-import ContentHeader from "../widgets/containers/content_header.js";
 import NoteTreeWidget from "../widgets/note_tree.js";
 import NoteWrapperWidget from "../widgets/note_wrapper.js";
-import QuickSearchWidget from "../widgets/quick_search.js";
-import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
-import RootContainer from "../widgets/containers/root_container.js";
-import ScreenContainer from "../widgets/mobile_widgets/screen_container.js";
-import ScrollingContainer from "../widgets/containers/scrolling_container.js";
-import SearchDefinitionTab from "../widgets/ribbon/SearchDefinitionTab.jsx";
-import SearchResult from "../widgets/search_result.jsx";
-import SharedInfoWidget from "../widgets/shared_info.js";
-import SidebarContainer from "../widgets/mobile_widgets/sidebar_container.js";
-import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
-import TabRowWidget from "../widgets/tab_row.js";
-import ToggleSidebarButton from "../widgets/mobile_widgets/toggle_sidebar_button.jsx";
-import type AppContext from "../components/app_context.js";
 import NoteDetail from "../widgets/NoteDetail.jsx";
+import QuickSearchWidget from "../widgets/quick_search.js";
+import { useNoteContext } from "../widgets/react/hooks.jsx";
+import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.jsx";
+import ScrollPadding from "../widgets/scroll_padding";
+import SearchResult from "../widgets/search_result.jsx";
 import MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
-import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
-import SplitNoteContainer from "../widgets/containers/split_note_container.js";
-import LauncherContainer from "../widgets/launch_bar/LauncherContainer.jsx";
-
-const MOBILE_CSS = `
-<style>
-span.keyboard-shortcut,
-kbd {
-    display: none;
-}
-
-.dropdown-menu {
-    font-size: larger;
-}
-
-.action-button {
-    background: none;
-    border: none;
-    cursor: pointer;
-    font-size: 1.25em;
-    padding-inline-start: 0.5em;
-    padding-inline-end: 0.5em;
-    color: var(--main-text-color);
-}
-.quick-search {
-    margin: 0;
-}
-.quick-search .dropdown-menu {
-    max-width: 350px;
-}
-</style>`;
-
-const FANCYTREE_CSS = `
-<style>
-.tree-wrapper {
-    max-height: 100%;
-    margin-top: 0px;
-    overflow-y: auto;
-    contain: content;
-    padding-inline-start: 10px;
-}
-
-.fancytree-custom-icon {
-    font-size: 2em;
-}
-
-.fancytree-title {
-    font-size: 1.5em;
-    margin-inline-start: 0.6em !important;
-}
-
-.fancytree-node {
-    padding: 5px;
-}
-
-.fancytree-node .fancytree-expander:before {
-    font-size: 2em !important;
-}
-
-span.fancytree-expander {
-    width: 24px !important;
-    margin-inline-end: 5px;
-}
-
-.fancytree-loading span.fancytree-expander {
-    width: 24px;
-    height: 32px;
-}
-
-.fancytree-loading  span.fancytree-expander:after {
-    width: 20px;
-    height: 20px;
-    margin-top: 4px;
-    border-width: 2px;
-    border-style: solid;
-}
-
-.tree-wrapper .collapse-tree-button,
-.tree-wrapper .scroll-to-active-note-button,
-.tree-wrapper .tree-settings-button {
-    position: fixed;
-    margin-inline-end: 16px;
-    display: none;
-}
-
-.tree-wrapper .unhoist-button {
-    font-size: 200%;
-}
-</style>`;
+import { applyModals } from "./layout_commons.js";
 
 export default class MobileLayout {
     getRootWidget(appContext: typeof AppContext) {
         const rootContainer = new RootContainer(true)
             .setParent(appContext)
             .class("horizontal-layout")
-            .cssBlock(MOBILE_CSS)
             .child(new FlexContainer("column").id("mobile-sidebar-container"))
             .child(
                 new FlexContainer("row")
@@ -136,7 +48,7 @@ export default class MobileLayout {
                             .css("padding-inline-start", "0")
                             .css("padding-inline-end", "0")
                             .css("contain", "content")
-                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget().cssBlock(FANCYTREE_CSS)))
+                            .child(new FlexContainer("column").filling().id("mobile-sidebar-wrapper").child(new QuickSearchWidget()).child(new NoteTreeWidget()))
                     )
                     .child(
                         new ScreenContainer("detail", "row")
@@ -147,30 +59,28 @@ export default class MobileLayout {
                                     new NoteWrapperWidget()
                                         .child(
                                             new FlexContainer("row")
+                                                .class("title-row note-split-title")
                                                 .contentSized()
-                                                .css("font-size", "larger")
                                                 .css("align-items", "center")
                                                 .child(<ToggleSidebarButton />)
+                                                .child(<NoteIconWidget />)
                                                 .child(<NoteTitleWidget />)
+                                                .child(<NoteBadges />)
                                                 .child(<MobileDetailMenu />)
                                         )
-                                        .child(<FloatingButtons items={MOBILE_FLOATING_BUTTONS} />)
-                                        .child(<PromotedAttributes />)
                                         .child(
                                             new ScrollingContainer()
                                                 .filling()
                                                 .contentSized()
-                                                .child(new ContentHeader()
-                                                    .child(<ReadOnlyNoteInfoBar />)
-                                                    .child(<SharedInfoWidget />)
-                                                )
+                                                .child(<InlineTitle />)
+                                                .child(<NoteTitleActions />)
                                                 .child(<NoteDetail />)
                                                 .child(<NoteList media="screen" />)
-                                                .child(<StandaloneRibbonAdapter component={SearchDefinitionTab} />)
                                                 .child(<SearchResult />)
-                                                .child(<FilePropertiesWrapper />)
+                                                .child(<ScrollPadding />)
                                         )
                                         .child(<MobileEditorToolbar />)
+                                        .child(new FindWidget())
                                 )
                             )
                     )
@@ -179,7 +89,6 @@ export default class MobileLayout {
                 new FlexContainer("column")
                     .contentSized()
                     .id("mobile-bottom-bar")
-                    .child(new TabRowWidget().css("height", "40px"))
                     .child(new FlexContainer("row")
                         .class("horizontal")
                         .css("height", "53px")
@@ -192,13 +101,3 @@ export default class MobileLayout {
         return rootContainer;
     }
 }
-
-function FilePropertiesWrapper() {
-    const { note } = useNoteContext();
-
-    return (
-        <div>
-            {note?.type === "file" && <FilePropertiesTab note={note} />}
-        </div>
-    );
-}

apps/client/src/menus/context_menu.ts

@@ -1,8 +1,9 @@
 import { KeyboardActionNames } from "@triliumnext/commons";
+import { h, JSX, render } from "preact";
+
 import keyboardActionService, { getActionSync } from "../services/keyboard_actions.js";
 import note_tooltip from "../services/note_tooltip.js";
 import utils from "../services/utils.js";
-import { h, JSX, render } from "preact";
 
 export interface ContextMenuOptions<T> {
     x: number;
@@ -62,17 +63,17 @@ export type ContextMenuEvent = PointerEvent | MouseEvent | JQuery.ContextMenuEve
 
 class ContextMenu {
     private $widget: JQuery<HTMLElement>;
-    private $cover: JQuery<HTMLElement>;
+    private $cover?: JQuery<HTMLElement>;
     private options?: ContextMenuOptions<any>;
     private isMobile: boolean;
 
     constructor() {
         this.$widget = $("#context-menu-container");
-        this.$cover = $("#context-menu-cover");
         this.$widget.addClass("dropend");
         this.isMobile = utils.isMobile();
 
         if (this.isMobile) {
+            this.$cover = $("#context-menu-cover");
             this.$cover.on("click", () => this.hide());
         } else {
             $(document).on("click", (e) => this.hide());
@@ -91,7 +92,7 @@ class ContextMenu {
         }
 
         this.$widget.toggleClass("mobile-bottom-menu", !this.options.forcePositionOnMobile);
-        this.$cover.addClass("show");
+        this.$cover?.addClass("show");
         $("body").addClass("context-menu-shown");
 
         this.$widget.empty();
@@ -140,16 +141,14 @@ class ContextMenu {
             } else {
                 left = this.options.x - contextMenuWidth + CONTEXT_MENU_OFFSET;
             }
+        } else if (contextMenuWidth && this.options.x + contextMenuWidth - CONTEXT_MENU_OFFSET > clientWidth - CONTEXT_MENU_PADDING) {
+            // Overflow: right
+            left = clientWidth - contextMenuWidth - CONTEXT_MENU_PADDING;
+        } else if (this.options.x - CONTEXT_MENU_OFFSET < CONTEXT_MENU_PADDING) {
+            // Overflow: left
+            left = CONTEXT_MENU_PADDING;
         } else {
-            if (contextMenuWidth && this.options.x + contextMenuWidth - CONTEXT_MENU_OFFSET > clientWidth - CONTEXT_MENU_PADDING) {
-                // Overflow: right
-                left = clientWidth - contextMenuWidth - CONTEXT_MENU_PADDING;
-            } else if (this.options.x - CONTEXT_MENU_OFFSET < CONTEXT_MENU_PADDING) {
-                // Overflow: left
-                left = CONTEXT_MENU_PADDING;
-            } else {
-                left = this.options.x - CONTEXT_MENU_OFFSET;
-            }
+            left = this.options.x - CONTEXT_MENU_OFFSET;
         }
 
         this.$widget
@@ -249,7 +248,7 @@ class ContextMenu {
         if ("uiIcon" in item || "checked" in item) {
             const icon = (item.checked ? "bx bx-check" : item.uiIcon);
             if (icon) {
-                $icon.addClass(icon);
+                $icon.addClass([icon, "tn-icon"]);
             } else {
                 $icon.append("&nbsp;");
             }
@@ -261,7 +260,7 @@ class ContextMenu {
             .append(item.title);
 
         if ("badges" in item && item.badges) {
-            for (let badge of item.badges) {
+            for (const badge of item.badges) {
                 const badgeElement = $(`<span class="badge">`).text(badge.title);
 
                 if (badge.className) {
@@ -352,7 +351,7 @@ class ContextMenu {
     async hide() {
         this.options?.onHide?.();
         this.$widget.removeClass("show");
-        this.$cover.removeClass("show");
+        this.$cover?.removeClass("show");
         $("body").removeClass("context-menu-shown");
         this.$widget.hide();
     }

apps/client/src/menus/launcher_context_menu.ts

@@ -1,12 +1,12 @@
-import treeService from "../services/tree.js";
-import froca from "../services/froca.js";
-import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
-import dialogService from "../services/dialog.js";
-import server from "../services/server.js";
-import { t } from "../services/i18n.js";
+import type { ContextMenuCommandData,FilteredCommandNames } from "../components/app_context.js";
 import type { SelectMenuItemEventListener } from "../components/events.js";
+import dialogService from "../services/dialog.js";
+import froca from "../services/froca.js";
+import { t } from "../services/i18n.js";
+import server from "../services/server.js";
+import treeService from "../services/tree.js";
 import type NoteTreeWidget from "../widgets/note_tree.js";
-import type { FilteredCommandNames, ContextMenuCommandData } from "../components/app_context.js";
+import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
 
 type LauncherCommandNames = FilteredCommandNames<ContextMenuCommandData>;
 
@@ -32,8 +32,8 @@ export default class LauncherContextMenu implements SelectMenuItemEventListener<
         const note = this.node.data.noteId ? await froca.getNote(this.node.data.noteId) : null;
         const parentNoteId = this.node.getParent().data.noteId;
 
-        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers";
-        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers";
+        const isVisibleRoot = note?.noteId === "_lbVisibleLaunchers" || note?.noteId === "_lbMobileVisibleLaunchers";
+        const isAvailableRoot = note?.noteId === "_lbAvailableLaunchers" || note?.noteId === "_lbMobileAvailableLaunchers";
         const isVisibleItem = parentNoteId === "_lbVisibleLaunchers" || parentNoteId === "_lbMobileVisibleLaunchers";
         const isAvailableItem = parentNoteId === "_lbAvailableLaunchers" || parentNoteId === "_lbMobileAvailableLaunchers";
         const isItem = isVisibleItem || isAvailableItem;

apps/client/src/menus/link_context_menu.ts

@@ -1,10 +1,11 @@
-import { t } from "../services/i18n.js";
-import contextMenu, { type ContextMenuEvent, type MenuItem } from "./context_menu.js";
+import type { LeafletMouseEvent } from "leaflet";
+
 import appContext, { type CommandNames } from "../components/app_context.js";
+import { t } from "../services/i18n.js";
 import type { ViewScope } from "../services/link.js";
 import utils, { isMobile } from "../services/utils.js";
 import { getClosestNtxId } from "../widgets/widget_utils.js";
-import type { LeafletMouseEvent } from "leaflet";
+import contextMenu, { type ContextMenuEvent, type MenuItem } from "./context_menu.js";
 
 function openContextMenu(notePath: string, e: ContextMenuEvent, viewScope: ViewScope = {}, hoistedNoteId: string | null = null) {
     contextMenu.show({
@@ -34,15 +35,21 @@ function handleLinkContextMenuItem(command: string | undefined, e: ContextMenuEv
 
     if (command === "openNoteInNewTab") {
         appContext.tabManager.openContextWithNote(notePath, { hoistedNoteId, viewScope });
+        return true;
     } else if (command === "openNoteInNewSplit") {
         const ntxId = getNtxId(e);
-        if (!ntxId) return;
+        if (!ntxId) return false;
         appContext.triggerCommand("openNewNoteSplit", { ntxId, notePath, hoistedNoteId, viewScope });
+        return true;
     } else if (command === "openNoteInNewWindow") {
         appContext.triggerCommand("openInWindow", { notePath, hoistedNoteId, viewScope });
+        return true;
     } else if (command === "openNoteInPopup") {
-        appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
+        appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
+        return true;
     }
+
+    return false;
 }
 
 function getNtxId(e: ContextMenuEvent | LeafletMouseEvent) {
@@ -52,9 +59,9 @@ function getNtxId(e: ContextMenuEvent | LeafletMouseEvent) {
         return subContexts[subContexts.length - 1].ntxId;
     } else if (e.target instanceof HTMLElement) {
         return getClosestNtxId(e.target);
-    } else {
-        return null;
     }
+    return null;
+
 }
 
 export default {

apps/client/src/menus/tree_context_menu.ts

@@ -1,21 +1,21 @@
-import NoteColorPicker from "./custom-items/NoteColorPicker.jsx";
-import treeService from "../services/tree.js";
-import froca from "../services/froca.js";
-import clipboard from "../services/clipboard.js";
-import noteCreateService from "../services/note_create.js";
-import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
 import appContext, { type ContextMenuCommandData, type FilteredCommandNames } from "../components/app_context.js";
+import type { SelectMenuItemEventListener } from "../components/events.js";
+import type FAttachment from "../entities/fattachment.js";
+import attributes from "../services/attributes.js";
+import { executeBulkActions } from "../services/bulk_action.js";
+import clipboard from "../services/clipboard.js";
+import dialogService from "../services/dialog.js";
+import froca from "../services/froca.js";
+import { t } from "../services/i18n.js";
+import noteCreateService from "../services/note_create.js";
 import noteTypesService from "../services/note_types.js";
 import server from "../services/server.js";
 import toastService from "../services/toast.js";
-import dialogService from "../services/dialog.js";
-import { t } from "../services/i18n.js";
-import type NoteTreeWidget from "../widgets/note_tree.js";
-import type FAttachment from "../entities/fattachment.js";
-import type { SelectMenuItemEventListener } from "../components/events.js";
+import treeService from "../services/tree.js";
 import utils from "../services/utils.js";
-import attributes from "../services/attributes.js";
-import { executeBulkActions } from "../services/bulk_action.js";
+import type NoteTreeWidget from "../widgets/note_tree.js";
+import contextMenu, { type MenuCommandItem, type MenuItem } from "./context_menu.js";
+import NoteColorPicker from "./custom-items/NoteColorPicker.jsx";
 
 // TODO: Deduplicate once client/server is well split.
 interface ConvertToAttachmentResponse {
@@ -72,6 +72,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
         const noSelectedNotes = selNodes.length === 0 || (selNodes.length === 1 && selNodes[0] === this.node);
 
         const notSearch = note?.type !== "search";
+        const hasSubtreeHidden = note?.isLabelTruthy("subtreeHidden") ?? false;
+        const isSpotlighted = this.node.extraClasses.includes("spotlighted-node");
         const notOptionsOrHelp = !note?.noteId.startsWith("_options") && !note?.noteId.startsWith("_help");
         const parentNotSearch = !parentNote || parentNote.type !== "search";
         const insertNoteAfterEnabled = isNotRoot && !isHoisted && parentNotSearch;
@@ -79,17 +81,18 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
         const items: (MenuItem<TreeCommandNames> | null)[] = [
             { title: t("tree-context-menu.open-in-a-new-tab"), command: "openInTab", shortcut: "Ctrl+Click", uiIcon: "bx bx-link-external", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-a-new-split"), command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
+            { title: t("tree-context-menu.open-in-a-new-window"), command: "openNoteInWindow", uiIcon: "bx bx-window-open", enabled: noSelectedNotes },
             { title: t("tree-context-menu.open-in-popup"), command: "openNoteInPopup", uiIcon: "bx bx-edit", enabled: noSelectedNotes },
 
             isHoisted
                 ? null
                 : {
-                      title: `${t("tree-context-menu.hoist-note")}`,
-                      command: "toggleNoteHoisting",
-                      keyboardShortcut: "toggleNoteHoisting",
-                      uiIcon: "bx bxs-chevrons-up",
-                      enabled: noSelectedNotes && notSearch
-                  },
+                    title: `${t("tree-context-menu.hoist-note")}`,
+                    command: "toggleNoteHoisting",
+                    keyboardShortcut: "toggleNoteHoisting",
+                    uiIcon: "bx bxs-chevrons-up",
+                    enabled: noSelectedNotes && notSearch
+                },
             !isHoisted || !isNotRoot
                 ? null
                 : { title: t("tree-context-menu.unhoist-note"), command: "toggleNoteHoisting", keyboardShortcut: "toggleNoteHoisting", uiIcon: "bx bx-door-open" },
@@ -112,7 +115,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
                 keyboardShortcut: "createNoteInto",
                 uiIcon: "bx bx-plus",
                 items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote") : null,
-                enabled: notSearch && noSelectedNotes && notOptionsOrHelp,
+                enabled: notSearch && noSelectedNotes && notOptionsOrHelp && !hasSubtreeHidden && !isSpotlighted,
                 columns: 2
             },
 
@@ -150,8 +153,17 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
                     { kind: "separator" },
 
-                    { title: t("tree-context-menu.expand-subtree"), command: "expandSubtree", keyboardShortcut: "expandSubtree", uiIcon: "bx bx-expand", enabled: noSelectedNotes },
-                    { title: t("tree-context-menu.collapse-subtree"), command: "collapseSubtree", keyboardShortcut: "collapseSubtree", uiIcon: "bx bx-collapse", enabled: noSelectedNotes },
+                    !hasSubtreeHidden && { title: t("tree-context-menu.expand-subtree"), command: "expandSubtree", keyboardShortcut: "expandSubtree", uiIcon: "bx bx-expand", enabled: noSelectedNotes },
+                    !hasSubtreeHidden && { title: t("tree-context-menu.collapse-subtree"), command: "collapseSubtree", keyboardShortcut: "collapseSubtree", uiIcon: "bx bx-collapse", enabled: noSelectedNotes },
+                    {
+                        title: hasSubtreeHidden ? t("tree-context-menu.show-subtree") : t("tree-context-menu.hide-subtree"),
+                        uiIcon: "bx bx-show",
+                        handler: async () => {
+                            const note = await froca.getNote(this.node.data.noteId);
+                            if (!note) return;
+                            attributes.setBooleanWithInheritance(note, "subtreeHidden", !hasSubtreeHidden);
+                        }
+                    },
                     {
                         title: t("tree-context-menu.sort-by"),
                         command: "sortChildNotes",
@@ -164,7 +176,7 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
                     { title: t("tree-context-menu.copy-note-path-to-clipboard"), command: "copyNotePathToClipboard", uiIcon: "bx bx-directions", enabled: true },
                     { title: t("tree-context-menu.recent-changes-in-subtree"), command: "recentChangesInSubtree", uiIcon: "bx bx-history", enabled: noSelectedNotes && notOptionsOrHelp }
-                ]
+                ].filter(Boolean) as MenuItem<TreeCommandNames>[]
             },
 
             { kind: "separator" },
@@ -292,25 +304,30 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
             noteCreateService.createNote(parentNotePath, {
                 target: "after",
                 targetBranchId: this.node.data.branchId,
-                type: type,
-                isProtected: isProtected,
-                templateNoteId: templateNoteId
+                type,
+                isProtected,
+                templateNoteId
             });
         } else if (command === "insertChildNote") {
             const parentNotePath = treeService.getNotePath(this.node);
 
             noteCreateService.createNote(parentNotePath, {
-                type: type,
+                type,
                 isProtected: this.node.data.isProtected,
-                templateNoteId: templateNoteId
+                templateNoteId
             });
         } else if (command === "openNoteInSplit") {
             const subContexts = appContext.tabManager.getActiveContext()?.getSubContexts();
             const { ntxId } = subContexts?.[subContexts.length - 1] ?? {};
 
             this.treeWidget.triggerCommand("openNewNoteSplit", { ntxId, notePath });
+        } else if (command === "openNoteInWindow") {
+            appContext.triggerCommand("openInWindow", {
+                notePath,
+                hoistedNoteId: appContext.tabManager.getActiveContext()?.hoistedNoteId
+            });
         } else if (command === "openNoteInPopup") {
-            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath })
+            appContext.triggerCommand("openInPopup", { noteIdOrPath: notePath });
         } else if (command === "convertNoteToAttachment") {
             if (!(await dialogService.confirm(t("tree-context-menu.convert-to-attachment-confirm")))) {
                 return;
@@ -332,11 +349,11 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
             toastService.showMessage(t("tree-context-menu.converted-to-attachments", { count: converted }));
         } else if (command === "copyNotePathToClipboard") {
-            navigator.clipboard.writeText("#" + notePath);
+            navigator.clipboard.writeText(`#${  notePath}`);
         } else if (command) {
             this.treeWidget.triggerCommand<TreeCommandNames>(command, {
                 node: this.node,
-                notePath: notePath,
+                notePath,
                 noteId: this.node.data.noteId,
                 selectedOrActiveBranchIds: this.treeWidget.getSelectedOrActiveBranchIds(this.node),
                 selectedOrActiveNoteIds: this.treeWidget.getSelectedOrActiveNoteIds(this.node)

apps/client/src/mobile.ts

@@ -1,9 +1,9 @@
-import appContext from "./components/app_context.js";
-import noteAutocompleteService from "./services/note_autocomplete.js";
-import glob from "./services/glob.js";
-import "boxicons/css/boxicons.min.css";
 import "autocomplete.js/index_jquery.js";
 
+import appContext from "./components/app_context.js";
+import glob from "./services/glob.js";
+import noteAutocompleteService from "./services/note_autocomplete.js";
+
 glob.setupGlobs();
 
 await appContext.earlyInit();

apps/client/src/print.tsx

@@ -1,17 +1,29 @@
-import FNote from "./entities/fnote";
 import { render } from "preact";
-import { CustomNoteList, useNoteViewType } from "./widgets/collections/NoteList";
 import { useCallback, useLayoutEffect, useRef } from "preact/hooks";
+
+import FNote from "./entities/fnote";
 import content_renderer from "./services/content_renderer";
-import { dynamicRequire, isElectron } from "./services/utils";
 import { applyInlineMermaid } from "./services/content_renderer_text";
+import { dynamicRequire, isElectron } from "./services/utils";
+import { CustomNoteList, useNoteViewType } from "./widgets/collections/NoteList";
 
 interface RendererProps {
     note: FNote;
-    onReady: () => void;
+    onReady: (data: PrintReport) => void;
     onProgressChanged?: (progress: number) => void;
 }
 
+export type PrintReport = {
+    type: "single-note";
+} | {
+    type: "collection";
+    ignoredNoteIds: string[];
+} | {
+    type: "error";
+    message: string;
+    stack?: string;
+};
+
 async function main() {
     const notePath = window.location.hash.substring(1);
     const noteId = notePath.split("/").at(-1);
@@ -21,7 +33,9 @@ async function main() {
     const froca = (await import("./services/froca")).default;
     const note = await froca.getNote(noteId);
 
-    render(<App note={note} noteId={noteId} />, document.body);
+    const bodyWrapper = document.createElement("div");
+    render(<App note={note} noteId={noteId} />, bodyWrapper);
+    document.body.appendChild(bodyWrapper);
 }
 
 function App({ note, noteId }: { note: FNote | null | undefined, noteId: string }) {
@@ -34,15 +48,17 @@ function App({ note, noteId }: { note: FNote | null | undefined, noteId: string
             window.dispatchEvent(new CustomEvent("note-load-progress", { detail: { progress } }));
         }
     }, []);
-    const onReady = useCallback(() => {
+    const onReady = useCallback((printReport: PrintReport) => {
         if (sentReadyEvent.current) return;
-        window.dispatchEvent(new Event("note-ready"));
-        window._noteReady = true;
+        window.dispatchEvent(new CustomEvent("note-ready", {
+            detail: printReport
+        }));
+        window._noteReady = printReport;
         sentReadyEvent.current = true;
     }, []);
     const props: RendererProps | undefined | null = note && { note, onReady, onProgressChanged };
 
-    if (!note || !props) return <Error404 noteId={noteId} />
+    if (!note || !props) return <Error404 noteId={noteId} />;
 
     useLayoutEffect(() => {
         document.body.dataset.noteType = note.type;
@@ -51,8 +67,8 @@ function App({ note, noteId }: { note: FNote | null | undefined, noteId: string
     return (
         <>
             {note.type === "book"
-            ? <CollectionRenderer {...props} />
-            : <SingleNoteRenderer {...props} />
+                ? <CollectionRenderer {...props} />
+                : <SingleNoteRenderer {...props} />
             }
         </>
     );
@@ -91,7 +107,9 @@ function SingleNoteRenderer({ note, onReady }: RendererProps) {
             await loadCustomCss(note);
         }
 
-        load().then(() => requestAnimationFrame(onReady))
+        load().then(() => requestAnimationFrame(() => onReady({
+            type: "single-note"
+        })));
     }, [ note ]);
 
     return <>
@@ -110,9 +128,9 @@ function CollectionRenderer({ note, onReady, onProgressChanged }: RendererProps)
         ntxId="print"
         highlightedTokens={null}
         media="print"
-        onReady={async () => {
+        onReady={async (data: PrintReport) => {
             await loadCustomCss(note);
-            onReady();
+            onReady(data);
         }}
         onProgressChanged={onProgressChanged}
     />;
@@ -124,12 +142,12 @@ function Error404({ noteId }: { noteId: string }) {
             <p>The note you are trying to print could not be found.</p>
             <small>{noteId}</small>
         </main>
-    )
+    );
 }
 
 async function loadCustomCss(note: FNote) {
     const printCssNotes = await note.getRelationTargets("printCss");
-    let loadPromises: JQueryPromise<void>[] = [];
+    const loadPromises: JQueryPromise<void>[] = [];
 
     for (const printCssNote of printCssNotes) {
         if (!printCssNote || (printCssNote.type !== "code" && printCssNote.mime !== "text/css")) continue;

apps/client/src/runtime.ts

@@ -8,6 +8,17 @@ async function loadBootstrap() {
     }
 }
 
+// Polyfill removed jQuery methods for autocomplete.js compatibility
+($ as any).isArray = Array.isArray;
+($ as any).isFunction = function(obj: any) { return typeof obj === 'function'; };
+($ as any).isPlainObject = function(obj: any) {
+    if (obj == null || typeof obj !== 'object') { return false; }
+    const proto = Object.getPrototypeOf(obj);
+    if (proto === null) { return true; }
+    const Ctor = Object.prototype.hasOwnProperty.call(proto, 'constructor') && proto.constructor;
+    return typeof Ctor === 'function' && Ctor === Object;
+};
+
 (window as any).$ = $;
 (window as any).jQuery = $;
 await loadBootstrap();

apps/client/src/services/attributes.spec.ts

@@ -0,0 +1,139 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import { buildNote } from "../test/easy-froca";
+import { setBooleanWithInheritance } from "./attributes";
+import froca from "./froca";
+import server from "./server.js";
+
+// Spy on server methods to track calls
+// @ts-expect-error the generic typing is causing issues here
+server.put = vi.fn(async <T> (url: string, data?: T) => ({} as T));
+// @ts-expect-error the generic typing is causing issues here
+server.remove = vi.fn(async <T> (url: string) => ({} as T));
+
+describe("Set boolean with inheritance", () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it("doesn't call server if value matches directly", async () => {
+        const noteWithLabel = buildNote({
+            title: "New note",
+            "#foo": ""
+        });
+        const noteWithoutLabel = buildNote({
+            title: "New note"
+        });
+
+        await setBooleanWithInheritance(noteWithLabel, "foo", true);
+        await setBooleanWithInheritance(noteWithoutLabel, "foo", false);
+        expect(server.put).not.toHaveBeenCalled();
+        expect(server.remove).not.toHaveBeenCalled();
+    });
+
+    it("sets boolean normally without inheritance", async () => {
+        const standaloneNote = buildNote({
+            title: "New note"
+        });
+
+        await setBooleanWithInheritance(standaloneNote, "foo", true);
+        expect(server.put).toHaveBeenCalledWith(`notes/${standaloneNote.noteId}/set-attribute`, {
+            type: "label",
+            name: "foo",
+            value: "",
+            isInheritable: false
+        }, undefined);
+    });
+
+    it("removes boolean normally without inheritance", async () => {
+        const standaloneNote = buildNote({
+            title: "New note",
+            "#foo": ""
+        });
+
+        const attributeId = standaloneNote.getLabel("foo")!.attributeId;
+        await setBooleanWithInheritance(standaloneNote, "foo", false);
+        expect(server.remove).toHaveBeenCalledWith(`notes/${standaloneNote.noteId}/attributes/${attributeId}`);
+    });
+
+    it("doesn't call server if value matches inherited", async () => {
+        const parentNote = buildNote({
+            title: "Parent note",
+            "#foo(inheritable)": "",
+            "children": [
+                {
+                    title: "Child note"
+                }
+            ]
+        });
+        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
+        expect(childNote.isLabelTruthy("foo")).toBe(true);
+        await setBooleanWithInheritance(childNote, "foo", true);
+        expect(server.put).not.toHaveBeenCalled();
+        expect(server.remove).not.toHaveBeenCalled();
+    });
+
+    it("overrides boolean with inheritance", async () => {
+        const parentNote = buildNote({
+            title: "Parent note",
+            "#foo(inheritable)": "",
+            "children": [
+                {
+                    title: "Child note"
+                }
+            ]
+        });
+        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
+        expect(childNote.isLabelTruthy("foo")).toBe(true);
+        await setBooleanWithInheritance(childNote, "foo", false);
+        expect(server.put).toHaveBeenCalledWith(`notes/${childNote.noteId}/set-attribute`, {
+            type: "label",
+            name: "foo",
+            value: "false",
+            isInheritable: false
+        }, undefined);
+    });
+
+    it("overrides boolean with inherited false", async () => {
+        const parentNote = buildNote({
+            title: "Parent note",
+            "#foo(inheritable)": "false",
+            "children": [
+                {
+                    title: "Child note"
+                }
+            ]
+        });
+        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
+        expect(childNote.isLabelTruthy("foo")).toBe(false);
+        await setBooleanWithInheritance(childNote, "foo", true);
+        expect(server.put).toHaveBeenCalledWith(`notes/${childNote.noteId}/set-attribute`, {
+            type: "label",
+            name: "foo",
+            value: "",
+            isInheritable: false
+        }, undefined);
+    });
+
+    it("deletes override boolean with inherited false with already existing value", async () => {
+        const parentNote = buildNote({
+            title: "Parent note",
+            "#foo(inheritable)": "false",
+            "children": [
+                {
+                    title: "Child note",
+                    "#foo": "false",
+                }
+            ]
+        });
+        const childNote = froca.getNoteFromCache(parentNote.children[0])!;
+        expect(childNote.isLabelTruthy("foo")).toBe(false);
+        await setBooleanWithInheritance(childNote, "foo", true);
+        expect(server.put).toBeCalledWith(`notes/${childNote.noteId}/set-attribute`, {
+            type: "label",
+            name: "foo",
+            value: "",
+            isInheritable: false
+        }, undefined);
+    });
+});

apps/client/src/services/attributes.ts

@@ -1,36 +1,67 @@
-import server from "./server.js";
-import froca from "./froca.js";
-import type FNote from "../entities/fnote.js";
-import type { AttributeRow } from "./load_results.js";
 import { AttributeType } from "@triliumnext/commons";
 
+import type FNote from "../entities/fnote.js";
+import froca from "./froca.js";
+import type { AttributeRow } from "./load_results.js";
+import server from "./server.js";
+
 async function addLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/attribute`, {
         type: "label",
-        name: name,
-        value: value,
+        name,
+        value,
         isInheritable
     });
 }
 
-export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
+export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false, componentId?: string) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "label",
-        name: name,
-        value: value,
-        isInheritable
-    });
+        name,
+        value,
+        isInheritable,
+    }, componentId);
 }
 
 export async function setRelation(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "relation",
-        name: name,
-        value: value,
+        name,
+        value,
         isInheritable
     });
 }
 
+/**
+ * Sets a boolean label on the given note, taking inheritance into account. If the desired value matches the inherited
+ * value, any owned label will be removed to allow the inherited value to take effect. If the desired value differs
+ * from the inherited value, an owned label will be created or updated to reflect the desired value.
+ *
+ * When checking if the boolean value is set, don't use `note.hasLabel`; instead use `note.isLabelTruthy`.
+ *
+ * @param note the note on which to set the boolean label.
+ * @param labelName the name of the label to set.
+ * @param value the boolean value to set for the label.
+ */
+export async function setBooleanWithInheritance(note: FNote, labelName: string, value: boolean) {
+    const actualValue = note.isLabelTruthy(labelName);
+    if (actualValue === value) return;
+    const hasInheritedValue = !note.hasOwnedLabel(labelName) && note.hasLabel(labelName);
+
+    if (hasInheritedValue) {
+        if (value) {
+            setLabel(note.noteId, labelName, "");
+        } else {
+            // Label is inherited - override to false.
+            setLabel(note.noteId, labelName, "false");
+        }
+    } else if (value) {
+        setLabel(note.noteId, labelName, "");
+    } else {
+        removeOwnedLabelByName(note, labelName);
+    }
+}
+
 async function removeAttributeById(noteId: string, attributeId: string) {
     await server.remove(`notes/${noteId}/attributes/${attributeId}`);
 }
@@ -86,15 +117,15 @@ function removeOwnedRelationByName(note: FNote, relationName: string) {
  * @param name the name of the attribute to set.
  * @param value the value of the attribute to set.
  */
-export async function setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined) {
+export async function setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined, componentId?: string) {
     if (value !== null && value !== undefined) {
         // Create or update the attribute.
-        await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value });
+        await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value }, componentId);
     } else {
         // Remove the attribute if it exists on the server but we don't define a value for it.
         const attributeId = note.getAttribute(type, name)?.attributeId;
         if (attributeId) {
-            await server.remove(`notes/${note.noteId}/attributes/${attributeId}`);
+            await server.remove(`notes/${note.noteId}/attributes/${attributeId}`, componentId);
         }
     }
 }
@@ -137,13 +168,59 @@ function isAffecting(attrRow: AttributeRow, affectedNote: FNote | null | undefin
     return false;
 }
 
+/**
+ * Toggles whether a dangerous attribute is enabled or not. When an attribute is disabled, its name is prefixed with `disabled:`.
+ *
+ * Note that this work for non-dangerous attributes as well.
+ *
+ * If there are multiple attributes with the same name, all of them will be toggled at the same time.
+ *
+ * @param note the note whose attribute to change.
+ * @param type the type of dangerous attribute (label or relation).
+ * @param name the name of the dangerous attribute.
+ * @param willEnable whether to enable or disable the attribute.
+ * @returns a promise that will resolve when the request to the server completes.
+ */
+async function toggleDangerousAttribute(note: FNote, type: "label" | "relation", name: string, willEnable: boolean) {
+    const attrs = [
+        ...note.getOwnedAttributes(type, name),
+        ...note.getOwnedAttributes(type, `disabled:${name}`)
+    ];
+
+    for (const attr of attrs) {
+        const baseName = getNameWithoutDangerousPrefix(attr.name);
+        const newName = willEnable ? baseName : `disabled:${baseName}`;
+        if (newName === attr.name) continue;
+
+        // We are adding and removing afterwards to avoid a flicker (because for a moment there would be no active content attribute anymore) because the operations are done in sequence and not atomically.
+        if (attr.type === "label") {
+            await setLabel(note.noteId, newName, attr.value);
+        } else {
+            await setRelation(note.noteId, newName, attr.value);
+        }
+        await removeAttributeById(note.noteId, attr.attributeId);
+    }
+}
+
+/**
+ * Returns the name of an attribute without the `disabled:` prefix, or the same name if it's not disabled.
+ * @param name the name of an attribute.
+ * @returns the name without the `disabled:` prefix.
+ */
+function getNameWithoutDangerousPrefix(name: string) {
+    return name.startsWith("disabled:") ? name.substring(9) : name;
+}
+
 export default {
     addLabel,
     setLabel,
     setRelation,
     setAttribute,
+    setBooleanWithInheritance,
     removeAttributeById,
     removeOwnedLabelByName,
     removeOwnedRelationByName,
-    isAffecting
+    isAffecting,
+    toggleDangerousAttribute,
+    getNameWithoutDangerousPrefix
 };

apps/client/src/services/branches.ts

@@ -1,12 +1,12 @@
-import utils from "./utils.js";
-import server from "./server.js";
-import toastService, { type ToastOptionsWithRequiredId } from "./toast.js";
+import appContext from "../components/app_context.js";
+import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
 import froca from "./froca.js";
 import hoistedNoteService from "./hoisted_note.js";
-import ws from "./ws.js";
-import appContext from "../components/app_context.js";
 import { t } from "./i18n.js";
-import type { ResolveOptions } from "../widgets/dialogs/delete_notes.js";
+import server from "./server.js";
+import toastService, { type ToastOptionsWithRequiredId } from "./toast.js";
+import utils from "./utils.js";
+import ws from "./ws.js";
 
 // TODO: Deduplicate type with server
 interface Response {
@@ -66,7 +66,7 @@ async function moveAfterBranch(branchIdsToMove: string[], afterBranchId: string)
     }
 }
 
-async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: string) {
+async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: string, componentId?: string) {
     const newParentBranch = froca.getBranch(newParentBranchId);
     if (!newParentBranch) {
         return;
@@ -86,7 +86,7 @@ async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: st
             continue;
         }
 
-        const resp = await server.put<Response>(`branches/${branchIdToMove}/move-to/${newParentBranchId}`);
+        const resp = await server.put<Response>(`branches/${branchIdToMove}/move-to/${newParentBranchId}`, undefined, componentId);
 
         if (!resp.success) {
             toastService.showError(resp.message);
@@ -103,7 +103,7 @@ async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: st
  * @param moveToParent whether to automatically go to the parent note path after a succesful delete. Usually makes sense if deleting the active note(s).
  * @returns promise that returns false if the operation was cancelled or there was nothing to delete, true if the operation succeeded.
  */
-async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false, moveToParent = true) {
+async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false, moveToParent = true, componentId?: string) {
     branchIdsToDelete = filterRootNote(branchIdsToDelete);
 
     if (branchIdsToDelete.length === 0) {
@@ -139,9 +139,9 @@ async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = f
         const branch = froca.getBranch(branchIdToDelete);
 
         if (deleteAllClones && branch) {
-            await server.remove(`notes/${branch.noteId}${query}`);
+            await server.remove(`notes/${branch.noteId}${query}`, componentId);
         } else {
-            await server.remove(`branches/${branchIdToDelete}${query}`);
+            await server.remove(`branches/${branchIdToDelete}${query}`, componentId);
         }
     }
 

apps/client/src/services/bundle.ts

@@ -1,10 +1,15 @@
+import { h, VNode } from "preact";
+
+import BasicWidget, { ReactWrappedWidget } from "../widgets/basic_widget.js";
+import RightPanelWidget from "../widgets/right_panel_widget.js";
+import froca from "./froca.js";
+import type { Entity } from "./frontend_script_api.js";
+import { WidgetDefinitionWithType } from "./frontend_script_api_preact.js";
+import { t } from "./i18n.js";
 import ScriptContext from "./script_context.js";
 import server from "./server.js";
-import toastService, { showError } from "./toast.js";
-import froca from "./froca.js";
-import utils from "./utils.js";
-import { t } from "./i18n.js";
-import type { Entity } from "./frontend_script_api.js";
+import toastService, { showErrorForScriptNote } from "./toast.js";
+import utils, { getErrorMessage } from "./utils.js";
 
 // TODO: Deduplicate with server.
 export interface Bundle {
@@ -14,9 +19,13 @@ export interface Bundle {
     allNoteIds: string[];
 }
 
-interface Widget {
+type LegacyWidget = (BasicWidget | RightPanelWidget) & {
     parentWidget?: string;
-}
+};
+type WithNoteId<T> = T & {
+    _noteId: string;
+};
+export type Widget = WithNoteId<(LegacyWidget | WidgetDefinitionWithType)>;
 
 async function getAndExecuteBundle(noteId: string, originEntity = null, script = null, params = null) {
     const bundle = await server.post<Bundle>(`script/bundle/${noteId}`, {
@@ -27,6 +36,8 @@ async function getAndExecuteBundle(noteId: string, originEntity = null, script =
     return await executeBundle(bundle, originEntity);
 }
 
+export type ParentName = "left-pane" | "center-pane" | "note-detail-pane" | "right-pane";
+
 export async function executeBundle(bundle: Bundle, originEntity?: Entity | null, $container?: JQuery<HTMLElement>) {
     const apiContext = await ScriptContext(bundle.noteId, bundle.allNoteIds, originEntity, $container);
 
@@ -35,24 +46,14 @@ export async function executeBundle(bundle: Bundle, originEntity?: Entity | null
             return eval(`const apiContext = this; (async function() { ${bundle.script}\r\n})()`);
         }.call(apiContext);
     } catch (e: any) {
-        const note = await froca.getNote(bundle.noteId);
-        toastService.showPersistent({
-            id: `custom-script-failure-${note?.noteId}`,
-            title: t("toast.bundle-error.title"),
-            icon: "bx bx-error-circle",
-            message: t("toast.bundle-error.message", {
-                id: note?.noteId,
-                title: note?.title,
-                message: e.message
-            })
-        });
+        showErrorForScriptNote(bundle.noteId, t("toast.bundle-error.message", { message: e.message }));
         logError("Widget initialization failed: ", e);
     }
 }
 
 async function executeStartupBundles() {
     const isMobile = utils.isMobile();
-    const scriptBundles = await server.get<Bundle[]>("script/startup" + (isMobile ? "?mobile=true" : ""));
+    const scriptBundles = await server.get<Bundle[]>(`script/startup${  isMobile ? "?mobile=true" : ""}`);
 
     for (const bundle of scriptBundles) {
         await executeBundle(bundle);
@@ -60,68 +61,99 @@ async function executeStartupBundles() {
 }
 
 export class WidgetsByParent {
-    private byParent: Record<string, Widget[]>;
+    private legacyWidgets: Record<string, WithNoteId<LegacyWidget>[]>;
+    private preactWidgets: Record<string, WithNoteId<WidgetDefinitionWithType>[]>;
 
     constructor() {
-        this.byParent = {};
+        this.legacyWidgets = {};
+        this.preactWidgets = {};
     }
 
     add(widget: Widget) {
-        if (!widget.parentWidget) {
-            console.log(`Custom widget does not have mandatory 'parentWidget' property defined`);
-            return;
+        let hasParentWidget = false;
+        let isPreact = false;
+        if ("type" in widget && widget.type === "preact-widget") {
+            // React-based script.
+            const reactWidget = widget as WithNoteId<WidgetDefinitionWithType>;
+            this.preactWidgets[reactWidget.parent] = this.preactWidgets[reactWidget.parent] || [];
+            this.preactWidgets[reactWidget.parent].push(reactWidget);
+            isPreact = true;
+            hasParentWidget = !!reactWidget.parent;
+        } else if ("parentWidget" in widget && widget.parentWidget) {
+            this.legacyWidgets[widget.parentWidget] = this.legacyWidgets[widget.parentWidget] || [];
+            this.legacyWidgets[widget.parentWidget].push(widget);
+            hasParentWidget = !!widget.parentWidget;
         }
 
-        this.byParent[widget.parentWidget] = this.byParent[widget.parentWidget] || [];
-        this.byParent[widget.parentWidget].push(widget);
+        if (!hasParentWidget) {
+            showErrorForScriptNote(widget._noteId, t("toast.widget-missing-parent", {
+                property: isPreact ? "parent" : "parentWidget"
+            }));
+        }
     }
 
-    get(parentName: string) {
-        if (!this.byParent[parentName]) {
-            return [];
+    get(parentName: ParentName) {
+        const widgets: (BasicWidget | VNode)[] = this.getLegacyWidgets(parentName);
+        for (const preactWidget of this.getPreactWidgets(parentName)) {
+            const el = h(preactWidget.render, {});
+            const widget = new ReactWrappedWidget(el);
+            widget.contentSized();
+            if (preactWidget.position) {
+                widget.position = preactWidget.position;
+            }
+            widgets.push(widget);
         }
 
+        return widgets;
+    }
+
+    getLegacyWidgets(parentName: ParentName): (BasicWidget | RightPanelWidget)[] {
+        if (!this.legacyWidgets[parentName]) return [];
+
         return (
-            this.byParent[parentName]
+            this.legacyWidgets[parentName]
                 // previously, custom widgets were provided as a single instance, but that has the disadvantage
                 // for splits where we actually need multiple instaces and thus having a class to instantiate is better
                 // https://github.com/zadam/trilium/issues/4274
                 .map((w: any) => (w.prototype ? new w() : w))
         );
     }
+
+    getPreactWidgets(parentName: ParentName) {
+        return this.preactWidgets[parentName] ?? [];
+    }
 }
 
 async function getWidgetBundlesByParent() {
-    const scriptBundles = await server.get<Bundle[]>("script/widgets");
-
     const widgetsByParent = new WidgetsByParent();
 
-    for (const bundle of scriptBundles) {
-        let widget;
+    try {
+        const scriptBundles = await server.get<Bundle[]>("script/widgets");
 
-        try {
-            widget = await executeBundle(bundle);
-            if (widget) {
-                widget._noteId = bundle.noteId;
-                widgetsByParent.add(widget);
+        for (const bundle of scriptBundles) {
+            let widget;
+
+            try {
+                widget = await executeBundle(bundle);
+                if (widget) {
+                    widget._noteId = bundle.noteId;
+                    widgetsByParent.add(widget);
+                }
+            } catch (e: any) {
+                const noteId = bundle.noteId;
+                showErrorForScriptNote(noteId, t("toast.bundle-error.message", { message: e.message }));
+
+                logError("Widget initialization failed: ", e);
+                continue;
             }
-        } catch (e: any) {
-            const noteId = bundle.noteId;
-            const note = await froca.getNote(noteId);
-            toastService.showPersistent({
-                id: `custom-script-failure-${noteId}`,
-                title: t("toast.bundle-error.title"),
-                icon: "bx bx-error-circle",
-                message: t("toast.bundle-error.message", {
-                    id: noteId,
-                    title: note?.title,
-                    message: e.message
-                })
-            });
-
-            logError("Widget initialization failed: ", e);
-            continue;
         }
+    } catch (e) {
+        toastService.showPersistent({
+            id: `custom-widget-list-failure`,
+            title: t("toast.widget-list-error.title"),
+            message: getErrorMessage(e),
+            icon: "bx bx-error-circle"
+        });
     }
 
     return widgetsByParent;

apps/client/src/services/content_renderer.css

@@ -0,0 +1,9 @@
+.rendered-content.no-preview > div {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+    align-items: center;
+    height: 100%;
+    font-size: 500%;
+    flex-grow: 1;
+}

apps/client/src/services/content_renderer.ts

@@ -1,18 +1,21 @@
-import renderService from "./render.js";
+import "./content_renderer.css";
+
+import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
+import WheelZoom from 'vanilla-js-wheel-zoom';
+
+import FAttachment from "../entities/fattachment.js";
+import FNote from "../entities/fnote.js";
+import imageContextMenuService from "../menus/image_context_menu.js";
+import { t } from "../services/i18n.js";
+import renderText from "./content_renderer_text.js";
+import renderDoc from "./doc_renderer.js";
+import { loadElkIfNeeded, postprocessMermaidSvg } from "./mermaid.js";
+import openService from "./open.js";
 import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
-import openService from "./open.js";
-import utils from "./utils.js";
-import FNote from "../entities/fnote.js";
-import FAttachment from "../entities/fattachment.js";
-import imageContextMenuService from "../menus/image_context_menu.js";
+import renderService from "./render.js";
 import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.js";
-import { loadElkIfNeeded, postprocessMermaidSvg } from "./mermaid.js";
-import renderDoc from "./doc_renderer.js";
-import { t } from "../services/i18n.js";
-import WheelZoom from 'vanilla-js-wheel-zoom';
-import { normalizeMimeTypeForCKEditor } from "@triliumnext/commons";
-import renderText from "./content_renderer_text.js";
+import utils from "./utils.js";
 
 let idCounter = 1;
 
@@ -22,6 +25,12 @@ export interface RenderOptions {
     imageHasZoom?: boolean;
     /** If enabled, it will prevent the default behavior in which an empty note would display a list of children. */
     noChildrenList?: boolean;
+    /** If enabled, it will prevent rendering of included notes. */
+    noIncludedNotes?: boolean;
+    /** If enabled, it will include archived notes when rendering children list. */
+    includeArchivedNotes?: boolean;
+    /** Set of note IDs that have already been seen during rendering to prevent infinite recursion. */
+    seenNoteIds?: Set<string>;
 }
 
 const CODE_MIME_TYPES = new Set(["application/json"]);
@@ -64,18 +73,9 @@ export async function getRenderedContent(this: {} | { ctx: string }, entity: FNo
 
         $renderedContent.append($("<div>").append("<div>This note is protected and to access it you need to enter password.</div>").append("<br/>").append($button));
     } else if (entity instanceof FNote) {
-        $renderedContent
-            .css("display", "flex")
-            .css("flex-direction", "column");
+        $renderedContent.addClass("no-preview");
         $renderedContent.append(
-            $("<div>")
-                .css("display", "flex")
-                .css("justify-content", "space-around")
-                .css("align-items", "center")
-                .css("height", "100%")
-                .css("font-size", "500%")
-                .css("flex-grow", "1")
-                .append($("<span>").addClass(entity.getIcon()))
+            $("<div>").append($("<span>").addClass(entity.getIcon()))
         );
 
         if (entity.type === "webView" && entity.hasLabel("webViewSrc")) {
@@ -152,7 +152,7 @@ function renderImage(entity: FNote | FAttachment, $renderedContent: JQuery<HTMLE
 
     const $img = $("<img>")
         .attr("src", url || "")
-        .attr("id", "attachment-image-" + idCounter++)
+        .attr("id", `attachment-image-${idCounter++}`)
         .css("max-width", "100%");
 
     $renderedContent.append($img);
@@ -193,7 +193,7 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
 
     if (type === "pdf") {
         const $pdfPreview = $('<iframe class="pdf-preview" style="width: 100%; flex-grow: 100;"></iframe>');
-        $pdfPreview.attr("src", openService.getUrlForDownload(`api/${entityType}/${entityId}/open`));
+        $pdfPreview.attr("src", openService.getUrlForDownload(`pdfjs/web/viewer.html?file=../../api/${entityType}/${entityId}/open`));
 
         $content.append($pdfPreview);
     } else if (type === "audio") {
@@ -217,28 +217,28 @@ function renderFile(entity: FNote | FAttachment, type: string, $renderedContent:
         //       in attachment list
         const $downloadButton = $(`
             <button class="file-download btn btn-primary" type="button">
-                <span class="bx bx-download"></span>
+                <span class="tn-icon bx bx-download"></span>
                 ${t("file_properties.download")}
             </button>
         `);
 
         const $openButton = $(`
             <button class="file-open btn btn-primary" type="button">
-                <span class="bx bx-link-external"></span>
+                <span class="tn-icon bx bx-link-external"></span>
                 ${t("file_properties.open")}
             </button>
         `);
 
         $downloadButton.on("click", (e) => {
             e.stopPropagation();
-            openService.downloadFileNote(entity.noteId)
+            openService.downloadFileNote(entity, null, null);
         });
         $openButton.on("click", async (e) => {
             const iconEl = $openButton.find("> .bx");
             iconEl.removeClass("bx bx-link-external");
             iconEl.addClass("bx bx-loader spin");
             e.stopPropagation();
-            await openService.openNoteExternally(entity.noteId, entity.mime)
+            await openService.openNoteExternally(entity.noteId, entity.mime);
             iconEl.removeClass("bx bx-loader spin");
             iconEl.addClass("bx bx-link-external");
         });
@@ -266,7 +266,7 @@ async function renderMermaid(note: FNote | FAttachment, $renderedContent: JQuery
 
     try {
         await loadElkIfNeeded(mermaid, content);
-        const { svg } = await mermaid.mermaidAPI.render("in-mermaid-graph-" + idCounter++, content);
+        const { svg } = await mermaid.mermaidAPI.render(`in-mermaid-graph-${idCounter++}`, content);
 
         $renderedContent.append($(postprocessMermaidSvg(svg)));
     } catch (e) {
@@ -285,10 +285,11 @@ function getRenderingType(entity: FNote | FAttachment) {
     }
 
     const mime = "mime" in entity && entity.mime;
+    const isIconPack = entity instanceof FNote && entity.hasLabel("iconPack");
 
     if (type === "file" && mime === "application/pdf") {
         type = "pdf";
-    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime)) {
+    } else if ((type === "file" || type === "viewConfig") && mime && CODE_MIME_TYPES.has(mime) && !isIconPack) {
         type = "code";
     } else if (type === "file" && mime && mime.startsWith("audio/")) {
         type = "audio";

apps/client/src/services/content_renderer_text.spec.ts

@@ -0,0 +1,132 @@
+import { trimIndentation } from "@triliumnext/commons";
+import { describe, expect, it } from "vitest";
+
+import { buildNote } from "../test/easy-froca";
+import renderText from "./content_renderer_text";
+
+describe("Text content renderer", () => {
+    it("renders included note", async () => {
+        const contentEl = document.createElement("div");
+        const includedNote = buildNote({
+            title: "Included note",
+            content: "<p>This is the included note.</p>"
+        });
+        const note = buildNote({
+            title: "New note",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="${includedNote.noteId}" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl));
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(1);
+        expect(contentEl.querySelectorAll("section.include-note p").length).toBe(1);
+    });
+
+    it("skips rendering included note", async () => {
+        const contentEl = document.createElement("div");
+        const includedNote = buildNote({
+            title: "Included note",
+            content: "<p>This is the included note.</p>"
+        });
+        const note = buildNote({
+            title: "New note",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="${includedNote.noteId}" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl), { noIncludedNotes: true });
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(0);
+    });
+
+    it("doesn't enter infinite loop on direct recursion", async () => {
+        const contentEl = document.createElement("div");
+        const note = buildNote({
+            title: "New note",
+            id: "Y7mBwmRjQyb4",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="Y7mBwmRjQyb4" data-box-size="medium">
+                    &nbsp;
+                </section>
+                <section class="include-note" data-note-id="Y7mBwmRjQyb4" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl));
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(0);
+    });
+
+    it("doesn't enter infinite loop on indirect recursion", async () => {
+        const contentEl = document.createElement("div");
+        buildNote({
+            id: "first",
+            title: "Included note",
+            content: trimIndentation`\
+                <p>This is the included note.</p>
+                <section class="include-note" data-note-id="second" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        const note = buildNote({
+            id: "second",
+            title: "New note",
+            content: trimIndentation`
+                <p>
+                    Hi there
+                </p>
+                <section class="include-note" data-note-id="first" data-box-size="medium">
+                    &nbsp;
+                </section>
+            `
+        });
+        await renderText(note, $(contentEl));
+        expect(contentEl.querySelectorAll("section.include-note").length).toBe(1);
+    });
+
+    it("renders children list when note is empty", async () => {
+        const contentEl = document.createElement("div");
+        const parentNote = buildNote({
+            title: "Parent note",
+            children: [
+                { title: "Child note 1" },
+                { title: "Child note 2" }
+            ]
+        });
+        await renderText(parentNote, $(contentEl));
+        const items = contentEl.querySelectorAll("a");
+        expect(items.length).toBe(2);
+        expect(items[0].textContent).toBe("Child note 1");
+        expect(items[1].textContent).toBe("Child note 2");
+    });
+
+    it("skips archived notes in children list", async () => {
+        const contentEl = document.createElement("div");
+        const parentNote = buildNote({
+            title: "Parent note",
+            children: [
+                { title: "Child note 1" },
+                { title: "Child note 2", "#archived": "" },
+                { title: "Child note 3" }
+            ]
+        });
+        await renderText(parentNote, $(contentEl));
+        const items = contentEl.querySelectorAll("a");
+        expect(items.length).toBe(2);
+        expect(items[0].textContent).toBe("Child note 1");
+        expect(items[1].textContent).toBe("Child note 3");
+    });
+});

apps/client/src/services/content_renderer_text.ts

@@ -1,13 +1,13 @@
-import { formatCodeBlocks } from "./syntax_highlight.js";
-import { getMermaidConfig } from "./mermaid.js";
-import { renderMathInElement } from "./math.js";
-import FNote from "../entities/fnote.js";
 import FAttachment from "../entities/fattachment.js";
-import tree from "./tree.js";
+import FNote from "../entities/fnote.js";
+import { default as content_renderer, type RenderOptions } from "./content_renderer.js";
 import froca from "./froca.js";
 import link from "./link.js";
+import { renderMathInElement } from "./math.js";
+import { getMermaidConfig } from "./mermaid.js";
+import { formatCodeBlocks } from "./syntax_highlight.js";
+import tree from "./tree.js";
 import { isHtmlEmpty } from "./utils.js";
-import { default as content_renderer, type RenderOptions } from "./content_renderer.js";
 
 export default async function renderText(note: FNote | FAttachment, $renderedContent: JQuery<HTMLElement>, options: RenderOptions = {}) {
     // entity must be FNote
@@ -15,29 +15,38 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
 
     if (blob && !isHtmlEmpty(blob.content)) {
         $renderedContent.append($('<div class="ck-content">').html(blob.content));
-        await renderIncludedNotes($renderedContent[0]);
+
+        const seenNoteIds = options.seenNoteIds ?? new Set<string>();
+        seenNoteIds.add("noteId" in note ? note.noteId : note.attachmentId);
+        if (!options.noIncludedNotes) {
+            await renderIncludedNotes($renderedContent[0], seenNoteIds);
+        } else {
+            $renderedContent.find("section.include-note").remove();
+        }
 
         if ($renderedContent.find("span.math-tex").length > 0) {
             renderMathInElement($renderedContent[0], { trust: true });
         }
 
         const getNoteIdFromLink = (el: HTMLElement) => tree.getNoteIdFromUrl($(el).attr("href") || "");
-        const referenceLinks = $renderedContent.find("a.reference-link");
+        const referenceLinks = $renderedContent.find<HTMLAnchorElement>("a.reference-link");
         const noteIdsToPrefetch = referenceLinks.map((i, el) => getNoteIdFromLink(el));
         await froca.getNotes(noteIdsToPrefetch);
 
         for (const el of referenceLinks) {
-            await link.loadReferenceLinkTitle($(el));
+            const innerSpan = document.createElement("span");
+            await link.loadReferenceLinkTitle($(innerSpan), el.href);
+            el.replaceChildren(innerSpan);
         }
 
         await rewriteMermaidDiagramsInContainer($renderedContent[0] as HTMLDivElement);
         await formatCodeBlocks($renderedContent);
     } else if (note instanceof FNote && !options.noChildrenList) {
-        await renderChildrenList($renderedContent, note);
+        await renderChildrenList($renderedContent, note, options.includeArchivedNotes ?? false);
     }
 }
 
-async function renderIncludedNotes(contentEl: HTMLElement) {
+async function renderIncludedNotes(contentEl: HTMLElement, seenNoteIds: Set<string>) {
     // TODO: Consider duplicating with server's share/content_renderer.ts.
     const includeNoteEls = contentEl.querySelectorAll("section.include-note");
 
@@ -64,7 +73,15 @@ async function renderIncludedNotes(contentEl: HTMLElement) {
             continue;
         }
 
-        const renderedContent = (await content_renderer.getRenderedContent(note)).$renderedContent;
+        if (seenNoteIds.has(noteId)) {
+            console.warn(`Skipping inclusion of ${noteId} to avoid circular reference.`);
+            includeNoteEl.remove();
+            continue;
+        }
+
+        const renderedContent = (await content_renderer.getRenderedContent(note, {
+            seenNoteIds
+        })).$renderedContent;
         includeNoteEl.replaceChildren(...renderedContent);
     }
 }
@@ -96,7 +113,7 @@ export async function applyInlineMermaid(container: HTMLDivElement) {
     }
 }
 
-async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote) {
+async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote, includeArchivedNotes: boolean) {
     let childNoteIds = note.getChildNoteIds();
 
     if (!childNoteIds.length) {
@@ -106,14 +123,16 @@ async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: F
     $renderedContent.css("padding", "10px");
     $renderedContent.addClass("text-with-ellipsis");
 
+    // just load the first 10 child notes
     if (childNoteIds.length > 10) {
         childNoteIds = childNoteIds.slice(0, 10);
     }
 
-    // just load the first 10 child notes
     const childNotes = await froca.getNotes(childNoteIds);
 
     for (const childNote of childNotes) {
+        if (childNote.isArchived && !includeArchivedNotes) continue;
+
         $renderedContent.append(
             await link.createLink(`${note.noteId}/${childNote.noteId}`, {
                 showTooltip: false,

apps/client/src/services/css_class_manager.spec.ts

@@ -0,0 +1,14 @@
+import { describe, expect, it } from "vitest";
+
+import { getReadableTextColor } from "./css_class_manager";
+
+describe("getReadableTextColor", () => {
+    it("doesn't crash for invalid color", () => {
+        expect(getReadableTextColor("RandomColor")).toBe("#000");
+    });
+
+    it("tolerates different casing", () => {
+        expect(getReadableTextColor("Blue"))
+            .toBe(getReadableTextColor("blue"));
+    });
+});

apps/client/src/services/css_class_manager.ts

@@ -1,21 +1,22 @@
 import clsx from "clsx";
-import {readCssVar} from "../utils/css-var";
 import Color, { ColorInstance } from "color";
 
+import {readCssVar} from "../utils/css-var";
+
 const registeredClasses = new Set<string>();
 const colorsWithHue = new Set<string>();
 
 // Read the color lightness limits defined in the theme as CSS variables
 
 const lightThemeColorMaxLightness = readCssVar(
-                                        document.documentElement,
-                                        "tree-item-light-theme-max-color-lightness"
-                                    ).asNumber(70);
+    document.documentElement,
+    "tree-item-light-theme-max-color-lightness"
+).asNumber(70);
 
 const darkThemeColorMinLightness = readCssVar(
-                                        document.documentElement,
-                                        "tree-item-dark-theme-min-color-lightness"
-                                    ).asNumber(50);
+    document.documentElement,
+    "tree-item-dark-theme-min-color-lightness"
+).asNumber(50);
 
 function createClassForColor(colorString: string | null) {
     if (!colorString?.trim()) return "";
@@ -27,7 +28,7 @@ function createClassForColor(colorString: string | null) {
 
     if (!registeredClasses.has(className)) {
         const adjustedColor = adjustColorLightness(color, lightThemeColorMaxLightness!,
-                                                   darkThemeColorMinLightness!);
+            darkThemeColorMinLightness!);
         const hue = getHue(color);
 
         $("head").append(`<style>
@@ -48,9 +49,9 @@ function createClassForColor(colorString: string | null) {
     return clsx("use-note-color", className, colorsWithHue.has(className) && "with-hue");
 }
 
-function parseColor(color: string) {
+export function parseColor(color: string) {
     try {
-        return Color(color);
+        return Color(color.toLowerCase());
     } catch (ex) {
         console.error(ex);
     }
@@ -76,7 +77,7 @@ function adjustColorLightness(color: ColorInstance, lightThemeMaxLightness: numb
 }
 
 /** Returns the hue of the specified color, or undefined if the color is grayscale. */
-function getHue(color: ColorInstance) {
+export function getHue(color: ColorInstance) {
     const hslColor = color.hsl();
     if (hslColor.saturationl() > 0) {
         return hslColor.hue();
@@ -84,8 +85,8 @@ function getHue(color: ColorInstance) {
 }
 
 export function getReadableTextColor(bgColor: string) {
-    const colorInstance = Color(bgColor);
-    return colorInstance.isLight() ? "#000" : "#fff";
+    const colorInstance = parseColor(bgColor);
+    return !colorInstance || colorInstance?.isLight() ? "#000" : "#fff";
 }
 
 export default {

apps/client/src/services/experimental_features.ts

@@ -0,0 +1,61 @@
+import { t } from "./i18n";
+import options from "./options";
+import { isMobile } from "./utils";
+
+export interface ExperimentalFeature {
+    id: string;
+    name: string;
+    description: string;
+}
+
+export const experimentalFeatures = [
+    {
+        id: "new-layout",
+        name: t("experimental_features.new_layout_name"),
+        description: t("experimental_features.new_layout_description"),
+    }
+] as const satisfies ExperimentalFeature[];
+
+export type ExperimentalFeatureId = typeof experimentalFeatures[number]["id"];
+
+let enabledFeatures: Set<ExperimentalFeatureId> | null = null;
+
+export function isExperimentalFeatureEnabled(featureId: ExperimentalFeatureId): boolean {
+    if (featureId === "new-layout") {
+        return (isMobile() || options.is("newLayout"));
+    }
+
+    return getEnabledFeatures().has(featureId);
+}
+
+export function getEnabledExperimentalFeatureIds() {
+    const values = [ ...getEnabledFeatures().values() ];
+    if (isMobile() || options.is("newLayout")) {
+        values.push("new-layout");
+    }
+    return values;
+}
+
+export async function toggleExperimentalFeature(featureId: ExperimentalFeatureId, enable: boolean) {
+    const features = new Set(getEnabledFeatures());
+    if (enable) {
+        features.add(featureId);
+    } else {
+        features.delete(featureId);
+    }
+    await options.save("experimentalFeatures", JSON.stringify(Array.from(features)));
+}
+
+function getEnabledFeatures() {
+    if (!enabledFeatures) {
+        let features: ExperimentalFeatureId[] = [];
+        try {
+            features = JSON.parse(options.get("experimentalFeatures")) as ExperimentalFeatureId[];
+        } catch (e) {
+            console.warn("Failed to parse experimental features from options:", e);
+        }
+        enabledFeatures = new Set(features);
+        enabledFeatures.delete("new-layout"); // handled separately.
+    }
+    return enabledFeatures;
+}

apps/client/src/services/frontend_script_api.ts

@@ -1,26 +1,27 @@
-import server from "./server.js";
-import utils from "./utils.js";
-import toastService from "./toast.js";
-import linkService from "./link.js";
+import { dayjs, formatLogMessage } from "@triliumnext/commons";
+
+import appContext from "../components/app_context.js";
+import type Component from "../components/component.js";
+import type NoteContext from "../components/note_context.js";
+import type FNote from "../entities/fnote.js";
+import BasicWidget, { ReactWrappedWidget } from "../widgets/basic_widget.js";
+import NoteContextAwareWidget from "../widgets/note_context_aware_widget.js";
+import RightPanelWidget from "../widgets/right_panel_widget.js";
+import dateNotesService from "./date_notes.js";
+import dialogService from "./dialog.js";
 import froca from "./froca.js";
+import { preactAPI } from "./frontend_script_api_preact.js";
+import { t } from "./i18n.js";
+import linkService from "./link.js";
 import noteTooltipService from "./note_tooltip.js";
 import protectedSessionService from "./protected_session.js";
-import dateNotesService from "./date_notes.js";
 import searchService from "./search.js";
-import RightPanelWidget from "../widgets/right_panel_widget.js";
-import ws from "./ws.js";
-import appContext from "../components/app_context.js";
-import NoteContextAwareWidget from "../widgets/note_context_aware_widget.js";
-import BasicWidget, { ReactWrappedWidget } from "../widgets/basic_widget.js";
-import SpacedUpdate from "./spaced_update.js";
+import server from "./server.js";
 import shortcutService from "./shortcuts.js";
-import dialogService from "./dialog.js";
-import type FNote from "../entities/fnote.js";
-import { t } from "./i18n.js";
-import { dayjs } from "@triliumnext/commons";
-import type NoteContext from "../components/note_context.js";
-import type Component from "../components/component.js";
-import { formatLogMessage } from "@triliumnext/commons";
+import SpacedUpdate from "./spaced_update.js";
+import toastService from "./toast.js";
+import utils from "./utils.js";
+import ws from "./ws.js";
 
 /**
  * A whole number
@@ -464,6 +465,8 @@ export interface Api {
      * Log given message to the log pane in UI
      */
     log(message: string | object): void;
+
+    preact: typeof preactAPI;
 }
 
 /**
@@ -533,9 +536,8 @@ function FrontendScriptApi(this: Api, startNote: FNote, currentNote: FNote, orig
         return params.map((p) => {
             if (typeof p === "function") {
                 return `!@#Function: ${p.toString()}`;
-            } else {
-                return p;
             }
+            return p;
         });
     }
 
@@ -562,9 +564,8 @@ function FrontendScriptApi(this: Api, startNote: FNote, currentNote: FNote, orig
             await ws.waitForMaxKnownEntityChangeId();
 
             return ret.executionResult;
-        } else {
-            throw new Error(`server error: ${ret.error}`);
         }
+        throw new Error(`server error: ${ret.error}`);
     };
 
     this.runOnBackend = async (func, params = []) => {
@@ -721,6 +722,8 @@ function FrontendScriptApi(this: Api, startNote: FNote, currentNote: FNote, orig
         this.logMessages[noteId].push(message);
         this.logSpacedUpdates[noteId].scheduleUpdate();
     };
+
+    this.preact = preactAPI;
 }
 
 export default FrontendScriptApi as any as {

apps/client/src/services/frontend_script_api_preact.ts

@@ -0,0 +1,101 @@
+import { Fragment, h, VNode } from "preact";
+import * as hooks from "preact/hooks";
+
+import ActionButton from "../widgets/react/ActionButton";
+import Admonition from "../widgets/react/Admonition";
+import Button from "../widgets/react/Button";
+import CKEditor from "../widgets/react/CKEditor";
+import Collapsible from "../widgets/react/Collapsible";
+import Dropdown from "../widgets/react/Dropdown";
+import FormCheckbox from "../widgets/react/FormCheckbox";
+import FormDropdownList from "../widgets/react/FormDropdownList";
+import { FormFileUploadActionButton, FormFileUploadButton } from "../widgets/react/FormFileUpload";
+import FormGroup from "../widgets/react/FormGroup";
+import { FormDropdownDivider, FormDropdownSubmenu, FormListItem } from "../widgets/react/FormList";
+import FormRadioGroup from "../widgets/react/FormRadioGroup";
+import FormText from "../widgets/react/FormText";
+import FormTextArea from "../widgets/react/FormTextArea";
+import FormTextBox from "../widgets/react/FormTextBox";
+import FormToggle from "../widgets/react/FormToggle";
+import * as triliumHooks from "../widgets/react/hooks";
+import Icon from "../widgets/react/Icon";
+import LinkButton from "../widgets/react/LinkButton";
+import LoadingSpinner from "../widgets/react/LoadingSpinner";
+import Modal from "../widgets/react/Modal";
+import NoteAutocomplete from "../widgets/react/NoteAutocomplete";
+import NoteLink from "../widgets/react/NoteLink";
+import RawHtml from "../widgets/react/RawHtml";
+import Slider from "../widgets/react/Slider";
+import RightPanelWidget from "../widgets/sidebar/RightPanelWidget";
+
+export interface WidgetDefinition {
+    parent: "right-pane",
+    render: () => VNode,
+    position?: number,
+}
+
+export interface WidgetDefinitionWithType extends WidgetDefinition {
+    type: "preact-widget"
+}
+
+export interface LauncherWidgetDefinitionWithType {
+    type: "preact-launcher-widget"
+    render: () => VNode
+}
+
+export const preactAPI = Object.freeze({
+    // Core
+    h,
+    Fragment,
+
+    /**
+     * Method that must be run for widget scripts that run on Preact, using JSX. The method just returns the same definition, reserved for future typechecking and perhaps validation purposes.
+     *
+     * @param definition the widget definition.
+     */
+    defineWidget(definition: WidgetDefinition) {
+        return {
+            type: "preact-widget",
+            ...definition
+        };
+    },
+
+    defineLauncherWidget(definition: Omit<LauncherWidgetDefinitionWithType, "type">) {
+        return {
+            type: "preact-launcher-widget",
+            ...definition
+        };
+    },
+
+    // Basic widgets
+    ActionButton,
+    Admonition,
+    Button,
+    CKEditor,
+    Collapsible,
+    Dropdown,
+    FormCheckbox,
+    FormDropdownList,
+    FormFileUploadButton, FormFileUploadActionButton,
+    FormGroup,
+    FormListItem, FormDropdownDivider, FormDropdownSubmenu,
+    FormRadioGroup,
+    FormText,
+    FormTextArea,
+    FormTextBox,
+    FormToggle,
+    Icon,
+    LinkButton,
+    LoadingSpinner,
+    Modal,
+    NoteAutocomplete,
+    NoteLink,
+    RawHtml,
+    Slider,
+
+    // Specialized widgets
+    RightPanelWidget,
+
+    ...hooks,
+    ...triliumHooks
+});

apps/client/src/services/link.ts

@@ -1,10 +1,11 @@
-import treeService from "./tree.js";
-import linkContextMenuService from "../menus/link_context_menu.js";
-import appContext, { type NoteCommandData } from "../components/app_context.js";
-import froca from "./froca.js";
-import utils from "./utils.js";
 import { ALLOWED_PROTOCOLS } from "@triliumnext/commons";
+
+import appContext, { type NoteCommandData } from "../components/app_context.js";
 import { openInCurrentNoteContext } from "../components/note_context.js";
+import linkContextMenuService from "../menus/link_context_menu.js";
+import froca from "./froca.js";
+import treeService from "./tree.js";
+import utils from "./utils.js";
 
 function getNotePathFromUrl(url: string) {
     const notePathMatch = /#(root[A-Za-z0-9_/]*)$/.exec(url);
@@ -27,7 +28,7 @@ async function getLinkIcon(noteId: string, viewMode: ViewMode | undefined) {
     return icon;
 }
 
-export type ViewMode = "default" | "source" | "attachments" | "contextual-help";
+export type ViewMode = "default" | "source" | "attachments" | "contextual-help" | "note-map";
 
 export interface ViewScope {
     /**
@@ -122,7 +123,7 @@ async function createLink(notePath: string | undefined, options: CreateLinkOptio
     const $container = $("<span>");
 
     if (showNoteIcon) {
-        let icon = await getLinkIcon(noteId, viewMode);
+        const icon = await getLinkIcon(noteId, viewMode);
 
         if (icon) {
             $container.append($("<span>").addClass(`bx ${icon}`)).append(" ");
@@ -131,7 +132,7 @@ async function createLink(notePath: string | undefined, options: CreateLinkOptio
 
     const hash = calculateHash({
         notePath,
-        viewScope: viewScope
+        viewScope
     });
 
     const $noteLink = $("<a>", {
@@ -171,11 +172,11 @@ async function createLink(notePath: string | undefined, options: CreateLinkOptio
     return $container;
 }
 
-function calculateHash({ notePath, ntxId, hoistedNoteId, viewScope = {} }: NoteCommandData) {
+export function calculateHash({ notePath, ntxId, hoistedNoteId, viewScope = {} }: NoteCommandData) {
     notePath = notePath || "";
     const params = [
-        ntxId ? { ntxId: ntxId } : null,
-        hoistedNoteId && hoistedNoteId !== "root" ? { hoistedNoteId: hoistedNoteId } : null,
+        ntxId ? { ntxId } : null,
+        hoistedNoteId && hoistedNoteId !== "root" ? { hoistedNoteId } : null,
         viewScope.viewMode && viewScope.viewMode !== "default" ? { viewMode: viewScope.viewMode } : null,
         viewScope.attachmentId ? { attachmentId: viewScope.attachmentId } : null
     ].filter((p) => !!p);
@@ -219,7 +220,7 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
     }
 
     const hash = url.substr(hashIdx + 1); // strip also the initial '#'
-    let [notePath, paramString] = hash.split("?");
+    const [notePath, paramString] = hash.split("?");
 
     const viewScope: ViewScope = {
         viewMode: "default"
@@ -252,7 +253,7 @@ export function parseNavigationStateFromUrl(url: string | undefined) {
     }
 
     if (searchString) {
-        return { searchString }
+        return { searchString };
     }
 
     if (!notePath.match(/^[_a-z0-9]{4,}(\/[_a-z0-9]{4,})*$/i)) {
@@ -334,7 +335,7 @@ export function goToLinkExt(evt: MouseEvent | JQuery.ClickEvent | JQuery.MouseDo
                 window.open(hrefLink, "_blank");
             } else {
                 // Enable protocols supported by CKEditor 5 to be clickable.
-                if (ALLOWED_PROTOCOLS.some((protocol) => hrefLink.toLowerCase().startsWith(protocol + ":"))) {
+                if (ALLOWED_PROTOCOLS.some((protocol) => hrefLink.toLowerCase().startsWith(`${protocol}:`))) {
                     if ( utils.isElectron()) {
                         const electron = utils.dynamicRequire("electron");
                         electron.shell.openExternal(hrefLink);
@@ -395,7 +396,7 @@ async function loadReferenceLinkTitle($el: JQuery<HTMLElement>, href: string | n
 
     href = href || $link.attr("href");
     if (!href) {
-        console.warn("Empty URL for parsing: " + $el[0].outerHTML);
+        console.warn(`Empty URL for parsing: ${$el[0].outerHTML}`);
         return;
     }
 
@@ -438,9 +439,9 @@ async function getReferenceLinkTitle(href: string) {
         const attachment = await note.getAttachmentById(viewScope.attachmentId);
 
         return attachment ? attachment.title : "[missing attachment]";
-    } else {
-        return note.title;
     }
+    return note.title;
+
 }
 
 function getReferenceLinkTitleSync(href: string) {
@@ -462,9 +463,9 @@ function getReferenceLinkTitleSync(href: string) {
         const attachment = note.attachments.find((att) => att.attachmentId === viewScope.attachmentId);
 
         return attachment ? attachment.title : "[missing attachment]";
-    } else {
-        return note.title;
     }
+    return note.title;
+
 }
 
 if (glob.device !== "print") {

apps/client/src/services/load_results.ts

@@ -1,4 +1,5 @@
 import type { AttachmentRow, EtapiTokenRow, NoteType, OptionNames } from "@triliumnext/commons";
+
 import type { AttributeType } from "../entities/fattribute.js";
 import type { EntityChange } from "../server_types.js";
 
@@ -135,7 +136,14 @@ export default class LoadResults {
     }
 
     getBranchRows() {
-        return this.branchRows.map((row) => this.getEntityRow("branches", row.branchId)).filter((branch) => !!branch);
+        return this.branchRows.map((row) => {
+            const branch = this.getEntityRow("branches", row.branchId);
+            if (branch) {
+                // Merge the componentId from the tracked row with the entity data
+                return { ...branch, componentId: row.componentId };
+            }
+            return null;
+        }).filter((branch) => !!branch) as BranchRow[];
     }
 
     addNoteReordering(parentNoteId: string, componentId: string) {
@@ -153,7 +161,14 @@ export default class LoadResults {
     getAttributeRows(componentId = "none"): AttributeRow[] {
         return this.attributeRows
             .filter((row) => row.componentId !== componentId)
-            .map((row) => this.getEntityRow("attributes", row.attributeId))
+            .map((row) => {
+                const attr = this.getEntityRow("attributes", row.attributeId);
+                if (attr) {
+                    // Merge the componentId from the tracked row with the entity data
+                    return { ...attr, componentId: row.componentId };
+                }
+                return null;
+            })
             .filter((attr) => !!attr) as AttributeRow[];
     }
 

apps/client/src/services/open.ts

@@ -1,6 +1,8 @@
-import utils from "./utils.js";
+import Component from "../components/component.js";
+import FNote from "../entities/fnote.js";
 import options from "./options.js";
 import server from "./server.js";
+import utils from "./utils.js";
 
 type ExecFunction = (command: string, cb: (err: string, stdout: string, stderror: string) => void) => void;
 
@@ -36,9 +38,14 @@ function download(url: string) {
     }
 }
 
-export function downloadFileNote(noteId: string) {
-    const url = `${getFileUrl("notes", noteId)}?${Date.now()}`; // don't use cache
+export function downloadFileNote(note: FNote, parentComponent: Component | null, ntxId: string | null | undefined) {
+    if (note.type === "file" && note.mime === "application/pdf" && parentComponent) {
+        // Special handling, manages its own downloading process.
+        parentComponent.triggerEvent("customDownload", { ntxId });
+        return;
+    }
 
+    const url = `${getFileUrl("notes", note.noteId)}?${Date.now()}`; // don't use cache
     download(url);
 }
 
@@ -97,7 +104,7 @@ async function openCustom(type: string, entityId: string, mime: string) {
             // Note that the path separator must be \ instead of /
             filePath = filePath.replace(/\//g, "\\");
         }
-        const command = `rundll32.exe shell32.dll,OpenAs_RunDLL ` + filePath;
+        const command = `rundll32.exe shell32.dll,OpenAs_RunDLL ${filePath}`;
         exec(command, (err, stdout, stderr) => {
             if (err) {
                 console.error("Open Note custom: ", err);
@@ -131,10 +138,10 @@ export function getUrlForDownload(url: string) {
     if (utils.isElectron()) {
         // electron needs absolute URL, so we extract current host, port, protocol
         return `${getHost()}/${url}`;
-    } else {
-        // web server can be deployed on subdomain, so we need to use a relative path
-        return url;
     }
+    // web server can be deployed on subdomain, so we need to use a relative path
+    return url;
+
 }
 
 function canOpenInBrowser(mime: string) {

apps/client/src/services/render.ts

@@ -1,8 +1,12 @@
-import server from "./server.js";
-import bundleService, { type Bundle } from "./bundle.js";
-import type FNote from "../entities/fnote.js";
+import { h, VNode } from "preact";
 
-async function render(note: FNote, $el: JQuery<HTMLElement>) {
+import type FNote from "../entities/fnote.js";
+import { renderReactWidgetAtElement } from "../widgets/react/react_utils.jsx";
+import bundleService, { type Bundle } from "./bundle.js";
+import froca from "./froca.js";
+import server from "./server.js";
+
+async function render(note: FNote, $el: JQuery<HTMLElement>, onError?: (e: unknown) => void) {
     const relations = note.getRelations("renderNote");
     const renderNoteIds = relations.map((rel) => rel.value).filter((noteId) => noteId);
 
@@ -17,12 +21,36 @@ async function render(note: FNote, $el: JQuery<HTMLElement>) {
         $scriptContainer.append(bundle.html);
 
         // async so that scripts cannot block trilium execution
-        bundleService.executeBundle(bundle, note, $scriptContainer);
+        bundleService.executeBundle(bundle, note, $scriptContainer)
+            .catch(onError)
+            .then(result => {
+                // Render JSX
+                if (bundle.html === "") {
+                    renderIfJsx(bundle, result, $el).catch(onError);
+                }
+            });
     }
 
     return renderNoteIds.length > 0;
 }
 
+async function renderIfJsx(bundle: Bundle, result: unknown, $el: JQuery<HTMLElement>) {
+    // Ensure the root script note is actually a JSX.
+    const rootScriptNoteId = await froca.getNote(bundle.noteId);
+    if (rootScriptNoteId?.mime !== "text/jsx") return;
+
+    // Ensure the output is a valid el.
+    if (typeof result !== "function") return;
+
+    // Obtain the parent component.
+    const closestComponent = glob.getComponentByEl($el.closest(".component")[0]);
+    if (!closestComponent) return;
+
+    // Render the element.
+    const el = h(result as () => VNode, {});
+    renderReactWidgetAtElement(closestComponent, el, $el[0]);
+}
+
 export default {
     render
 };

apps/client/src/services/server.ts

@@ -85,13 +85,15 @@ async function remove<T>(url: string, componentId?: string) {
     return await call<T>("DELETE", url, componentId);
 }
 
-async function upload(url: string, fileToUpload: File) {
+async function upload(url: string, fileToUpload: File, componentId?: string) {
     const formData = new FormData();
     formData.append("upload", fileToUpload);
 
     return await $.ajax({
         url: window.glob.baseApiUrl + url,
-        headers: await getHeaders(),
+        headers: await getHeaders(componentId ? {
+            "trilium-component-id": componentId
+        } : undefined),
         data: formData,
         type: "PUT",
         timeout: 60 * 60 * 1000,
@@ -133,11 +135,11 @@ async function call<T>(method: string, url: string, componentId?: string, option
             };
 
             ipc.send("server-request", {
-                requestId: requestId,
-                headers: headers,
-                method: method,
+                requestId,
+                headers,
+                method,
                 url: `/${window.glob.baseApiUrl}${url}`,
-                data: data
+                data
             });
         })) as any;
     } else {
@@ -161,7 +163,7 @@ function ajax(url: string, method: string, data: unknown, headers: Headers, sile
         const options: JQueryAjaxSettings = {
             url: window.glob.baseApiUrl + url,
             type: method,
-            headers: headers,
+            headers,
             timeout: 60000,
             success: (body, textStatus, jqXhr) => {
                 const respHeaders: Headers = {};
@@ -288,8 +290,8 @@ async function reportError(method: string, url: string, statusCode: number, resp
                 t("server.unknown_http_error_content", { statusCode, method, url, message: messageStr }),
                 15_000);
         }
-        const { throwError } = await import("./ws.js");
-        throwError(`${statusCode} ${method} ${url} - ${message}`);
+        const { logError } = await import("./ws.js");
+        logError(`${statusCode} ${method} ${url} - ${message}`);
     }
 }
 

apps/client/src/services/shortcuts.spec.ts

@@ -1,5 +1,6 @@
-import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
-import shortcuts, { keyMatches, matchesShortcut, isIMEComposing } from "./shortcuts.js";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+import shortcuts, { isIMEComposing, keyMatches, matchesShortcut } from "./shortcuts.js";
 
 // Mock utils module
 vi.mock("./utils.js", () => ({
@@ -61,9 +62,10 @@ describe("shortcuts", () => {
     });
 
     describe("keyMatches", () => {
-        const createKeyboardEvent = (key: string, code?: string) => ({
+        const createKeyboardEvent = (key: string, code?: string, extraProps: Partial<KeyboardEvent> = {}) => ({
             key,
-            code: code || `Key${key.toUpperCase()}`
+            code: code || `Key${key.toUpperCase()}`,
+            ...extraProps
         } as KeyboardEvent);
 
         it("should match regular letter keys using key code", () => {
@@ -100,6 +102,26 @@ describe("shortcuts", () => {
             expect(consoleSpy).toHaveBeenCalled();
             consoleSpy.mockRestore();
         });
+
+        it("should match azerty keys", () => {
+            const event = createKeyboardEvent("A", "KeyQ");
+            expect(keyMatches(event, "a")).toBe(true);
+            expect(keyMatches(event, "q")).toBe(false);
+        });
+
+        it("should match letter keys using code when key is a special character (macOS Alt behavior)", () => {
+            // On macOS, pressing Option/Alt + A produces 'å' as the key, but code is still 'KeyA'
+            const macOSAltAEvent = createKeyboardEvent("å", "KeyA", { altKey: true });
+            expect(keyMatches(macOSAltAEvent, "a")).toBe(true);
+
+            // Option + H produces '˙'
+            const macOSAltHEvent = createKeyboardEvent("˙", "KeyH", { altKey: true });
+            expect(keyMatches(macOSAltHEvent, "h")).toBe(true);
+
+            // Option + S produces 'ß'
+            const macOSAltSEvent = createKeyboardEvent("ß", "KeyS", { altKey: true });
+            expect(keyMatches(macOSAltSEvent, "s")).toBe(true);
+        });
     });
 
     describe("matchesShortcut", () => {
@@ -200,6 +222,42 @@ describe("shortcuts", () => {
             expect(consoleSpy).toHaveBeenCalled();
             consoleSpy.mockRestore();
         });
+
+        it("matches azerty", () => {
+            const event = createKeyboardEvent({
+                key: "a",
+                code: "KeyQ",
+                ctrlKey: true
+            });
+            expect(matchesShortcut(event, "Ctrl+A")).toBe(true);
+        });
+
+        it("should match Alt+letter shortcuts on macOS where key is a special character", () => {
+            // On macOS, pressing Option/Alt + A produces 'å' but code remains 'KeyA'
+            const macOSAltAEvent = createKeyboardEvent({
+                key: "å",
+                code: "KeyA",
+                altKey: true
+            });
+            expect(matchesShortcut(macOSAltAEvent, "alt+a")).toBe(true);
+
+            // Option/Alt + H produces '˙'
+            const macOSAltHEvent = createKeyboardEvent({
+                key: "˙",
+                code: "KeyH",
+                altKey: true
+            });
+            expect(matchesShortcut(macOSAltHEvent, "alt+h")).toBe(true);
+
+            // Combined with Ctrl: Ctrl+Alt+S where Alt produces 'ß'
+            const macOSCtrlAltSEvent = createKeyboardEvent({
+                key: "ß",
+                code: "KeyS",
+                ctrlKey: true,
+                altKey: true
+            });
+            expect(matchesShortcut(macOSCtrlAltSEvent, "ctrl+alt+s")).toBe(true);
+        });
     });
 
     describe("bindGlobalShortcut", () => {

apps/client/src/services/shortcuts.ts

@@ -213,7 +213,13 @@ export function keyMatches(e: KeyboardEvent, key: string): boolean {
     }
 
     // For letter keys, use the physical key code for consistency
+    // On macOS, Option/Alt key produces special characters, so we must use e.code
     if (key.length === 1 && key >= 'a' && key <= 'z') {
+        if (e.altKey) {
+            // e.code is like "KeyA", "KeyB", etc.
+            const expectedCode = `Key${key.toUpperCase()}`;
+            return e.code === expectedCode || e.key.toLowerCase() === key.toLowerCase();
+        }
         return e.key.toLowerCase() === key.toLowerCase();
     }
 

apps/client/src/services/spaced_update.ts

@@ -1,22 +1,30 @@
+import type { SaveState } from "../components/note_context";
+import { getErrorMessage } from "./utils";
+
 type Callback = () => Promise<void> | void;
 
+export type StateCallback = (state: SaveState) => void;
+
 export default class SpacedUpdate {
     private updater: Callback;
     private lastUpdated: number;
     private changed: boolean;
     private updateInterval: number;
     private changeForbidden?: boolean;
+    private stateCallback?: StateCallback;
 
-    constructor(updater: Callback, updateInterval = 1000) {
+    constructor(updater: Callback, updateInterval = 1000, stateCallback?: StateCallback) {
         this.updater = updater;
         this.lastUpdated = Date.now();
         this.changed = false;
         this.updateInterval = updateInterval;
+        this.stateCallback = stateCallback;
     }
 
     scheduleUpdate() {
         if (!this.changeForbidden) {
             this.changed = true;
+            this.stateCallback?.("unsaved");
             setTimeout(() => this.triggerUpdate());
         }
     }
@@ -26,10 +34,13 @@ export default class SpacedUpdate {
             this.changed = false; // optimistic...
 
             try {
+                this.stateCallback?.("saving");
                 await this.updater();
+                this.stateCallback?.("saved");
             } catch (e) {
                 this.changed = true;
-
+                this.stateCallback?.("error");
+                logError(getErrorMessage(e));
                 throw e;
             }
         }
@@ -59,15 +70,22 @@ export default class SpacedUpdate {
         this.updateInterval = interval;
     }
 
-    triggerUpdate() {
+    async triggerUpdate() {
         if (!this.changed) {
             return;
         }
 
         if (Date.now() - this.lastUpdated > this.updateInterval) {
-            this.updater();
+            this.stateCallback?.("saving");
+            try {
+                await this.updater();
+                this.stateCallback?.("saved");
+                this.changed = false;
+            } catch (e) {
+                this.stateCallback?.("error");
+                logError(getErrorMessage(e));
+            }
             this.lastUpdated = Date.now();
-            this.changed = false;
         } else {
             // update isn't triggered but changes are still pending, so we need to schedule another check
             this.scheduleUpdate();

apps/client/src/services/syntax_highlight.ts

@@ -1,10 +1,11 @@
-import { ensureMimeTypes, highlight, highlightAuto, loadTheme, Themes, type AutoHighlightResult, type HighlightResult, type Theme } from "@triliumnext/highlightjs";
+import { MimeType } from "@triliumnext/commons";
+import { type AutoHighlightResult, ensureMimeTypes, highlight, highlightAuto, type HighlightResult, loadTheme, type Theme,Themes } from "@triliumnext/highlightjs";
+
+import { copyText, copyTextWithToast } from "./clipboard_ext.js";
+import { t } from "./i18n.js";
 import mime_types from "./mime_types.js";
 import options from "./options.js";
-import { t } from "./i18n.js";
-import { copyText, copyTextWithToast } from "./clipboard_ext.js";
 import { isShare } from "./utils.js";
-import { MimeType } from "@triliumnext/commons";
 
 let highlightingLoaded = false;
 
@@ -76,13 +77,15 @@ export async function applySingleBlockSyntaxHighlight($codeBlock: JQuery<HTMLEle
 }
 
 export async function ensureMimeTypesForHighlighting(mimeTypeHint?: string) {
-    if (highlightingLoaded) {
+    if (!mimeTypeHint && highlightingLoaded) {
         return;
     }
 
     // Load theme.
-    const currentThemeName = String(options.get("codeBlockTheme"));
-    await loadHighlightingTheme(currentThemeName);
+    if (!highlightingLoaded) {
+        const currentThemeName = String(options.get("codeBlockTheme"));
+        await loadHighlightingTheme(currentThemeName);
+    }
 
     // Load mime types.
     let mimeTypes: MimeType[];
@@ -94,7 +97,7 @@ export async function ensureMimeTypesForHighlighting(mimeTypeHint?: string) {
                 enabled: true,
                 mime: mimeTypeHint.replace("-", "/")
             }
-        ]
+        ];
     } else {
         mimeTypes = mime_types.getMimeTypes();
     }
@@ -124,9 +127,9 @@ export function isSyntaxHighlightEnabled() {
     if (!isShare) {
         const theme = options.get("codeBlockTheme");
         return !!theme && theme !== "none";
-    } else {
-        return true;
     }
+    return true;
+
 }
 
 /**

apps/client/src/services/toast.ts

@@ -1,6 +1,9 @@
 import { signal } from "@preact/signals";
 
-import utils from "./utils.js";
+import appContext from "../components/app_context.js";
+import froca from "./froca.js";
+import { t } from "./i18n.js";
+import utils, { randomString } from "./utils.js";
 
 export interface ToastOptions {
     id?: string;
@@ -61,11 +64,29 @@ function showErrorTitleAndMessage(title: string, message: string, timeout = 1000
     });
 }
 
+export async function showErrorForScriptNote(noteId: string, message: string) {
+    const note = await froca.getNote(noteId, true);
+
+    showPersistent({
+        id: `custom-widget-failure-${noteId}`,
+        title: t("toast.scripting-error", { title: note?.title ?? "" }),
+        icon: note?.getIcon() ?? "bx bx-error-circle",
+        message,
+        timeout: 15_000,
+        buttons: [
+            {
+                text: t("toast.open-script-note"),
+                onClick: () => appContext.tabManager.openInNewTab(noteId, null, true)
+            }
+        ]
+    });
+}
+
 //#region Toast store
 export const toasts = signal<ToastOptionsWithRequiredId[]>([]);
 
 function addToast(opts: ToastOptions) {
-    const id = opts.id ?? crypto.randomUUID();
+    const id = opts.id ?? randomString();
     const toast = { ...opts, id };
     toasts.value = [ ...toasts.value, toast ];
     return id;
@@ -74,7 +95,7 @@ function addToast(opts: ToastOptions) {
 function updateToast(id: string, partial: Partial<ToastOptions>) {
     toasts.value = toasts.value.map(toast => {
         if (toast.id === id) {
-            return { ...toast, ...partial }
+            return { ...toast, ...partial };
         }
         return toast;
     });

apps/client/src/services/utils.ts

@@ -1,8 +1,9 @@
 import { dayjs } from "@triliumnext/commons";
-import type { ViewScope } from "./link.js";
-import FNote from "../entities/fnote";
 import { snapdom } from "@zumer/snapdom";
 
+import FNote from "../entities/fnote";
+import type { ViewMode, ViewScope } from "./link.js";
+
 const SVG_MIME = "image/svg+xml";
 
 export const isShare = !window.glob;
@@ -113,9 +114,8 @@ function formatDateISO(date: Date) {
 export function formatDateTime(date: Date, userSuppliedFormat?: string): string {
     if (userSuppliedFormat?.trim()) {
         return dayjs(date).format(userSuppliedFormat);
-    } else {
-        return `${formatDate(date)} ${formatTime(date)}`;
     }
+    return `${formatDate(date)} ${formatTime(date)}`;
 }
 
 function localNowDateTime() {
@@ -187,13 +187,15 @@ export function formatSize(size: number | null | undefined) {
         return "";
     }
 
-    size = Math.max(Math.round(size / 1024), 1);
-
-    if (size < 1024) {
-        return `${size} KiB`;
-    } else {
-        return `${Math.round(size / 102.4) / 10} MiB`;
+    if (size === 0) {
+        return "0 B";
     }
+
+    const k = 1024;
+    const sizes = ["B", "KiB", "MiB", "GiB"];
+    const i = Math.floor(Math.log(size) / Math.log(k));
+
+    return `${Math.round((size / Math.pow(k, i)) * 100) / 100} ${sizes[i]}`;
 }
 
 function toObject<T, R>(array: T[], fn: (arg0: T) => [key: string, value: R]) {
@@ -208,7 +210,7 @@ function toObject<T, R>(array: T[], fn: (arg0: T) => [key: string, value: R]) {
     return obj;
 }
 
-export function randomString(len: number) {
+export function randomString(len: number = 16) {
     let text = "";
     const possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 
@@ -297,18 +299,18 @@ function formatHtml(html: string) {
     let indent = "\n";
     const tab = "\t";
     let i = 0;
-    let pre: { indent: string; tag: string }[] = [];
+    const pre: { indent: string; tag: string }[] = [];
 
     html = html
-        .replace(new RegExp("<pre>([\\s\\S]+?)?</pre>"), function (x) {
+        .replace(new RegExp("<pre>([\\s\\S]+?)?</pre>"), (x) => {
             pre.push({ indent: "", tag: x });
-            return "<--TEMPPRE" + i++ + "/-->";
+            return `<--TEMPPRE${i++}/-->`;
         })
-        .replace(new RegExp("<[^<>]+>[^<]?", "g"), function (x) {
+        .replace(new RegExp("<[^<>]+>[^<]?", "g"), (x) => {
             let ret;
             const tagRegEx = /<\/?([^\s/>]+)/.exec(x);
-            let tag = tagRegEx ? tagRegEx[1] : "";
-            let p = new RegExp("<--TEMPPRE(\\d+)/-->").exec(x);
+            const tag = tagRegEx ? tagRegEx[1] : "";
+            const p = new RegExp("<--TEMPPRE(\\d+)/-->").exec(x);
 
             if (p) {
                 const pInd = parseInt(p[1]);
@@ -318,24 +320,22 @@ function formatHtml(html: string) {
             if (["area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "menuitem", "meta", "param", "source", "track", "wbr"].indexOf(tag) >= 0) {
                 // self closing tag
                 ret = indent + x;
+            } else if (x.indexOf("</") < 0) {
+                //open tag
+                if (x.charAt(x.length - 1) !== ">") ret = indent + x.substr(0, x.length - 1) + indent + tab + x.substr(x.length - 1, x.length);
+                else ret = indent + x;
+                !p && (indent += tab);
             } else {
-                if (x.indexOf("</") < 0) {
-                    //open tag
-                    if (x.charAt(x.length - 1) !== ">") ret = indent + x.substr(0, x.length - 1) + indent + tab + x.substr(x.length - 1, x.length);
-                    else ret = indent + x;
-                    !p && (indent += tab);
-                } else {
-                    //close tag
-                    indent = indent.substr(0, indent.length - 1);
-                    if (x.charAt(x.length - 1) !== ">") ret = indent + x.substr(0, x.length - 1) + indent + x.substr(x.length - 1, x.length);
-                    else ret = indent + x;
-                }
+                //close tag
+                indent = indent.substr(0, indent.length - 1);
+                if (x.charAt(x.length - 1) !== ">") ret = indent + x.substr(0, x.length - 1) + indent + x.substr(x.length - 1, x.length);
+                else ret = indent + x;
             }
             return ret;
         });
 
     for (i = pre.length; i--;) {
-        html = html.replace("<--TEMPPRE" + i + "/-->", pre[i].tag.replace("<pre>", "<pre>\n").replace("</pre>", pre[i].indent + "</pre>"));
+        html = html.replace(`<--TEMPPRE${i}/-->`, pre[i].tag.replace("<pre>", "<pre>\n").replace("</pre>", `${pre[i].indent}</pre>`));
     }
 
     return html.charAt(0) === "\n" ? html.substr(1, html.length - 1) : html;
@@ -364,11 +364,11 @@ type dynamicRequireMappings = {
 export function dynamicRequire<T extends keyof dynamicRequireMappings>(moduleName: T): Awaited<dynamicRequireMappings[T]>{
     if (typeof __non_webpack_require__ !== "undefined") {
         return __non_webpack_require__(moduleName);
-    } else {
-        // explicitly pass as string and not as expression to suppress webpack warning
-        // 'Critical dependency: the request of a dependency is an expression'
-        return require(`${moduleName}`);
     }
+    // explicitly pass as string and not as expression to suppress webpack warning
+    // 'Critical dependency: the request of a dependency is an expression'
+    return require(`${moduleName}`);
+
 }
 
 function timeLimit<T>(promise: Promise<T>, limitMs: number, errorMessage?: string) {
@@ -439,7 +439,20 @@ async function openInAppHelp($button: JQuery<HTMLElement>) {
  * @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) {
+export function openInAppHelpFromUrl(inAppHelpPage: string) {
+    return openInReusableSplit(`_help_${inAppHelpPage}`, "contextual-help");
+}
+
+/**
+ * Similar to opening a new note in a split, but re-uses an existing split if there is already one open with the same view mode.
+ *
+ * @param targetNoteId the note ID to open in the split.
+ * @param targetViewMode the view mode of the split to open the note in.
+ * @param openOpts additional options for opening the note.
+ */
+export async function openInReusableSplit(targetNoteId: string, targetViewMode: ViewMode, openOpts: {
+    hoistedNoteId?: string;
+} = {}) {
     // Dynamic import to avoid import issues in tests.
     const appContext = (await import("../components/app_context.js")).default;
     const activeContext = appContext.tabManager.getActiveContext();
@@ -447,23 +460,20 @@ export async function openInAppHelpFromUrl(inAppHelpPage: string) {
         return;
     }
     const subContexts = activeContext.getSubContexts();
-    const targetNote = `_help_${inAppHelpPage}`;
-    const helpSubcontext = subContexts.find((s) => s.viewScope?.viewMode === "contextual-help");
-    const viewScope: ViewScope = {
-        viewMode: "contextual-help",
-    };
-    if (!helpSubcontext) {
-        // The help is not already open, open a new split with it.
+    const existingSubcontext = subContexts.find((s) => s.viewScope?.viewMode === targetViewMode);
+    const viewScope: ViewScope = { viewMode: targetViewMode };
+    if (!existingSubcontext) {
+        // The target split is not already open, open a new split with it.
         const { ntxId } = subContexts[subContexts.length - 1];
         appContext.triggerCommand("openNewNoteSplit", {
             ntxId,
-            notePath: targetNote,
-            hoistedNoteId: "_help",
+            notePath: targetNoteId,
+            hoistedNoteId: openOpts.hoistedNoteId,
             viewScope
-        })
+        });
     } else {
-        // There is already a help window open, make sure it opens on the right note.
-        helpSubcontext.setNote(targetNote, { viewScope });
+        // There is already a target split open, make sure it opens on the right note.
+        existingSubcontext.setNote(targetNoteId, { viewScope });
     }
 }
 
@@ -499,8 +509,8 @@ export function escapeRegExp(str: string) {
 function areObjectsEqual(...args: unknown[]) {
     let i;
     let l;
-    let leftChain: Object[];
-    let rightChain: Object[];
+    let leftChain: object[];
+    let rightChain: object[];
 
     function compare2Objects(x: unknown, y: unknown) {
         let p;
@@ -685,9 +695,9 @@ async function downloadAsSvg(nameWithoutExtension: string, svgSource: string | S
 
     try {
         const result = await snapdom(element, {
-                backgroundColor: "transparent",
-                scale: 2
-            });
+            backgroundColor: "transparent",
+            scale: 2
+        });
         triggerDownload(`${nameWithoutExtension}.svg`, result.url);
     } finally {
         cleanup();
@@ -723,9 +733,9 @@ async function downloadAsPng(nameWithoutExtension: string, svgSource: string | S
 
     try {
         const result = await snapdom(element, {
-                backgroundColor: "transparent",
-                scale: 2
-            });
+            backgroundColor: "transparent",
+            scale: 2
+        });
         const pngImg = await result.toPng();
         await triggerDownload(`${nameWithoutExtension}.png`, pngImg.src);
     } finally {
@@ -753,11 +763,11 @@ export function getSizeFromSvg(svgContent: string) {
         return {
             width: parseFloat(width),
             height: parseFloat(height)
-        }
-    } else {
-        console.warn("SVG export error", svgDocument.documentElement);
-        return null;
+        };
     }
+    console.warn("SVG export error", svgDocument.documentElement);
+    return null;
+
 }
 
 /**
@@ -886,9 +896,9 @@ export function mapToKeyValueArray<K extends string | number | symbol, V>(map: R
 export function getErrorMessage(e: unknown) {
     if (e && typeof e === "object" && "message" in e && typeof e.message === "string") {
         return e.message;
-    } else {
-        return "Unknown error";
     }
+    return "Unknown error";
+
 }
 
 /**

apps/client/src/stylesheets/boxicons-compat.css

@@ -0,0 +1,498 @@
+.bx-ul
+{
+    margin-left: 2em;
+    padding-left: 0;
+
+    list-style: none;
+}
+.bx-ul > li
+{
+    position: relative;
+}
+.bx-ul .bx
+{
+    font-size: inherit;
+    line-height: inherit;
+
+    position: absolute;
+    left: -2em;
+
+    width: 2em;
+
+    text-align: center;
+}
+@-webkit-keyframes spin
+{
+    0%
+    {
+        -webkit-transform: rotate(0);
+                transform: rotate(0);
+    }
+    100%
+    {
+        -webkit-transform: rotate(359deg);
+                transform: rotate(359deg);
+    }
+}
+@keyframes spin
+{
+    0%
+    {
+        -webkit-transform: rotate(0);
+                transform: rotate(0);
+    }
+    100%
+    {
+        -webkit-transform: rotate(359deg);
+                transform: rotate(359deg);
+    }
+}
+@-webkit-keyframes burst
+{
+    0%
+    {
+        -webkit-transform: scale(1);
+                transform: scale(1);
+
+        opacity: 1;
+    }
+    90%
+    {
+        -webkit-transform: scale(1.5);
+                transform: scale(1.5);
+
+        opacity: 0;
+    }
+}
+@keyframes burst
+{
+    0%
+    {
+        -webkit-transform: scale(1);
+                transform: scale(1);
+
+        opacity: 1;
+    }
+    90%
+    {
+        -webkit-transform: scale(1.5);
+                transform: scale(1.5);
+
+        opacity: 0;
+    }
+}
+@-webkit-keyframes flashing
+{
+    0%
+    {
+        opacity: 1;
+    }
+    45%
+    {
+        opacity: 0;
+    }
+    90%
+    {
+        opacity: 1;
+    }
+}
+@keyframes flashing
+{
+    0%
+    {
+        opacity: 1;
+    }
+    45%
+    {
+        opacity: 0;
+    }
+    90%
+    {
+        opacity: 1;
+    }
+}
+@-webkit-keyframes fade-left
+{
+    0%
+    {
+        -webkit-transform: translateX(0);
+                transform: translateX(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateX(-20px);
+                transform: translateX(-20px);
+
+        opacity: 0;
+    }
+}
+@keyframes fade-left
+{
+    0%
+    {
+        -webkit-transform: translateX(0);
+                transform: translateX(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateX(-20px);
+                transform: translateX(-20px);
+
+        opacity: 0;
+    }
+}
+@-webkit-keyframes fade-right
+{
+    0%
+    {
+        -webkit-transform: translateX(0);
+                transform: translateX(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateX(20px);
+                transform: translateX(20px);
+
+        opacity: 0;
+    }
+}
+@keyframes fade-right
+{
+    0%
+    {
+        -webkit-transform: translateX(0);
+                transform: translateX(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateX(20px);
+                transform: translateX(20px);
+
+        opacity: 0;
+    }
+}
+@-webkit-keyframes fade-up
+{
+    0%
+    {
+        -webkit-transform: translateY(0);
+                transform: translateY(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateY(-20px);
+                transform: translateY(-20px);
+
+        opacity: 0;
+    }
+}
+@keyframes fade-up
+{
+    0%
+    {
+        -webkit-transform: translateY(0);
+                transform: translateY(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateY(-20px);
+                transform: translateY(-20px);
+
+        opacity: 0;
+    }
+}
+@-webkit-keyframes fade-down
+{
+    0%
+    {
+        -webkit-transform: translateY(0);
+                transform: translateY(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateY(20px);
+                transform: translateY(20px);
+
+        opacity: 0;
+    }
+}
+@keyframes fade-down
+{
+    0%
+    {
+        -webkit-transform: translateY(0);
+                transform: translateY(0);
+
+        opacity: 1;
+    }
+    75%
+    {
+        -webkit-transform: translateY(20px);
+                transform: translateY(20px);
+
+        opacity: 0;
+    }
+}
+@-webkit-keyframes tada
+{
+    from
+    {
+        -webkit-transform: scale3d(1, 1, 1);
+                transform: scale3d(1, 1, 1);
+    }
+
+    10%,
+    20%
+    {
+        -webkit-transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
+                transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
+    }
+
+    30%,
+    50%,
+    70%,
+    90%
+    {
+        -webkit-transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
+                transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
+    }
+
+    40%,
+    60%,
+    80%
+    {
+        -webkit-transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, -10deg);
+                transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, -10deg);
+    }
+
+    to
+    {
+        -webkit-transform: scale3d(1, 1, 1);
+                transform: scale3d(1, 1, 1);
+    }
+}
+
+@keyframes tada
+{
+    from
+    {
+        -webkit-transform: scale3d(1, 1, 1);
+                transform: scale3d(1, 1, 1);
+    }
+
+    10%,
+    20%
+    {
+        -webkit-transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
+                transform: scale3d(.95, .95, .95) rotate3d(0, 0, 1, -10deg);
+    }
+
+    30%,
+    50%,
+    70%,
+    90%
+    {
+        -webkit-transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
+                transform: scale3d(1, 1, 1) rotate3d(0, 0, 1, 10deg);
+    }
+
+    40%,
+    60%,
+    80%
+    {
+        -webkit-transform: rotate3d(0, 0, 1, -10deg);
+                transform: rotate3d(0, 0, 1, -10deg);
+    }
+
+    to
+    {
+        -webkit-transform: scale3d(1, 1, 1);
+                transform: scale3d(1, 1, 1);
+    }
+}
+.bx-spin
+{
+    -webkit-animation: spin 2s linear infinite;
+            animation: spin 2s linear infinite;
+}
+.bx-spin-hover:hover
+{
+    -webkit-animation: spin 2s linear infinite;
+            animation: spin 2s linear infinite;
+}
+
+.bx-tada
+{
+    -webkit-animation: tada 1.5s ease infinite;
+            animation: tada 1.5s ease infinite;
+}
+.bx-tada-hover:hover
+{
+    -webkit-animation: tada 1.5s ease infinite;
+            animation: tada 1.5s ease infinite;
+}
+
+.bx-flashing
+{
+    -webkit-animation: flashing 1.5s infinite linear;
+            animation: flashing 1.5s infinite linear;
+}
+.bx-flashing-hover:hover
+{
+    -webkit-animation: flashing 1.5s infinite linear;
+            animation: flashing 1.5s infinite linear;
+}
+
+.bx-burst
+{
+    -webkit-animation: burst 1.5s infinite linear;
+            animation: burst 1.5s infinite linear;
+}
+.bx-burst-hover:hover
+{
+    -webkit-animation: burst 1.5s infinite linear;
+            animation: burst 1.5s infinite linear;
+}
+.bx-fade-up
+{
+    -webkit-animation: fade-up 1.5s infinite linear;
+            animation: fade-up 1.5s infinite linear;
+}
+.bx-fade-up-hover:hover
+{
+    -webkit-animation: fade-up 1.5s infinite linear;
+            animation: fade-up 1.5s infinite linear;
+}
+.bx-fade-down
+{
+    -webkit-animation: fade-down 1.5s infinite linear;
+            animation: fade-down 1.5s infinite linear;
+}
+.bx-fade-down-hover:hover
+{
+    -webkit-animation: fade-down 1.5s infinite linear;
+            animation: fade-down 1.5s infinite linear;
+}
+.bx-fade-left
+{
+    -webkit-animation: fade-left 1.5s infinite linear;
+            animation: fade-left 1.5s infinite linear;
+}
+.bx-fade-left-hover:hover
+{
+    -webkit-animation: fade-left 1.5s infinite linear;
+            animation: fade-left 1.5s infinite linear;
+}
+.bx-fade-right
+{
+    -webkit-animation: fade-right 1.5s infinite linear;
+            animation: fade-right 1.5s infinite linear;
+}
+.bx-fade-right-hover:hover
+{
+    -webkit-animation: fade-right 1.5s infinite linear;
+            animation: fade-right 1.5s infinite linear;
+}
+.bx-xs
+{
+    font-size: 1rem!important;
+}
+.bx-sm
+{
+    font-size: 1.55rem!important;
+}
+.bx-md
+{
+    font-size: 2.25rem!important;
+}
+.bx-lg
+{
+    font-size: 3.0rem!important;
+}
+.bx-fw
+{
+    font-size: 1.2857142857em;
+    line-height: .8em;
+
+    width: 1.2857142857em;
+    height: .8em;
+    margin-top: -.2em!important;
+
+    vertical-align: middle;
+}
+.bx-pull-left
+{
+    float: left;
+
+    margin-right: .3em!important;
+}
+.bx-pull-right
+{
+    float: right;
+
+    margin-left: .3em!important;
+}
+.bx-rotate-90
+{
+    transform: rotate(90deg);
+
+    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=1)';
+}
+.bx-rotate-180
+{
+    transform: rotate(180deg);
+
+    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=2)';
+}
+.bx-rotate-270
+{
+    transform: rotate(270deg);
+
+    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=3)';
+}
+.bx-flip-horizontal
+{
+    transform: scaleX(-1);
+
+    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)';
+}
+.bx-flip-vertical
+{
+    transform: scaleY(-1);
+
+    -ms-filter: 'progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)';
+}
+.bx-border
+{
+    padding: .25em;
+
+    border: .07em solid rgba(0,0,0,.1);
+    border-radius: .25em;
+}
+.bx-border-circle
+{
+    padding: .25em;
+
+    border: .07em solid rgba(0,0,0,.1);
+    border-radius: 50%;
+}
+
+/** Custom icon **/
+.bx-empty {
+    width: 1em;
+    display: inline-block;
+}

apps/client/src/stylesheets/style.css

@@ -1,3 +1,5 @@
+@import "./boxicons-compat.css";
+
 @font-face {
     font-family: Montserrat;
     src: url(../fonts/Montserrat-Light.ttf);
@@ -26,7 +28,7 @@
     --bs-body-color: var(--main-text-color) !important;
     --bs-body-bg: var(--main-background-color) !important;
     --ck-mention-list-max-height: 500px;
-    --tn-modal-max-height: 90vh;
+    --tn-modal-max-height: 90svh;
 
     --tree-item-light-theme-max-color-lightness: 50;
     --tree-item-dark-theme-min-color-lightness: 75;
@@ -109,6 +111,7 @@ body.mobile #root-widget.virtual-keyboard-opened #mobile-bottom-bar {
 }
 
 #mobile-bottom-bar {
+    border-top: 1px solid var(--main-border-color);
     padding-bottom: var(--mobile-bottom-offset);
 }
 
@@ -150,6 +153,11 @@ textarea,
     background: var(--input-background-color);
 }
 
+.form-control:disabled {
+    background-color: var(--input-background-color);
+    opacity: 0.6;
+}
+
 .form-control:focus {
     color: var(--input-text-color);
     background: var(--input-background-color);
@@ -222,10 +230,6 @@ body.mobile .modal .modal-dialog {
     width: 100%;
 }
 
-body.mobile .modal .modal-content {
-    border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
-}
-
 .component {
     contain: size;
 }
@@ -411,6 +415,7 @@ body.desktop .tabulator-popup-container,
 
 .dropdown-menu.static {
     box-shadow: unset;
+    backdrop-filter: unset !important;
 }
 
 .dropend .dropdown-toggle::after {
@@ -423,20 +428,19 @@ body.desktop .tabulator-popup-container,
     pointer-events: none;
 }
 
-.dropdown-menu .disabled .disabled-tooltip {
+.dropdown-menu .disabled .contextual-help {
     pointer-events: all;
     margin-inline-start: 8px;
     font-size: 0.75rem;
-    color: var(--disabled-tooltip-icon-color);
+    color: var(--contextual-help-icon-color);
     cursor: help;
     opacity: 0.75;
 }
 
-.dropdown-menu .disabled .disabled-tooltip:hover {
+.dropdown-menu .disabled .contextual-help:hover {
     opacity: 1;
 }
 
-.dropdown-menu a:hover:not(.disabled),
 .dropdown-item:hover:not(.disabled, .dropdown-container-item),
 .tabulator-menu-item:hover,
 :root .excalidraw .context-menu .context-menu-item:hover {
@@ -457,13 +461,23 @@ body.desktop .tabulator-popup-container,
     visibility: hidden;
 }
 
-body.desktop .dropdown-menu:not(#context-menu-container) .dropdown-item,
+.dropdown-menu:not(#context-menu-container) .dropdown-item,
+body.desktop .dropdown-menu .dropdown-toggle,
 body #context-menu-container .dropdown-item > span,
 body.mobile .dropdown .dropdown-submenu > span {
     display: flex;
     align-items: center;
 }
 
+
+body.mobile .dropdown .dropdown-submenu {
+    flex-wrap: wrap;
+
+    & > span {
+        flex-grow: 1;
+    }
+}
+
 .dropdown-item span.keyboard-shortcut,
 .dropdown-item *:not(.keyboard-shortcut) > kbd {
     flex-grow: 1;
@@ -521,9 +535,7 @@ body.mobile .dropdown .dropdown-submenu > span {
 .cm-editor {
     height: 100%;
     outline: none !important;
-    border-radius: 6px;
     overflow: hidden;
-    margin: 4px;
     font-size: var(--monospace-font-size);
 }
 
@@ -629,6 +641,11 @@ pre:not(.hljs) {
     padding: var(--padding-size);
 }
 
+pre:has(> .cm-editor) {
+    padding: 0;
+    margin: 0;
+}
+
 pre > button.copy-button {
     position: absolute;
     top: var(--copy-button-margin-size);
@@ -720,6 +737,10 @@ table.promoted-attributes-in-tooltip th {
     z-index: 32767 !important;
 }
 
+.pre-wrap-text {
+    white-space: pre-wrap;
+}
+
 .bs-tooltip-bottom .tooltip-arrow::before {
     border-bottom-color: var(--main-border-color) !important;
 }
@@ -926,6 +947,7 @@ table.promoted-attributes-in-tooltip th {
     color: var(--muted-text-color);
     opacity: 0.6;
     line-height: 1;
+    word-wrap: break-word;
 }
 
 .aa-dropdown-menu .aa-suggestion p {
@@ -1121,11 +1143,6 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
     border-color: var(--main-border-color) !important;
 }
 
-.bx-empty {
-    width: 1em;
-    display: inline-block;
-}
-
 .modal-header {
     padding: 0.5rem 1rem 0.5rem 1rem !important; /* make modal header padding slightly smaller */
 }
@@ -1251,7 +1268,7 @@ a.external:not(.no-arrow):after, a[href^="http://"]:not(.no-arrow):after, a[href
     inset-inline-start: 0;
     inset-inline-end: 0;
     bottom: 0;
-    z-index: 1000;
+    z-index: 2500;
     background: rgba(0, 0, 0, 0.1);
 }
 
@@ -1315,14 +1332,20 @@ body.desktop li.dropdown-submenu:hover > ul.dropdown-menu {
     top: 0;
     inset-inline-start: calc(100% - 2px); /* -2px, otherwise there's a small gap between menu and submenu where the hover can disappear */
     margin-top: -10px;
-    min-width: 15rem;
     /* to make submenu scrollable https://github.com/zadam/trilium/issues/3136 */
     max-height: 600px;
     overflow: auto;
 }
 
+body.desktop .dropdown-submenu > .dropdown-menu {
+    min-width: max-content;
+    max-width: 300px;
+}
+
+.dropdown-submenu.dropstart > .dropdown-menu,
 body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
-    inset-inline-start: calc(-100% + 10px);
+    inset-inline-start: auto;
+    inset-inline-end: calc(100% - 2px);
 }
 
 .right-dropdown-widget {
@@ -1521,7 +1544,8 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
 
 @media (max-width: 991px) {
     body.mobile #launcher-pane .dropdown.global-menu > .dropdown-menu.show,
-    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
+    body.mobile #launcher-container .dropdown > .dropdown-menu.show,
+    body.mobile .dropdown-menu.mobile-bottom-menu.show {
         --dropdown-bottom: calc(var(--mobile-bottom-offset) + var(--launcher-pane-size));
         position: fixed !important;
         bottom: var(--dropdown-bottom) !important;
@@ -1533,6 +1557,16 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
         max-height: calc(var(--tn-modal-max-height) - var(--dropdown-bottom));
     }
 
+    body.mobile #launcher-container .dropdown > .dropdown-menu.show {
+        border-bottom-left-radius: 0;
+        border-bottom-right-radius: 0;
+    }
+
+    body.mobile .dropdown-menu.mobile-bottom-menu.show {
+        --dropdown-bottom: 0px;
+        padding-bottom: calc(max(var(--menu-padding-size), env(safe-area-inset-bottom))) !important;
+    }
+
     #mobile-sidebar-container {
         position: fixed;
         top: 0;
@@ -1601,6 +1635,7 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
 
     body.mobile .modal-content {
         overflow-y: auto;
+        border-radius: var(--bs-modal-border-radius) var(--bs-modal-border-radius) 0 0;
     }
 
     body.mobile .modal-footer {
@@ -1656,39 +1691,16 @@ body:not(.mobile) #launcher-pane.horizontal .dropdown-submenu > .dropdown-menu {
     #detail-container {
         background: var(--main-background-color);
     }
-}
 
-@media (max-width: 991px) {
-    body.mobile.force-fixed-tree #mobile-sidebar-wrapper {
-        padding-top: 0;
-        position: static;
-        height: 40vh;
-        width: 100vw;
-        transform: none !important;
-        background-color: var(--left-pane-background-color) !important;
-        border-bottom: 0.5px solid var(--main-border-color);
-    }
+    body.mobile {
+        .modal-dialog {
+            margin: var(--bs-modal-margin);
+            max-width: 80%;
+        }
 
-    body.mobile.force-fixed-tree #mobile-sidebar-container {
-        display: none !important;
-    }
-
-    body.mobile.force-fixed-tree #mobile-sidebar-wrapper .quick-search {
-        display: none;
-    }
-
-    body.mobile.force-fixed-tree .component > button.bx-sidebar {
-        visibility: hidden;
-        padding: 0;
-        width: 6px;
-    }
-
-    body.mobile.force-fixed-tree #mobile-rest-container {
-        flex-direction: column !important;
-    }
-
-    body.mobile.force-fixed-tree #detail-container {
-        flex-grow: 1;
+        .modal-content {
+            height: 100%;
+        }
     }
 }
 
@@ -1783,7 +1795,7 @@ button.close:hover {
     display: none;
 }
 
-.reference-link .bx {
+.reference-link .tn-icon {
     position: relative;
     top: 1px;
     margin-inline-end: 3px;
@@ -1935,6 +1947,10 @@ body.electron.platform-darwin:not(.native-titlebar) .tab-row-container {
     padding-inline-start: 1em;
 }
 
+.tab-row-widget {
+    contain: inline-size;
+}
+
 #tab-row-left-spacer {
     width: env(titlebar-area-x);
     -webkit-app-region: drag;
@@ -1944,7 +1960,7 @@ body.electron.platform-darwin:not(.native-titlebar):not(.full-screen) #tab-row-l
     width: 80px;
 }
 
-.tab-row-widget {
+body.electron:not(.platform-darwin) .tab-row-container {
     padding-inline-end: calc(100vw - env(titlebar-area-width, 100vw));
 }
 
@@ -1995,8 +2011,10 @@ body.zen .shared-info-widget,
 body.zen .ribbon-container:not(:has(.classic-toolbar-widget)),
 body.zen .ribbon-container:has(.classic-toolbar-widget) .ribbon-top-row,
 body.zen .ribbon-container .ribbon-body:not(:has(.classic-toolbar-widget)),
-body.zen .note-icon-widget,
 body.zen .title-row .icon-action,
+body.zen .note-badges > *:not(.read-only-badge),
+body.zen .ribbon-button-container,
+body.zen .inline-title,
 body.zen .promoted-attributes-widget,
 body.zen .floating-buttons-children > *:not(.bx-edit-alt),
 body.zen .action-button,
@@ -2019,11 +2037,11 @@ body.zen #launcher-pane {
 }
 
 body.zen .title-row {
-    display: block !important;
     height: unset !important;
     -webkit-app-region: drag;
     padding-inline-start: env(titlebar-area-x);
     padding-inline-end: calc(100vw - env(titlebar-area-width, 100vw) + 2.5em);
+    border-bottom: none !important;
 }
 
 body.zen .floating-buttons {
@@ -2043,8 +2061,6 @@ body.zen .floating-buttons-children .button-widget {
 body.zen .note-title-widget,
 body.zen .note-title-widget input {
     font-size: 1rem !important;
-    background: transparent !important;
-    pointer-events: none;
 }
 
 body.zen #detail-container {
@@ -2104,58 +2120,107 @@ body.zen:not(.backdrop-effects-disabled) .note-split.type-text .scrolling-contai
 
 /* Fixed formatting toolbar */
 
-body.zen .note-split .ribbon-container {
-    position: fixed;
-    left: 0;
-    bottom: 20px;
-    width: 100%;
-    z-index: 1000;
-    opacity: 0; /* Hidden unless the current note split is focused */
-    pointer-events: none;
-    transition: opacity 100ms linear;
-}
-
-body.zen .note-split:focus-within .ribbon-container {
-    opacity: 1; /* Show when the note split is focused */
-}
-
-body.zen .note-split .ribbon-container .ribbon-body {
-    border: 0;
-}
-
-body.zen .note-split .ribbon-container .classic-toolbar-widget {
-    margin: auto;
-    width: fit-content;
-    box-shadow: 0px 10px 20px rgba(0, 0, 0, .1);
-    border-radius: 8px;
-    border: 1px solid var(--main-border-color);
-    padding: 4px;
-    background: var(--menu-background-color);
-}
-
-body.zen .note-split .ribbon-container .classic-toolbar-widget:not(:has(> .ck-toolbar)) {
-    /* Hide the toolbar wrapper if the toolbar is missing */
-    display: none;
-}
-
-body.zen .note-split:focus-within .ribbon-container .classic-toolbar-widget {
-    pointer-events: all;
-}
-
-@media (max-width: 1300px) {
-    body.zen .note-split .ribbon-container .classic-toolbar-widget {
-        /* Set the toolbar to full with */
+body.zen:not(.experimental-feature-new-layout) {
+    .note-split .ribbon-container {
+        position: fixed;
+        left: 0;
+        bottom: 20px;
         width: 100%;
+        z-index: 1000;
+        opacity: 0; /* Hidden unless the current note split is focused */
+        pointer-events: none;
+        transition: opacity 100ms linear;
     }
 
-    body.zen .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_se,
-    body.zen .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw,
-    body.zen .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_smw,
-    body.zen .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sme,
-    body.zen .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_s {
-        /* Force toolbar items overflow dropdowns open upwards */
-        top: auto;
-        bottom: 100%;
+    .note-split:focus-within .ribbon-container {
+        opacity: 1; /* Show when the note split is focused */
+    }
+
+    .note-split .ribbon-container .ribbon-body {
+        border: 0;
+    }
+
+    .note-split .ribbon-container .classic-toolbar-widget {
+        margin: auto;
+        width: fit-content;
+        box-shadow: 0px 10px 20px rgba(0, 0, 0, .1);
+        border-radius: 8px;
+        border: 1px solid var(--main-border-color);
+        padding: 4px;
+        background: var(--menu-background-color);
+    }
+
+    .note-split .ribbon-container .classic-toolbar-widget:not(:has(> .ck-toolbar)) {
+        /* Hide the toolbar wrapper if the toolbar is missing */
+        display: none;
+    }
+
+    .note-split:focus-within .ribbon-container .classic-toolbar-widget {
+        pointer-events: all;
+    }
+
+    @media (max-width: 1300px) {
+        .note-split .ribbon-container .classic-toolbar-widget {
+            /* Set the toolbar to full with */
+            width: 100%;
+        }
+
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_se,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_smw,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sme,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_s {
+            /* Force toolbar items overflow dropdowns open upwards */
+            top: auto;
+            bottom: 100%;
+        }
+    }
+}
+
+body.zen.experimental-feature-new-layout {
+    .status-bar {
+        display: none;
+    }
+
+    .classic-toolbar-widget {
+        position: fixed;
+        left: 50%;
+        bottom: 20px;
+        z-index: 1000;
+        opacity: 0; /* Hidden unless the current note split is focused */
+        pointer-events: none;
+        transition: opacity 100ms linear;
+        width: fit-content;
+        box-shadow: 0px 10px 20px rgba(0, 0, 0, .1);
+        border-radius: 8px;
+        border: 1px solid var(--main-border-color);
+        padding: 4px;
+        background: var(--menu-background-color) !important;
+        transform: translateX(-50%);
+        backdrop-filter: blur(6px);
+    }
+
+    #root-widget:has(.note-split.type-text:focus-within) .classic-toolbar-widget,
+    .classic-toolbar-widget:focus-within {
+        opacity: 1; /* Show when the note split is focused */
+        pointer-events: all;
+    }
+
+    @media (max-width: 1300px) {
+        .classic-toolbar-widget {
+            /* Set the toolbar to full with */
+            width: 100%;
+        }
+
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_se,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sw,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_smw,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_sme,
+        .classic-toolbar-widget .ck.ck-dropdown .ck-dropdown__panel.ck-dropdown__panel_s {
+            /* Force toolbar items overflow dropdowns open upwards */
+            top: auto;
+            bottom: 100%;
+        }
     }
 }
 
@@ -2349,7 +2414,7 @@ footer.webview-footer button {
     gap: 5px;
 }
 
-.right-pane-tab .tab-title .bx {
+.right-pane-tab .tab-title .tn-icon {
     font-size: 1.1em;
 }
 
@@ -2462,6 +2527,11 @@ footer.webview-footer button {
     inset-inline-start: 10px;
 }
 
+.content-floating-buttons.top-right {
+    top: 10px;
+    inset-inline-end: 10px;
+}
+
 .content-floating-buttons.bottom-left {
     bottom: 10px;
     inset-inline-start: 10px;
@@ -2472,18 +2542,11 @@ footer.webview-footer button {
     inset-inline-end: 10px;
 }
 
-.content-floating-buttons button.bx {
+.content-floating-buttons button.tn-icon {
     font-size: 130%;
     padding: 1px 10px 1px 10px;
 }
 
-/* Customized icons */
-
-.bx-tn-toc::before {
-    content: "\ec24";
-    transform: rotate(180deg);
-}
-
 /* CK Editor */
 
 /* Insert text snippet: limit the width of the listed items to avoid overly long names */
@@ -2553,14 +2616,14 @@ iframe.print-iframe {
             }
         }
 
-        #root-widget.virtual-keyboard-opened .note-split:not(:focus-within) {
+        #root-widget.virtual-keyboard-opened .note-split:not(.active) {
             max-height: 80px;
             opacity: 0.4;
         }
     }
 }
 
-body.desktop .title-row {
+.title-row {
     height: 50px;
     min-height: 50px;
     align-items: center;

apps/client/src/stylesheets/table.css

@@ -14,13 +14,13 @@
     --row-moving-background-color: var(--accented-background-color);
     --row-text-color: var(--main-text-color);
     --row-delimiter-color: var(--more-accented-background-color);
-    
+
     --cell-horiz-padding-size: 8px;
     --cell-vert-padding-size: 8px;
-    
+
     --cell-editable-hover-outline-color: var(--main-border-color);
     --cell-read-only-text-color: var(--muted-text-color);
-    
+
     --cell-editing-border-color: var(--main-border-color);
     --cell-editing-border-width: 2px;
     --cell-editing-background-color: var(--ck-color-selector-focused-cell-background);
@@ -40,10 +40,42 @@
     border-bottom: var(--col-header-bottom-border);
     background: var(--col-header-background-color);
     color: var(--col-header-text-color);
-}
+    font-weight: normal;
 
-.tabulator .tabulator-col-content {
-    padding: 8px 4px !important;
+    .tabulator-col.tabulator-range-highlight {
+        background: inherit;
+        color: inherit;
+        font-weight: bold;
+    }
+
+    .tabulator-col-content {
+        padding: 0 !important;
+
+        .tabulator-col-title-holder {
+            padding: 8px 4px;
+        }
+
+        &:has(.tabulator-header-filter) {
+            .tabulator-col-title-holder {
+                padding: 4px;
+                padding-bottom: 0;
+            }
+        }
+
+        .tabulator-header-filter {
+            background: var(--main-background-color);
+            padding: 2px 1px;
+
+            input {
+                background: var(--main-background-color);
+                color: var(--main-text-color);
+                border: 1px solid var(--button-border-color);
+                border-radius: 3px;
+                outline: none;
+                padding: 2px;
+            }
+        }
+    }
 }
 
 @media (hover: hover) and (pointer: fine) {
@@ -80,7 +112,6 @@
 
 .tabulator-tableholder {
     padding-top: 10px;
-    height: unset !important; /* Don't extend on the full height */
 }
 
 /* Rows */
@@ -99,6 +130,14 @@
     border-top: none;
     border-bottom: 1px solid var(--row-delimiter-color);
     color: var(--row-text-color);
+
+    &:last-of-type {
+        border-bottom: none;
+    }
+
+    &.tabulator-range-highlight > .tabulator-cell.tabulator-frozen {
+        font-weight: bold;
+    }
 }
 
 .tabulator-row.tabulator-row-odd {
@@ -120,11 +159,14 @@
     margin-inline-end: var(--cell-editing-border-width);
 }
 
-.tabulator-row .tabulator-cell.tabulator-frozen.tabulator-frozen-left,
 .tabulator-row .tabulator-cell {
     border-inline-end-color: transparent;
 }
 
+.tabulator-row .tabulator-cell.tabulator-frozen.tabulator-frozen-left {
+    border-inline-end-color: var(--main-border-color);
+}
+
 .tabulator-row .tabulator-cell:not(.tabulator-editable) {
     color: var(--cell-read-only-text-color);
 }
@@ -174,10 +216,6 @@
     margin: 0;
 }
 
-.tabulator .tabulator-footer {
-    color: var(--main-text-color);
-}
-
 /* Context menus */
 
 .tabulator-popup-container {
@@ -192,8 +230,27 @@
 }
 
 /* Footer */
-
 :root .tabulator .tabulator-footer {
-    border-top: unset;
+    background: transparent;
+    color: var(--main-text-color);
+    border-top: 1px solid var(--main-border-color);
     padding: 10px 0;
-}
+
+    .tabulator-page {
+        background: var(--button-background-color);
+        color: var(--button-text-color);
+        border: 1px solid var(--button-border-color);
+        border-radius: var(--button-border-radius);
+
+        &:hover {
+            border-color: var(--hover-item-border-color);
+            color: var(--button-text-color);
+        }
+    }
+
+    select {
+        background: var(--button-background-color);
+        color: var(--input-text-color);
+        border: 1px solid var(--button-border-color);
+    }
+}

apps/client/src/stylesheets/theme-dark.css

@@ -19,7 +19,7 @@
     --dropdown-border-color: #555;
     --dropdown-shadow-opacity: 0.4;
     --dropdown-item-icon-destructive-color: #de6e5b;
-    --disabled-tooltip-icon-color: #7fd2ef;
+    --contextual-help-icon-color: #7fd2ef;
 
     --accented-background-color: #555;
     --more-accented-background-color: #777;
@@ -114,4 +114,8 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 
 .use-note-color {
     --custom-color: var(--dark-theme-custom-color);
-}
+}
+
+span.fancytree-active {
+    color: var(--dark-theme-custom-color, var(--active-item-text-color));
+}

apps/client/src/stylesheets/theme-light.css

@@ -23,7 +23,7 @@ html {
     --dropdown-border-color: #ccc;
     --dropdown-shadow-opacity: 0.2;
     --dropdown-item-icon-destructive-color: #ec5138;
-    --disabled-tooltip-icon-color: #004382;
+    --contextual-help-icon-color: #004382;
 
     --accented-background-color: #f5f5f5;
     --more-accented-background-color: #ddd;
@@ -89,13 +89,17 @@ html {
     --custom-color: var(--light-theme-custom-color);
 }
 
-:root .reference-link,
-:root .reference-link:hover,
-.ck-content a.reference-link > span,
-.board-note {
+:root .reference-link.use-note-color,
+:root .reference-link.use-note-color:hover,
+.ck-content a.reference-link.use-note-color > span,
+.board-note.use-note-color {
     color: var(--light-theme-custom-color, inherit);
 }
 
 .use-note-color {
     --custom-color: var(--light-theme-custom-color);
-}
+}
+
+span.fancytree-active {
+    color: var(--light-theme-custom-color, var(--active-item-text-color));
+}

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

@@ -6,7 +6,7 @@
  */
 :root {
 
-    /* 
+    /*
      * ⚠️ NOTICE: This theme is currently in the beta stage of development.
      * The names and purposes of these CSS variables are subject to frequent changes.
      */
@@ -21,8 +21,8 @@
     --subtle-border-color: #313131;
     --dropdown-border-color: #404040;
     --dropdown-shadow-opacity: 0.6;
-    --dropdown-item-icon-destructive-color: #de6e5b;
-    --disabled-tooltip-icon-color: #7fd2ef;
+    --dropdown-item-icon-destructive-color: #d58477;
+    --contextual-help-icon-color: #7fd2ef;
 
     --accented-background-color: #555;
 
@@ -74,11 +74,13 @@
     --select-arrow-svg: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='transparent' stroke='white' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/></svg>");
     --select-group-heading-text-color: gray;
 
-    --link-hover-background: #ffffff26;
-    --link-hover-color: white;
+    --link-color: #95c3d9;
+    --link-hover-background: #75c2e324;
+    --link-hover-color: var(--link-color);
+    --link-selection-outline-color: #75c2e385;
 
     --hover-item-text-color: #efefef;
-    --hover-item-background-color: #ffffff24;
+    --hover-item-background-color: #ffffff16;
     --hover-item-border-color: transparent;
 
     --active-item-text-color: var(--left-pane-text-color);
@@ -132,6 +134,7 @@
     --left-pane-collapsed-border-color: #0009;
     --left-pane-background-color: #1f1f1f;
     --left-pane-text-color: #aaaaaa;
+    --left-pane-icon-color: #c5c5c5;
     --left-pane-item-hover-background: #ffffff0d;
     --left-pane-item-selected-background: #ffffff25;
     --left-pane-item-selected-color: #dfdfdf;
@@ -170,6 +173,9 @@
     --protected-session-active-icon-color: #8edd8e;
     --sync-status-error-pulse-color: #f47871;
 
+    --classic-toolbar-vert-layout-background-color: #ffffff0d;
+    --classic-toolbar-horiz-layout-background-color: var(--main-background-color);
+
     --center-pane-vert-layout-background-color-bgfx: #0c0c0c69;
     --center-pane-horiz-layout-background-color-bgfx: #1e1e1ec7;
 
@@ -182,7 +188,7 @@
 
     --tab-close-button-hover-background: #a45353;
     --tab-close-button-hover-color: white;
-    
+
     --active-tab-background-color: #ffffff1c;
     --active-tab-hover-background-color: var(--active-tab-background-color);
     --active-tab-icon-color: #a9a9a9;
@@ -199,9 +205,20 @@
     --badge-background-color: #ffffff1a;
     --badge-text-color: var(--muted-text-color);
 
+    --badge-temporaraily-editable-background-color: #297331;
+    --badge-read-only-background-color: #af4340;
+    --badge-share-background-color: #4d4d4d;
+    --badge-clipped-note-background-color: #295773;
+    --badge-execute-background-color: #604180;
+    --badge-active-content-background-color: rgb(12, 68, 70);
+
+    --note-icon-background-color: #444444;
+    --note-icon-color: #d4d4d4;
+    --note-icon-hover-background-color: #555555;
+
     --promoted-attribute-card-background-color: #ffffff21;
     --promoted-attribute-card-shadow: none;
-    
+
     --floating-button-shadow-color: #00000080;
     --floating-button-background-color: #494949d2;
     --floating-button-color: var(--button-text-color);
@@ -220,14 +237,17 @@
     --right-pane-item-hover-background: #ffffff26;
     --right-pane-item-hover-color: white;
 
+    --bottom-panel-background-color: #11111180;
+    --bottom-panel-title-bar-background-color: #3F3F3F80;
+
+    --status-bar-border-color: var(--main-border-color);
+
     --scrollbar-thumb-color: #fdfdfd5c;
     --scrollbar-thumb-hover-color: #ffffff7d;
     --scrollbar-background-color: transparent;
     --scrollbar-border-color: unset; /* Deprecated */
 
     --selection-background-color: #3399FF70;
-    
-    --link-color: lightskyblue;
 
     --mermaid-theme: dark;
 
@@ -271,6 +291,15 @@
     --ck-editor-toolbar-button-on-shadow: 1px 1px 2px rgba(0, 0, 0, .75);
     --ck-editor-toolbar-dropdown-button-open-background: #ffffff14;
 
+    --note-list-view-icon-color: var(--left-pane-icon-color);
+    --note-list-view-large-icon-background: var(--note-icon-background-color);
+    --note-list-view-large-icon-color: var(--note-icon-color);
+    --note-list-view-search-result-highlight-background: transparent;
+    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
+    --note-list-view-content-background: rgba(0, 0, 0, .2);
+    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
+    --note-list-view-content-search-result-highlight-color: black;
+
     --calendar-coll-event-background-saturation: 25%;
     --calendar-coll-event-background-lightness: 20%;
     --calendar-coll-event-background-color: #3c3c3c;
@@ -284,7 +313,8 @@
  * Dark color scheme tweaks
  */
 
-#left-pane .fancytree-node.tinted {
+#left-pane .fancytree-node.tinted,
+.nested-note-list-item.use-note-color {
     --custom-color: var(--dark-theme-custom-color);
 
     /* The background color of the active item in the note tree.
@@ -293,10 +323,10 @@
     --custom-bg-color: hsl(var(--custom-color-hue), 20%, 33%, 0.4);
 }
 
-:root .reference-link,
-:root .reference-link:hover,
-.ck-content a.reference-link > span,
-.board-note {
+:root .reference-link.use-note-color,
+:root .reference-link.use-note-color:hover,
+.ck-content a.reference-link.use-note-color > span,
+.board-note.use-note-color {
     color: var(--dark-theme-custom-color, inherit);
 }
 
@@ -318,6 +348,30 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
     --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 13.2%, 20.8%);
 }
 
+.modal.tab-bar-modal .tabs .tab-card.with-hue {
+    background-color: hsl(var(--bg-hue), 8.8%, 11.2%);
+    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
+}
+
+.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
+    background-color: hsl(var(--bg-hue), 8.8%, 16.2%);
+    border-color: hsl(var(--bg-hue), 9.4%, 25.1%);
+}
+
+
 .use-note-color {
     --custom-color: var(--dark-theme-custom-color);
-}
+}
+
+.note-split.with-hue,
+.quick-edit-dialog-wrapper.with-hue,
+.nested-note-list-item.with-hue {
+    --note-icon-custom-background-color: hsl(var(--custom-color-hue), 15.8%, 30.9%);
+    --note-icon-custom-color: hsl(var(--custom-color-hue), 100%, 76.5%);
+    --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 28.3%, 36.7%);
+}
+
+.note-split.with-hue *::selection,
+.quick-edit-dialog-wrapper.with-hue *::selection {
+    --selection-background-color: hsl(var(--custom-color-hue), 49.2%, 35%);
+}

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

@@ -6,7 +6,7 @@
  */
 :root {
 
-    /* 
+    /*
      * ⚠️ NOTICE: This theme is currently in the beta stage of development.
      * The names and purposes of these CSS variables are subject to frequent changes.
      */
@@ -21,8 +21,8 @@
     --subtle-border-color: rgba(0, 0, 0, 0.1);
     --dropdown-border-color: #ccc;
     --dropdown-shadow-opacity: 0.2;
-    --dropdown-item-icon-destructive-color: #ec5138;
-    --disabled-tooltip-icon-color: #004382;
+    --dropdown-item-icon-destructive-color: #de4027;
+    --contextual-help-icon-color: #004382;
 
     --accented-background-color: #f5f5f5;
 
@@ -74,8 +74,10 @@
     --select-arrow-svg: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3e%3cpath fill='transparent' stroke='black' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='m2 5 6 6 6-6'/></svg>");
     --select-group-heading-text-color: gray;
 
-    --link-hover-background: #00000012;
-    --link-hover-color: black;
+    --link-color: #0076af;
+    --link-hover-background: #3c7fa017;
+    --link-hover-color: var(--link-color);
+    --link-selection-outline-color: #95c3d9db;
 
     --hover-item-text-color: black;
     --hover-item-background-color: #0000001a;
@@ -125,6 +127,7 @@
     --left-pane-collapsed-border-color: #0000000d;
     --left-pane-background-color: #f2f2f2;
     --left-pane-text-color: #383838;
+    --left-pane-icon-color: currentColor;
     --left-pane-item-hover-background: rgba(0, 0, 0, 0.032);
     --left-pane-item-selected-background: white;
     --left-pane-item-selected-color: black;
@@ -138,7 +141,7 @@
     /* Deprecated: now local variables in #launcher, with the values dependent on the current layout. */
     --launcher-pane-background-color: unset;
     --launcher-pane-text-color: unset;
-    
+
     --launcher-pane-vert-background-color: #e8e8e8;
     --launcher-pane-vert-text-color: #000000bd;
     --launcher-pane-vert-button-hover-color: black;
@@ -162,6 +165,9 @@
     --protected-session-active-icon-color: #16b516;
     --sync-status-error-pulse-color: #ff5528;
 
+    --classic-toolbar-vert-layout-background-color: #ffffffa1;
+    --classic-toolbar-horiz-layout-background-color: var(--main-background-color);
+
     --center-pane-vert-layout-background-color-bgfx: #ffffff75;
     --center-pane-horiz-layout-background-color-bgfx: #ffffffd6;
 
@@ -174,7 +180,7 @@
 
     --tab-close-button-hover-background: #c95a5a;
     --tab-close-button-hover-color: white;
-    
+
     --active-tab-background-color: white;
     --active-tab-hover-background-color: var(--active-tab-background-color);
     --active-tab-icon-color: gray;
@@ -191,6 +197,17 @@
     --badge-background-color: #00000011;
     --badge-text-color: var(--muted-text-color);
 
+    --badge-temporaraily-editable-background-color: #35a64c;
+    --badge-read-only-background-color: #c8302c;
+    --badge-share-background-color: #6b6b6b;
+    --badge-clipped-note-background-color: #2284c0;
+    --badge-execute-background-color: #7b47af;
+    --badge-active-content-background-color: rgb(27, 164, 168);
+
+    --note-icon-background-color: #4f4f4f;
+    --note-icon-color: white;
+    --note-icon-hover-background-color: #737373;
+
     --promoted-attribute-card-background-color: #00000014;
     --promoted-attribute-card-shadow: none;
 
@@ -218,6 +235,11 @@
     --right-pane-item-hover-background: #00000013;
     --right-pane-item-hover-color: inherit;
 
+    --bottom-panel-background-color: #ffffff8c;
+    --bottom-panel-title-bar-background-color: #94949414;
+
+    --status-bar-border-color: #0000003a;
+
     --scrollbar-thumb-color: #0000005c;
     --scrollbar-thumb-hover-color: #00000066;
     --scrollbar-background-color: transparent;
@@ -225,8 +247,6 @@
 
     --selection-background-color: #3399FF70;
 
-    --link-color: blue;
-
     --mermaid-theme: default;
 
     --code-block-box-shadow: 4px 4px 8px rgba(0, 0, 0, 0.1), 0px 0px 2px rgba(0, 0, 0, 0.2);
@@ -269,6 +289,15 @@
     --ck-editor-toolbar-button-on-shadow: none;
     --ck-editor-toolbar-dropdown-button-open-background: #0000000f;
 
+    --note-list-view-icon-color: var(--left-pane-icon-color);
+    --note-list-view-large-icon-background: var(--note-icon-background-color);
+    --note-list-view-large-icon-color: var(--note-icon-color);
+    --note-list-view-search-result-highlight-background: transparent;
+    --note-list-view-search-result-highlight-color: var(--quick-search-result-highlight-color);
+    --note-list-view-content-background: #b1b1b133;
+    --note-list-view-content-search-result-highlight-background: var(--quick-search-result-highlight-color);
+    --note-list-view-content-search-result-highlight-color: white;
+
     --calendar-coll-event-background-lightness: 95%;
     --calendar-coll-event-background-saturation: 80%;
     --calendar-coll-event-background-color: #eaeaea;
@@ -278,7 +307,8 @@
     --calendar-coll-today-background-color: #00000006;
 }
 
-#left-pane .fancytree-node.tinted {
+#left-pane .fancytree-node.tinted,
+.nested-note-list-item.use-note-color {
     --custom-color: var(--light-theme-custom-color);
 
     /* The background color of the active item in the note tree.
@@ -291,4 +321,27 @@
     --modal-background-color: hsl(var(--custom-color-hue), 56%, 96%);
     --modal-border-color: hsl(var(--custom-color-hue), 33%, 41%);
     --promoted-attribute-card-background-color: hsl(var(--custom-color-hue), 40%, 88%);
-}
+}
+
+.modal.tab-bar-modal .tabs .tab-card.with-hue {
+    background-color: hsl(var(--bg-hue), 56%, 96%);
+    border-color: hsl(var(--bg-hue), 33%, 41%);
+}
+
+.modal.tab-bar-modal .tabs .tab-card.active.with-hue {
+    background-color: hsl(var(--bg-hue), 86%, 96%);
+    border-color: hsl(var(--bg-hue), 33%, 41%);
+}
+
+.note-split.with-hue,
+.quick-edit-dialog-wrapper.with-hue,
+.nested-note-list-item.with-hue {
+    --note-icon-custom-background-color: hsl(var(--custom-color-hue), 44.5%, 43.1%);
+    --note-icon-custom-color: hsl(var(--custom-color-hue), 91.3%, 91%);
+    --note-icon-hover-custom-background-color: hsl(var(--custom-color-hue), 55.1%, 50.2%);
+}
+
+.note-split.with-hue *::selection,
+.quick-edit-dialog-wrapper.with-hue *::selection {
+    --selection-background-color: hsl(var(--custom-color-hue), 60%, 90%);
+}

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

@@ -17,6 +17,8 @@
  */
 
 :root {
+    color-scheme: var(--theme-style);
+
     --main-font-family: "Inter", sans-serif;
 
     --main-font-size: normal;
@@ -50,7 +52,7 @@
 
     --tab-bar-height: 50px;
     --tab-height: 36px;
-    --tab-first-item-horiz-offset: 1px;
+    --tab-first-item-horiz-offset: 0;
     --new-tab-button-size: 24px;
 
     --center-pane-border-radius: 10px;
@@ -89,13 +91,13 @@
      * the color is adjusted based on the current color scheme (light or dark). The lightness
      * component of the color represented in the CIELAB color space, will be
      * constrained to a certain percentage defined below.
-     * 
+     *
      * Note: the tree background may vary when background effects are enabled, so it is recommended
      * to maintain a higher contrast margin than on the usual note tree solid background. */
 
     /* The maximum perceptual lightness for the custom color in the light theme (%): */
     --tree-item-light-theme-max-color-lightness: 60;
-    
+
     /* The minimum perceptual lightness for the custom color in the dark theme (%): */
     --tree-item-dark-theme-min-color-lightness: 65;
 }
@@ -128,6 +130,22 @@ body.backdrop-effects-disabled {
     font-size: 0.9rem !important;
 }
 
+/* Use this class for non-legacy menus */
+.dropdown-menu.tn-dropdown-menu {
+    --menu-item-icon-vert-offset: 0;
+    white-space-collapse: discard;
+}
+
+.dropdown-menu.tn-dropdown-menu .dropdown-item .tn-icon {
+    margin-inline-end: 6px;
+}
+
+.dropdown-menu.tn-dropdown-menu-scrollable {
+    /* Note: scrollable dropdowns does not support submenus */
+    max-height: 90vh;
+    overflow-y: auto;
+}
+
 body.desktop .dropdown-menu::before,
 :root .ck.ck-dropdown__panel::before,
 :root .excalidraw .popover::before,
@@ -147,14 +165,14 @@ body.desktop .dropdown-menu.tn-dropdown-list {
     backdrop-filter: var(--dropdown-backdrop-filter);
 }
 
-body.desktop .dropdown-menu.tn-dropdown-list::before {
-    display: none;
-}
-
 body.desktop .dropdown-submenu .dropdown-menu::before {
     content: unset;
 }
 
+body.desktop .dropdown-menu.tn-dropdown-list::before {
+    display: none;
+}
+
 body.desktop .dropdown-submenu .dropdown-menu {
     backdrop-filter: var(--dropdown-backdrop-filter);
     background: transparent;
@@ -165,17 +183,35 @@ body.desktop .dropdown-submenu .dropdown-menu {
     --menu-item-start-padding: 8px;
     --menu-item-end-padding: 22px;
     --menu-item-vertical-padding: 2px;
-    
-    padding-top: var(--menu-item-vertical-padding) !important;
-    padding-bottom: var(--menu-item-vertical-padding) !important;
-    padding-inline-start: var(--menu-item-start-padding) !important;
-    padding-inline-end: var(--menu-item-end-padding) !important;
 
     /* Note: the right padding should also accommodate the submenu arrow. */
     border-radius: 6px;
     cursor: default !important;
 }
 
+.dropdown-item:not(.dropdown-submenu),
+body.desktop .dropdown-item.dropdown-submenu .dropdown-toggle,
+.excalidraw .context-menu .context-menu-item {
+    padding-top: var(--menu-item-vertical-padding) !important;
+    padding-bottom: var(--menu-item-vertical-padding) !important;
+    padding-inline-start: var(--menu-item-start-padding) !important;
+    padding-inline-end: var(--menu-item-end-padding) !important;
+}
+
+.dropdown-item.dropdown-submenu {
+    padding: 0 !important;
+
+    .dropdown-toggle {
+        flex-grow: 1;
+    }
+}
+
+body.desktop .dropdown-menu:has(> .dropdown-submenu.dropstart) > .dropdown-item:not(.dropdown-submenu),
+body.desktop .dropdown-menu:has(> .dropdown-submenu.dropstart) > .dropdown-item.dropdown-submenu .dropdown-toggle {
+    padding-inline-end: var(--menu-item-start-padding) !important;
+    padding-inline-start: var(--menu-item-end-padding) !important;
+}
+
 :root .dropdown-item:focus-visible {
     outline: 2px solid var(--input-focus-outline-color) !important;
     background-color: transparent;
@@ -200,6 +236,10 @@ html body .dropdown-item[disabled] {
     opacity: var(--menu-item-disabled-opacity);
 }
 
+.dropdown-item:not(.disabled) .destructive-action-icon,
+.dropdown-item:not(.disabled) .bx-trash {
+    --menu-item-icon-color: var(--dropdown-item-icon-destructive-color);
+}
 /* Badges */
 :root .badge {
     --bs-badge-color: var(--badge-text-color);
@@ -211,7 +251,7 @@ html body .dropdown-item[disabled] {
 }
 
 /* Menu item icon */
-.dropdown-item .bx {
+.dropdown-item .tn-icon {
     translate: 0 var(--menu-item-icon-vert-offset);
     color: var(--menu-item-icon-color) !important;
     font-size: 1.1em;
@@ -249,7 +289,8 @@ html body .dropdown-item[disabled] {
 }
 
 /* Menu item arrow */
-.dropdown-menu .dropdown-toggle::after {
+body.mobile .dropdown-submenu .dropdown-toggle::after,
+body.desktop .dropdown-submenu:not(.dropstart) .dropdown-toggle::after {
     content: "\ed3b" !important;
     position: absolute;
     display: flex !important;
@@ -265,6 +306,26 @@ html body .dropdown-item[disabled] {
     color: var(--menu-item-arrow-color) !important;
 }
 
+body.mobile .dropdown-submenu.dropstart .dropdown-toggle::before {
+    content: unset;
+}
+
+body.desktop .dropdown-submenu.dropstart .dropdown-toggle::before {
+    content: "\ea4d" !important;
+    position: absolute;
+    display: flex !important;
+    align-items: center;
+    justify-content: center;
+    top: 0;
+    inset-inline-start: 0;
+    margin: unset !important;
+    border: unset !important;
+    padding: 0 4px;
+    font-family: boxicons;
+    font-size: 1.2em;
+    color: var(--menu-item-arrow-color) !important;
+}
+
 body[dir=rtl] .dropdown-menu:not([data-popper-placement="bottom-start"]) .dropdown-toggle::after {
     content: "\ea4d" !important;
 }
@@ -339,7 +400,7 @@ body.mobile .dropdown-menu {
     font-size: 1em !important;
     backdrop-filter: var(--dropdown-backdrop-filter);
     position: relative;
-    
+
     .dropdown-toggle::after {
         top: 0.5em;
         right: var(--dropdown-menu-padding-horizontal);
@@ -356,7 +417,7 @@ body.mobile .dropdown-menu {
         padding: var(--dropdown-menu-padding-vertical) var(--dropdown-menu-padding-horizontal) !important;
         background: var(--card-background-color);
         border-bottom: 1px solid var(--menu-item-delimiter-color) !important;
-        border-radius: 0;        
+        border-radius: 0;
     }
 
     .dropdown-item:first-of-type,
@@ -367,9 +428,9 @@ body.mobile .dropdown-menu {
         border-top-right-radius: 6px;
     }
 
-    .dropdown-item:last-of-type,    
+    .dropdown-item:last-of-type,
     .dropdown-item:has(+ .dropdown-divider),
-    .dropdown-custom-item:last-of-type,    
+    .dropdown-custom-item:last-of-type,
     .dropdown-custom-item:has(+ .dropdown-divider) {
         border-bottom-left-radius: 6px;
         border-bottom-right-radius: 6px;
@@ -392,10 +453,10 @@ body.mobile .dropdown-menu {
             --menu-background-color: --menu-submenu-mobile-background-color;
             --bs-dropdown-divider-margin-y: 0.25rem;
             border-radius: 0;
-            max-height: 0;            
+            max-height: 0;
             transition: max-height 100ms ease-in;
-            display: block !important;            
-            
+            display: block !important;
+
             &.show {
                 max-height: 1000px;
                 padding: 0.5rem 0.75rem !important;
@@ -405,7 +466,7 @@ body.mobile .dropdown-menu {
         &.submenu-open {
             .dropdown-toggle {
                 padding-bottom: var(--dropdown-menu-padding-vertical);
-            }            
+            }
         }
     }
 
@@ -437,7 +498,7 @@ li.dropdown-item a.dropdown-item-button {
     border: unset;
 }
 
-li.dropdown-item a.dropdown-item-button.bx {
+li.dropdown-item a.dropdown-item-button.tn-icon {
     color: var(--menu-text-color) !important;
 }
 
@@ -498,13 +559,13 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     padding-top: 0;
 }
 
-#toast-container .toast:not(.no-title) .bx {
+#toast-container .toast:not(.no-title) .tn-icon {
     margin-inline-end: 0.5em;
     font-size: 1.1em;
     opacity: 0.85;
 }
 
-#toast-container .toast.no-title .bx {
+#toast-container .toast.no-title .tn-icon {
     margin-inline-end: 0;
     font-size: 1.3em;
 }
@@ -695,7 +756,7 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     margin-bottom: 0;
 }
 
-.note-list-wrapper .note-book-card .bx {
+.note-list-wrapper .note-book-card .tn-icon {
     color: var(--left-pane-icon-color) !important;
 }
 
@@ -703,11 +764,6 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     filter: contrast(105%);
 }
 
-.note-list.grid-view .note-book-card img {
-    object-fit: cover !important;
-    width: 100%;
-}
-
 .note-list.grid-view .ck-content {
     line-height: 1.3;
 }
@@ -743,4 +799,19 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
 .note-detail-empty .aa-suggestions div.aa-cursor {
     background: var(--hover-item-background-color);
     color: var(--hover-item-text-color);
+}
+
+/*
+ * Alert bars
+ */
+
+div.alert {
+    margin-bottom: 8px;
+    background: var(--alert-bar-background) !important;
+    border-radius: 8px;
+    font-size: .85em;
+}
+
+div.alert p + p {
+    margin-block: 1em 0;
 }

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

@@ -423,6 +423,6 @@ div.tn-tool-dialog {
     font-size: unset;
 }
 
-.note-type-chooser-dialog div.note-type-dropdown .dropdown-item span.bx {
+.note-type-chooser-dialog div.note-type-dropdown .dropdown-item span.tn-icon {
     margin-inline-end: .25em;
-}
+}

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

@@ -56,15 +56,16 @@ button.btn.btn-primary:focus-visible,
 button.btn.btn-secondary:focus-visible,
 button.btn.btn-sm:not(.select-button):focus-visible,
 button.btn.btn-success:focus-visible,
-button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):focus-visible {
+button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .ck-button-replaceall, .ck-button-replace).ck-button_with-text:not(.ck-disabled):focus-visible,
+.tn-focusable-button:focus-visible {
     outline: 2px solid var(--input-focus-outline-color);
 }
 
 /* Button's icon */
-button.btn.btn-primary span.bx,
-button.btn.btn-secondary span.bx,
-button.btn.btn-sm span.bx,
-button.btn.btn-success span.bx {
+button.btn.btn-primary span.tn-icon,
+button.btn.btn-secondary span.tn-icon,
+button.btn.btn-sm span.tn-icon,
+button.btn.btn-success span.tn-icon {
     color: var(--cmd-button-icon-color);
     padding-inline-end: 0.35em;
     font-size: 1.2em;
@@ -83,6 +84,22 @@ button.btn.btn-success kbd {
     letter-spacing: 0.5pt;
 }
 
+/*
+ * Low profile buttons
+ */
+
+button.tn-low-profile {
+    appearance: none;
+    background: transparent;
+    border: 0;
+    border-radius: 8px;
+    color: inherit;
+}
+
+button.tn-low-profile:hover {
+    background-color: var(--icon-button-hover-background);
+}
+
 /*
  * Icon buttons
  */
@@ -154,7 +171,7 @@ button.btn.btn-success kbd {
     color: var(--button-group-active-button-text-color);
 }
 
-/* 
+/*
  * Input boxes
  */
 
@@ -352,6 +369,11 @@ label.input-group.tn-number-unit-pair input {
     padding-inline-end: 0;
 }
 
+:root .input-group > pre[aria-hidden="true"] {
+    margin: 0;
+    padding: 0;
+}
+
 /* Combo box-like dropdown buttons */
 
 .select-button.dropdown-toggle::after {
@@ -399,7 +421,8 @@ button.select-button.dropdown-toggle.btn:active {
 select:focus,
 select.form-select:focus,
 select.form-control:focus,
-.select-button.dropdown-toggle.btn:focus {
+.select-button.dropdown-toggle.btn:focus,
+.select-button.focus-outline:focus {
     box-shadow: unset;
     outline: 3px solid var(--input-focus-outline-color);
     outline-offset: 0;
@@ -422,7 +445,7 @@ optgroup {
     line-height: 40px;
 }
 
-/* 
+/*
  * File input
  *
  * <label class="tn-file-input tn-input-field">
@@ -635,8 +658,8 @@ body a.tn-link:visited,
     border-radius: 4px;
     background: var(--background);
     color: var(--link-color);
-    font-weight: normal;
-    text-decoration: underline;
+    font-weight: 500;
+    text-decoration: none;
 
     transition:
         background-color 200ms ease-out,
@@ -651,10 +674,12 @@ body a.tn-link:focus-visible,
 }
 
 body a.tn-link:hover,
-.use-tn-links a:hover {
+.use-tn-links a:hover,
+.use-tn-links a.ck-widget_selected {
     box-shadow: 0 0 0 4px var(--link-hover-background);
     --background: var(--link-hover-background);
     color: var(--link-hover-color);
+    text-decoration: underline;
 
     transition:
         background-color 100ms ease-in,
@@ -784,4 +809,36 @@ input[type="range"] {
         scrollbar-color: unset;
         scrollbar-width: unset;
     }
-}
+}
+
+/*
+ * Centered forms
+ */
+
+.tn-centered-form {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-bottom: 20vh;
+}
+
+.tn-centered-form .form-group {
+    text-align: center;
+    color: var(--muted-text-color);
+}
+
+.tn-centered-form .form-icon {
+    font-size: 140px;
+    color: var(--main-border-color);
+}
+
+.tn-centered-form .protected-session-password {
+    margin-inline: auto;
+    max-width: 350px;
+    text-align: center;
+}
+
+.tn-centered-form .input-group,
+.tn-centered-form button {
+    margin-top: 12px;
+}

apps/client/src/stylesheets/theme-next/notes/text.css

@@ -22,7 +22,7 @@
     --ck-color-button-on-background: transparent;
     --ck-color-button-on-hover-background: var(--hover-item-background-color);
     --ck-color-button-default-active-background: var(--hover-item-background-color);
-    
+
     --ck-color-split-button-hover-background: var(--ck-editor-toolbar-dropdown-button-open-background);
 
     --ck-focus-ring: 1px solid transparent;
@@ -47,9 +47,14 @@
 }
 
 /* The toolbar show / hide button for the current text block */
-.ck.ck-block-toolbar-button {
+:root .ck.ck-block-toolbar-button {
+    --ck-color-block-toolbar-button: var(--muted-text-color);
     --ck-color-button-on-background: transparent;
-    --ck-color-button-on-color: currentColor;
+    --ck-color-button-on-color: var(--ck-editor-toolbar-button-on-color);
+    translate: -40% 0;
+    min-width: 0;
+    padding: 0;
+    z-index: 1600;
 }
 
 :root .ck.ck-toolbar .ck-button:not(.ck-disabled):active,
@@ -77,7 +82,7 @@
     visibility: collapse;
 }
 
-/* 
+/*
  * Dropdowns
  */
 
@@ -85,7 +90,7 @@
 :root .ck.ck-dropdown__panel,
 :root .ck-balloon-panel {
     --ck-editor-popup-padding: 4px;
-    
+
     --ck-color-panel-background: var(--menu-background-color);
     --ck-color-panel-border: var(--ck-editor-popup-border-color);
 
@@ -487,7 +492,7 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
 .ck.ck-labeled-field-view > .ck.ck-labeled-field-view__input-wrapper > label.ck.ck-label {
     /* Move the label above the text box regardless of the text box state */
     transform: translate(0, calc(-.2em - var(--ck-input-label-height))) !important;
-    
+
     padding-inline-start: 0 !important;
     background: transparent;
     font-size: .85em;
@@ -517,8 +522,12 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
  * EDITOR'S CONTENT
  */
 
+.note-detail-editable-text-editor > .ck-placeholder {
+    opacity: .5;
+}
+
 /*
- * Code Blocks 
+ * Code Blocks
  */
 
 .attachment-content-wrapper pre,
@@ -526,10 +535,14 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
 .ck-mermaid__editing-view {
     border: 0;
     border-radius: 6px;
-    box-shadow: var(--code-block-box-shadow);    
+    box-shadow: var(--code-block-box-shadow);
     margin-top: 2px !important;
 }
 
+.attachment-content-wrapper pre {
+    border-radius: var(--dropdown-border-radius);
+}
+
 :root .ck-content pre:has(> code) {
     padding: 0;
 }
@@ -542,7 +555,7 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel).ck
      * for single-line code blocks */
 
     --copy-button-margin-size: calc((1em    * 1.5   + var(--padding-size) * 2 - var(--icon-button-size)) / 2);
-    
+
     /* Where:                        │        └ Line height
      *                               └───────── Font size
      */
@@ -630,6 +643,10 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
     font-weight: 300;
 }
 
+.ck-content strong {
+    font-weight: 600;
+}
+
 .ck-content hr {
     margin: 5px 0;
     height: 1px;
@@ -666,16 +683,33 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
     color: var(--main-text-color);
 }
 
+/* Links */
+
+.ck-content a.ck-widget {
+    outline: none;
+}
+
+.ck-content a.ck-widget.ck-widget_selected,
+.ck-content a.ck-link_selected {
+    outline: none;
+    box-shadow: 0 0 0 2px var(--link-selection-outline-color);
+    background: var(--link-hover-background);
+} 
+
 /* Reference link */
 
 .ck-content a.reference-link,
 .ck-content a.reference-link:hover {
     /* Apply underline only to the span inside the link so it can follow the
      * target note's user defined color */
-    text-decoration: none;
+     text-decoration: none;
 }
 
-.ck-content a.reference-link > span {
+.ck-content a.reference-link > span.use-note-color {
+    color: var(--custom-color, inherit);
+}
+
+.ck-content a.reference-link:hover > span {
     text-decoration: underline;
 }
 
@@ -690,4 +724,4 @@ html .note-detail-editable-text :not(figure, .include-note, hr):first-child {
 
 .note-list-widget {
     outline: 0 !important;
-}
+}

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

@@ -57,12 +57,12 @@
     height: 18px;
 }
 
-/* 
+/*
  * SEARCH PAGE
  */
 
  /* Button bar */
- .search-definition-widget .search-setting-table tbody:last-child div {
+ .search-definition-widget .search-setting-table .search-actions-container {
     justify-content: flex-end;
     gap: 8px;
  }
@@ -143,7 +143,7 @@
 /*
  * OPTIONS PAGES
  */
- 
+
  :root {
     --options-card-min-width: 500px;
     --options-card-max-width: 900px;
@@ -151,6 +151,15 @@
     --options-title-font-size: .75rem;
     --options-title-offset: 13px;
 }
+
+.note-split.options {
+    --preferred-max-content-width: var(--options-card-max-width);
+}
+
+.note-split.options .collection-properties {
+    visibility: hidden;
+}
+
 /* Create a gap at the top of the option pages */
 .note-detail-content-widget-content.options>*:first-child {
     margin-top: var(--options-first-item-top-margin, 1em);
@@ -172,6 +181,10 @@
     height: 0;
 }
 
+body.experimental-feature-new-layout .note-detail-content-widget-content.options {
+    padding-inline: 25px;
+}
+
 .options-section:not(.tn-no-card) {
     margin-bottom: calc(var(--options-title-offset) + 26px) !important;
     box-shadow: var(--card-box-shadow);
@@ -181,10 +194,6 @@
     padding: var(--options-card-padding);
 }
 
-body.prefers-centered-content .options-section:not(.tn-no-card) {
-    margin-inline: auto;
-}
-
 body.desktop .options-section:not(.tn-no-card) {
     min-width: var(--options-card-min-width);
     max-width: var(--options-card-max-width);
@@ -256,13 +265,6 @@ body.desktop .options-section:not(.tn-no-card) {
     margin-bottom: 6px;
 }
 
-.options-section .alert {
-    margin-bottom: 8px;
-    background: var(--alert-bar-background) !important;
-    border-radius: 8px;
-    font-size: .85em;
-}
-
 nav.options-section-tabs {
     min-width: var(--options-card-min-width);
     max-width: var(--options-card-max-width);
@@ -326,4 +328,4 @@ nav.options-section-tabs + .options-section {
 
 .etapi-options-section div {
     height: auto !important;
-}
+}

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

@@ -168,25 +168,7 @@ ul.editability-dropdown li.dropdown-item > div {
  * Note info
  */
 
-:root .note-info-widget-table button.calculate-button {
-    min-width: 0;
-    padding: 4px 10px !important;
-    font-size: 0.8em;
-}
-
 /* Narrow width layout */
 .note-info-widget {
     container: info-section / inline-size;
 }
-
-/*
- * Styling as a floating toolbar
- */
-.ribbon-container {
-    position: sticky;
-    top: 0;
-    left: 0;
-    right: 0;
-    background: var(--main-background-color);
-    z-index: 997;
-}

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

@@ -40,13 +40,30 @@ body.mobile {
 
 /* #region Mica */
 
+/* Quirk: --background-material is read before "theme-supports-background-effects" class
+ * is applied. Apply the matterial even if the theme doesn't support it. */
 body.background-effects.platform-win32 {
-    /* Quirk: --background-material is read before "theme-supports-background-effects" class
-     * is applied. Apply the matterial even if the theme doesn't support it. */
-    --background-material: tabbed;
+    &.layout-vertical {
+        --background-material: mica;
+    }
+
+    &.layout-horizontal {
+        --background-material: tabbed;
+    }
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32 {
+body.background-effects.platform-darwin {
+    /** Reference: https://developer.apple.com/documentation/appkit/nsvisualeffectview?preferredLanguage=objc **/
+    &.layout-vertical {
+        --background-material: under-window;
+    }
+
+    &.layout-horizontal {
+        --background-material: hud;
+    }
+}
+
+body.background-effects.theme-supports-background-effects {
     --launcher-pane-horiz-border-color: var(--launcher-pane-horiz-border-color-bgfx);
     --launcher-pane-horiz-background-color: var(--launcher-pane-horiz-background-color-bgfx);
     --launcher-pane-vert-background-color: var(--launcher-pane-vert-background-color-bgfx);
@@ -56,33 +73,29 @@ body.background-effects.theme-supports-background-effects.platform-win32 {
     --root-background: transparent;
 }
 
-body.background-effects.platform-win32.layout-vertical {
-    --background-material: mica;
-}
-
-body.background-effects.theme-supports-background-effects.platform-win32.layout-vertical {
+body.background-effects.theme-supports-background-effects.layout-vertical {
     --left-pane-background-color: var(--window-background-color-bgfx);
     --center-pane-background-color-bgfx: var(--center-pane-vert-layout-background-color-bgfx);
     --right-pane-background-color: var(--right-pane-background-color-bgfx);
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal {
+body.background-effects.theme-supports-background-effects.layout-horizontal {
     --center-pane-background-color-bgfx: var(--center-pane-horiz-layout-background-color-bgfx);
     --gutter-color: var(--left-pane-background-color);
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32,
-body.background-effects.theme-supports-background-effects.platform-win32 #root-widget {
+body.background-effects.theme-supports-background-effects,
+body.background-effects.theme-supports-background-effects #root-widget {
     background: var(--window-background-color-bgfx) !important;
 }
 
-body.background-effects.theme-supports-background-effects.platform-win32.layout-horizontal #horizontal-main-container,
-body.background-effects.theme-supports-background-effects.platform-win32.layout-vertical #vertical-main-container {
+body.background-effects.theme-supports-background-effects.layout-horizontal #horizontal-main-container,
+body.background-effects.theme-supports-background-effects.layout-vertical #vertical-main-container {
     background-color: var(--root-background);
 }
 
 /* Note split with background effects */
-body.background-effects.theme-supports-background-effects.platform-win32 #center-pane .note-split.bgfx {
+body.background-effects.theme-supports-background-effects #center-pane .note-split.bgfx {
     --note-split-background-color: var(--center-pane-background-color-bgfx);
 }
 
@@ -497,7 +510,7 @@ div.bookmark-folder-widget .note-link:hover a {
 }
 
 /* The item's icon */
-div.bookmark-folder-widget .note-link .bx {
+div.bookmark-folder-widget .note-link .tn-icon {
     color: var(--menu-item-icon-color);
     font-size: 1.2em;
 }
@@ -726,39 +739,35 @@ body[dir=rtl] #left-pane span.fancytree-node.protected > span.fancytree-custom-i
     transform: translateX(-25%);
 }
 
-body.mobile .fancytree-expander::before,
-body.mobile .fancytree-title,
-body.mobile .fancytree-node > span {
-    font-size: 1rem !important;
-}
-
 @media (max-width: 991px) {
     body.mobile #mobile-sidebar-container {
         background-color: rgba(0, 0, 0, 0.5);
     }
 
-    body.mobile:not(.force-fixed-tree) #mobile-sidebar-wrapper {
+    body.mobile #mobile-sidebar-wrapper {
         border-top-right-radius: 12px;
         border-bottom-right-radius: 12px;
         border-inline-end: 1px solid var(--subtle-border-color);
     }
 }
 
-#left-pane .fancytree-expander {
+#left-pane .fancytree-expander,
+.nested-note-list-item .note-expander {
     opacity: 0.65;
     transition: opacity 150ms ease-in;
 }
 
-#left-pane .fancytree-expander:hover {
+#left-pane .fancytree-expander:hover,
+.nested-note-list-item .note-expander:hover {
     opacity: 1;
     transition: opacity 300ms ease-out;
 }
 
 #left-pane .fancytree-custom-icon {
     margin-top: 0; /* Use this to align the icon with the tree view item's caption */
+    color: var(--custom-color, var(--left-pane-icon-color));
 }
 
-
 #left-pane span.fancytree-active .fancytree-title {
     font-weight: normal;
 }
@@ -767,7 +776,7 @@ body.mobile .fancytree-node > span {
     background: var(--left-pane-item-hover-background);
 }
 
-#left-pane span.fancytree-node.shared .fancytree-title::after {
+#left-pane .note-indicator-icon.shared-indicator {
     opacity: 0.5;
 }
 
@@ -1029,7 +1038,7 @@ body.layout-vertical.electron.platform-darwin .tab-row-container {
 }
 
 body.layout-horizontal .tab-row-container {
-    padding-top: calc((var(--tab-bar-height) - var(--tab-height)));
+    padding-top: calc(var(--tab-bar-height) - var(--tab-height));
 }
 
 /* Define extra drag areas for Electron windows */
@@ -1054,7 +1063,7 @@ body.layout-horizontal .tab-row-widget-container {
     overflow: hidden;
 }
 
-body.desktop:not(.background-effects.platform-win32) #root-widget.horizontal-layout {
+body.desktop:not(.background-effects) #root-widget.horizontal-layout {
     background-color: var(--root-background) !important;
 }
 
@@ -1069,8 +1078,9 @@ body.desktop:not(.background-effects.platform-win32) #root-widget.horizontal-lay
     border-bottom-color: transparent;
 }
 
-.tab-row-widget .note-tab .note-tab-wrapper {
+:root div.tab-row-widget div.note-tab div.note-tab-wrapper {
     height: var(--tab-height) !important;
+    border-radius: 8px;
     transition:
         background 75ms ease-in,
         box-shadow 75ms ease-in;
@@ -1084,7 +1094,7 @@ body.desktop:not(.background-effects.platform-win32) #root-widget.horizontal-lay
     margin-top: calc((var(--tab-bar-height) - var(--tab-height)) * -1);
 }
 
-body.layout-horizontal .tab-row-widget .note-tab .note-tab-wrapper {
+body.layout-horizontal div.tab-row-widget div.note-tab div.note-tab-wrapper {
     border-bottom-left-radius: 0;
     border-bottom-right-radius: 0;
 }
@@ -1221,20 +1231,53 @@ body.layout-vertical .tab-row-widget-is-sorting .note-tab.note-tab-is-dragging .
     top: 0;
 }
 
+/*
+ * CLASSIC FORMATTING TOOLBAR
+ */
+
+#rest-pane > .classic-toolbar-widget {
+    margin-bottom: 2px;
+}
+
+body.layout-vertical #rest-pane > .classic-toolbar-widget {
+    border-start-start-radius: var(--center-pane-border-radius);
+}
+
+body.layout-vertical #rest-pane > .classic-toolbar-widget {
+    background: var(--classic-toolbar-vert-layout-background-color);
+}
+
+body.layout-horizontal #rest-pane > .classic-toolbar-widget {
+    background: var(--classic-toolbar-horiz-layout-background-color);
+}
+
+.classic-toolbar-widget:not(.hidden-ext) + #vertical-main-container {
+    /* Remove the center panel border radius when the toolbar is visible */
+    --center-pane-border-radius: 0;
+}
+
 /*
  * CENTER PANE
  */
 
  /* The first visible note split */
 .vertical-layout #center-pane .note-split:not(.visible ~ .visible) {
-    border-radius: var(--center-pane-border-radius) 0 0 0;
+    border-start-start-radius: var(--center-pane-border-radius);
 }
 
 #center-pane .note-split {
     padding-top: 2px;
     background-color: var(--note-split-background-color, var(--main-background-color));
+    transition: border-color 150ms ease-out;
+    border: 2px solid transparent;
 }
 
+/* The active split in a multi-split view */
+#center-pane > .split-note-container-widget:has(> .note-split.visible ~ .note-split.visible) > .note-split.active {
+    border-color: var(--link-selection-outline-color);
+}
+
+
 body:not(.background-effects) #center-pane .note-split {
     animation: note-entrance 100ms linear;
 }
@@ -1275,7 +1318,7 @@ body.mobile .note-title {
     margin-inline-start: 0;
 }
 
-.title-row {
+body.desktop .title-row {
     /* Aligns the "Create new split" button with the note menu button (the three dots button) */
     padding-inline-end: 3px;
 }
@@ -1348,6 +1391,10 @@ body.mobile .note-title {
     border-bottom: 2px solid #0000001c !important;
 }
 
+body.experimental-feature-new-layout #center-pane .note-split > div.alert {
+    margin-top: 0;
+}
+
 /*
  * Promoted attributes
  */
@@ -1773,6 +1820,10 @@ div.find-replace-widget div.find-widget-found-wrapper > span {
     background: var(--right-pane-background-color);
 }
 
+#right-pane > * {
+    animation: fade-in 200ms ease-in;
+}
+
 #right-pane div.card-header {
     align-items: center;
     border: 0;

apps/client/src/stylesheets/tree.css

@@ -148,22 +148,26 @@ span.fancytree-node.protected > span.fancytree-custom-icon {
     filter: drop-shadow(2px 2px 2px var(--main-text-color));
 }
 
-span.fancytree-node.multiple-parents.shared .fancytree-title::after {
+/* Note indicator icons (clone, shared) - real DOM elements for tooltip support */
+.note-indicator-icon {
     font-family: "boxicons" !important;
     font-size: smaller;
-    content: " \eb3d \ec03";
+    margin-inline-start: 4px;
+    opacity: 0.8;
+    cursor: help;
 }
 
-span.fancytree-node.multiple-parents .fancytree-title::after {
-    font-family: "boxicons" !important;
-    font-size: smaller;
-    content: " \eb3d"; /* lookup code for "link-alt" in boxicons.css */
+.note-indicator-icon.clone-indicator::before {
+    content: "\eb3d"; /* bx-link-alt */
 }
 
-span.fancytree-node.shared .fancytree-title::after {
-    font-family: "boxicons" !important;
-    font-size: smaller;
-    content: " \ec03"; /* lookup code for "share-alt" in boxicons.css */
+.note-indicator-icon.shared-indicator::before {
+    content: "\ec03"; /* bx-share-alt */
+}
+
+body.experimental-feature-new-layout .note-indicator-icon.clone-indicator::before {
+    content: "\ed82";
+    opacity: 0.5;
 }
 
 span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-title {
@@ -202,6 +206,7 @@ span.fancytree-selected .fancytree-title {
 }
 
 span.fancytree-selected .fancytree-custom-icon::before {
+    font-family: "boxicons";
     content: "\eb43";
     border: 1px solid var(--main-border-color);
     border-radius: 3px;
@@ -224,11 +229,11 @@ span.fancytree-node.archived {
     opacity: 0.6;
 }
 
-.fancytree-node:hover .bx.tree-item-button {
+.fancytree-node:hover .tn-icon.tree-item-button {
     display: inline-block;
 }
 
-.bx.tree-item-button {
+.tn-icon.tree-item-button {
     display: none;
     font-size: 120%;
     cursor: pointer;
@@ -238,7 +243,7 @@ span.fancytree-node.archived {
     border-radius: 5px;
 }
 
-.unhoist-button.bx.tree-item-button {
+.unhoist-button.tn-icon.tree-item-button {
     margin-inline-start: 0; /* unhoist button is on the left and doesn't need more margin */
     display: block; /* keep always visible */
 }

apps/client/src/test/easy-froca.ts

@@ -1,10 +1,12 @@
-import utils from "../services/utils.js";
+import { NoteType } from "@triliumnext/commons";
+
+import FAttribute from "../entities/fattribute.js";
+import FBlob from "../entities/fblob.js";
+import FBranch from "../entities/fbranch.js";
 import FNote from "../entities/fnote.js";
 import froca from "../services/froca.js";
-import FAttribute from "../entities/fattribute.js";
 import noteAttributeCache from "../services/note_attribute_cache.js";
-import FBranch from "../entities/fbranch.js";
-import FBlob from "../entities/fblob.js";
+import utils from "../services/utils.js";
 
 type AttributeDefinitions = { [key in `#${string}`]: string; };
 type RelationDefinitions = { [key in `~${string}`]: string; };
@@ -12,6 +14,7 @@ type RelationDefinitions = { [key in `~${string}`]: string; };
 interface NoteDefinition extends AttributeDefinitions, RelationDefinitions {
     id?: string | undefined;
     title: string;
+    type?: NoteType;
     children?: NoteDefinition[];
     content?: string;
 }
@@ -45,7 +48,7 @@ export function buildNote(noteDef: NoteDefinition) {
     const note = new FNote(froca, {
         noteId: noteDef.id ?? utils.randomString(12),
         title: noteDef.title,
-        type: "text",
+        type: noteDef.type ?? "text",
         mime: "text/html",
         isProtected: false,
         blobId: ""
@@ -66,24 +69,6 @@ export function buildNote(noteDef: NoteDefinition) {
     });
     note.getBlob = async () => blob;
 
-    // Manage children.
-    if (noteDef.children) {
-        for (const childDef of noteDef.children) {
-            const childNote = buildNote(childDef);
-            const branchId = `${note.noteId}_${childNote.noteId}`;
-            const branch = new FBranch(froca, {
-                branchId,
-                noteId: childNote.noteId,
-                parentNoteId: note.noteId,
-                notePosition: childNotePosition,
-                fromSearchNote: false
-            });
-            froca.branches[branchId] = branch;
-            note.addChild(childNote.noteId, branchId, false);
-            childNotePosition += 10;
-        }
-    }
-
     let position = 0;
     for (const [ key, value ] of Object.entries(noteDef)) {
         const attributeId = utils.randomString(12);
@@ -133,5 +118,25 @@ export function buildNote(noteDef: NoteDefinition) {
         }
         noteAttributeCache.attributes[note.noteId].push(attribute);
     }
+
+    // Manage children.
+    if (noteDef.children) {
+        for (const childDef of noteDef.children) {
+            const childNote = buildNote(childDef);
+            const branchId = `${note.noteId}_${childNote.noteId}`;
+            const branch = new FBranch(froca, {
+                branchId,
+                noteId: childNote.noteId,
+                parentNoteId: note.noteId,
+                notePosition: childNotePosition,
+                fromSearchNote: false
+            });
+            froca.branches[branchId] = branch;
+            note.addChild(childNote.noteId, branchId, false);
+            childNote.addParent(note.noteId, branchId, false);
+            childNotePosition += 10;
+        }
+    }
+
     return note;
 }

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

@@ -11,11 +11,27 @@
   },
   "toast": {
     "critical-error": {
-      "title": "خطأ فادح"
+      "title": "خطأ فادح",
+      "message": "حدث خطأ حرج يمنع تشغيل تطبيق العميل:\n\n{{message}}\n\nيُرجّح أن يكون سبب هذا الخطأ هو تعطل أحد البرامج النصية بشكل غير متوقع. حاول تشغيل التطبيق في الوضع الآمن لحل المشكلة."
     },
     "widget-error": {
-      "title": "فشل في البدء بعنصر الواجهة"
-    }
+      "title": "فشل في البدء بعنصر الواجهة",
+      "message-custom": "تعذر تهيئة عنصر واجهة المستخدم المخصص من الملاحظة ذات المعرّف \"{{id}}\" والعنوان \"{{title}}\" بسبب:\n\n{{message}}",
+      "message-unknown": "تعذر تهيئة عنصر واجهة المستخدم غير المعروف بسبب:\n\n{{message}}"
+    },
+    "bundle-error": {
+      "title": "فشل تحميل البرنامج النصي المخصص",
+      "message": "تعذر تنفيذ البرنامج النصي بسبب:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "فشل في الحصول على قائمة الأدوات من الخادم"
+    },
+    "widget-render-error": {
+      "title": "فشل عرض عنصر واجهة مستخدم React مخصص"
+    },
+    "widget-missing-parent": "لا تحتوي الأداة المخصصة على خاصية إلزامية '{{property}}'.\n\nإذا كان من المفترض تشغيل هذا البرنامج النصي بدون عنصر واجهة مستخدم، فاستخدم '#run=frontendStartup' بدلاً من ذلك.",
+    "open-script-note": "فتح ملاحظة برمجية",
+    "scripting-error": "خطأ في النص البرمجي المخصص: {{title}}"
   },
   "add_link": {
     "add_link": "أضافة رابط",
@@ -23,14 +39,19 @@
     "search_note": "البحث عن الملاحظة بالاسم",
     "link_title": "عنوان الرابط",
     "button_add_link": "اضافة رابط",
-    "help_on_links": "مساعدة حول الارتباطات التشعبية"
+    "help_on_links": "مساعدة حول الارتباطات التشعبية",
+    "link_title_mirrors": "عنوان الرابط يعكس العنوان الحالي للملاحظة",
+    "link_title_arbitrary": "يمكن تغيير عنوان الرابط حسب الرغبة"
   },
   "branch_prefix": {
     "edit_branch_prefix": "تعديل بادئة الفرع",
     "prefix": "البادئة: ",
     "save": "حفظ",
     "help_on_tree_prefix": "مساعدة حول بادئة الشجرة",
-    "branch_prefix_saved": "تم حفظ بادئة الفرع."
+    "branch_prefix_saved": "تم حفظ بادئة الفرع.",
+    "edit_branch_prefix_multiple": "تعديل البادئة لـ {{count}} من تفرعات الملاحظات",
+    "branch_prefix_saved_multiple": "تم حفظ بادئة التفرع لـ {{count}} من التفرعات.",
+    "affected_branches": "الفروع المتأثرة ({{count}}):"
   },
   "bulk_actions": {
     "bulk_actions": "اجراءات جماعية",
@@ -209,7 +230,6 @@
     "backlink_other": ""
   },
   "note_icon": {
-    "category": "الفئة:",
     "search": "بحث:",
     "change_note_icon": "تغيير ايقونة الملاحظة",
     "reset-default": "اعادة تعيين الى الايقونة الافتراضية"
@@ -471,7 +491,6 @@
     "delete_button": "حذف",
     "download_button": "تنزيل",
     "restore_button": "أستعادة",
-    "preview": "معاينة:",
     "note_revisions": "مراجعات الملاحظة",
     "diff_on": "عرض الفروقات",
     "diff_off": "عرض المحتوى",
@@ -1161,9 +1180,6 @@
     "note_not_found": "الملاحظة {{noteId}} غير موجودة!",
     "cannot_match_transform": "تعذر مطابقة التحويل: {{transform}}"
   },
-  "web_view": {
-    "web_view": "عرض الويب"
-  },
   "consistency_checks": {
     "title": "فحوصات التناسق"
   },

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

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

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

@@ -64,8 +64,7 @@
     "restore_button": "Restaura",
     "delete_button": "Suprimeix",
     "download_button": "Descarrega",
-    "mime": "MIME: ",
-    "preview": "Vista prèvia:"
+    "mime": "MIME: "
   },
   "sort_child_notes": {
     "title": "títol",
@@ -146,7 +145,6 @@
     "relation": "relació"
   },
   "note_icon": {
-    "category": "Categoria:",
     "search": "Cerca:"
   },
   "basic_properties": {

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

@@ -21,8 +21,17 @@
     },
     "bundle-error": {
       "title": "加载自定义脚本失败",
-      "message": "来自 ID 为 \"{{id}}\"、标题为 \"{{title}}\" 的笔记的脚本因以下原因无法执行：\n\n{{message}}"
-    }
+      "message": "脚本因以下原因无法执行：\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "无法从服务器取得小部件清单"
+    },
+    "widget-render-error": {
+      "title": "渲染自定义 React 小部件失败"
+    },
+    "widget-missing-parent": "自定义小部件未定义强制性的 \"{{property}}\" 属性。\n\n如果此脚本需要在没有 UI 元素的情况下运行，请改用“#run=frontendStartup”。",
+    "open-script-note": "打开脚本笔记",
+    "scripting-error": "自定义脚本错误：{{title}}"
   },
   "add_link": {
     "add_link": "添加链接",
@@ -281,7 +290,6 @@
     "download_button": "下载",
     "mime": "MIME 类型： ",
     "file_size": "文件大小：",
-    "preview": "预览：",
     "preview_not_available": "无法预览此类型的笔记。",
     "diff_on": "显示差异",
     "diff_off": "显示内容",
@@ -654,7 +662,8 @@
     "show-cheatsheet": "显示快捷帮助",
     "toggle-zen-mode": "禅模式",
     "new-version-available": "新更新可用",
-    "download-update": "取得版本 {{latestVersion}}"
+    "download-update": "取得版本 {{latestVersion}}",
+    "search_notes": "搜索笔记"
   },
   "zen_mode": {
     "button_exit": "退出禅模式"
@@ -693,7 +702,13 @@
     "convert_into_attachment_successful": "笔记 '{{title}}' 已成功转换为附件。",
     "convert_into_attachment_prompt": "确定要将笔记 '{{title}}' 转换为父笔记的附件吗？",
     "print_pdf": "导出为 PDF...",
-    "open_note_on_server": "在服务器上打开笔记"
+    "open_note_on_server": "在服务器上打开笔记",
+    "view_revisions": "笔记修订...",
+    "note_map": "笔记地图",
+    "advanced": "高级",
+    "export_as_image": "导出为图像",
+    "export_as_image_png": "PNG（栅格）",
+    "export_as_image_svg": "SVG（矢量图）"
   },
   "onclick_button": {
     "no_click_handler": "按钮组件'{{componentId}}'没有定义点击处理程序"
@@ -731,7 +746,7 @@
     "button_title": "导出SVG格式图片"
   },
   "relation_map_buttons": {
-    "create_child_note_title": "创建新的子笔记并添加到关系图",
+    "create_child_note_title": "创建子笔记并添加到图",
     "reset_pan_zoom_title": "重置平移和缩放到初始坐标和放大倍率",
     "zoom_in_title": "放大",
     "zoom_out_title": "缩小"
@@ -745,13 +760,21 @@
     "delete_this_note": "删除此笔记",
     "error_cannot_get_branch_id": "无法获取 notePath '{{notePath}}' 的 branchId",
     "error_unrecognized_command": "无法识别的命令 {{command}}",
-    "note_revisions": "笔记历史版本"
+    "note_revisions": "笔记历史版本",
+    "backlinks": "反链",
+    "content_language_switcher": "内容语言: {{language}}"
   },
   "note_icon": {
     "change_note_icon": "更改笔记图标",
-    "category": "类别:",
     "search": "搜索:",
-    "reset-default": "重置为默认图标"
+    "reset-default": "重置为默认图标",
+    "search_placeholder_other": "在 {{count}} 个图标包中搜索 {{number}} 个图标",
+    "search_placeholder_filtered": "在 {{name}} 中搜索 {{number}} 个图标",
+    "filter": "筛选",
+    "filter-none": "所有图标",
+    "filter-default": "默认图标",
+    "icon_tooltip": "{{name}}\n图标包：{{iconPack}}",
+    "no_results": "没有找到图标。"
   },
   "basic_properties": {
     "note_type": "笔记类型",
@@ -778,7 +801,8 @@
     "expand_tooltip": "展开此集合的直接子代（单层深度）。点击右方箭头以查看更多选项。",
     "expand_first_level": "展开直接子代",
     "expand_nth_level": "展开 {{depth}} 层",
-    "expand_all_levels": "展开所有层级"
+    "expand_all_levels": "展开所有层级",
+    "hide_child_notes": "隐藏树中的子笔记"
   },
   "edited_notes": {
     "no_edited_notes_found": "今天还没有编辑过的笔记...",
@@ -791,7 +815,7 @@
     "file_type": "文件类型",
     "file_size": "文件大小",
     "download": "下载",
-    "open": "打开",
+    "open": "用外部程序打开",
     "upload_new_revision": "上传新修订版本",
     "upload_success": "新文件修订版本已上传。",
     "upload_failed": "新文件修订版本上传失败。",
@@ -811,7 +835,8 @@
   },
   "inherited_attribute_list": {
     "title": "继承的属性",
-    "no_inherited_attributes": "没有继承的属性。"
+    "no_inherited_attributes": "没有继承的属性。",
+    "none": "无"
   },
   "note_info_widget": {
     "note_id": "笔记 ID",
@@ -822,7 +847,9 @@
     "note_size_info": "笔记大小提供了该笔记存储需求的粗略估计。它考虑了笔记的内容及其笔记修订历史的内容。",
     "calculate": "计算",
     "subtree_size": "(子树大小: {{size}}, 共计 {{count}} 个笔记)",
-    "title": "笔记信息"
+    "title": "笔记信息",
+    "show_similar_notes": "显示相似的笔记",
+    "mime": "文件类型"
   },
   "note_map": {
     "open_full": "展开显示",
@@ -885,7 +912,9 @@
     "search_parameters": "搜索参数",
     "unknown_search_option": "未知的搜索选项 {{searchOptionName}}",
     "search_note_saved": "搜索笔记已保存到 {{- notePathTitle}}",
-    "actions_executed": "操作已执行。"
+    "actions_executed": "操作已执行。",
+    "view_options": "查看选项：",
+    "option": "选项"
   },
   "similar_notes": {
     "title": "相似笔记",
@@ -1039,11 +1068,6 @@
     "note_detail_render_help_1": "之所以显示此帮助说明，是因为这个类型为渲染 HTML 的笔记没有正常工作所需的关系。",
     "note_detail_render_help_2": "渲染 HTML 笔记类型用于<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">编写脚本</a>。简而言之，您有一份 HTML 代码笔记（可包含一些 JavaScript），然后这个笔记会把页面渲染出来。要使其正常工作，您需要定义一个名为 \"renderNote\" 的<a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">关系</a>指向要渲染的 HTML 笔记。"
   },
-  "web_view": {
-    "web_view": "网页视图",
-    "embed_websites": "网页视图类型的笔记允许您将网站嵌入到 Trilium 中。",
-    "create_label": "首先，请创建一个带有您要嵌入的 URL 地址的标签，例如 #webViewSrc=\"https://www.bing.com\""
-  },
   "backend_log": {
     "refresh": "刷新"
   },
@@ -1392,7 +1416,8 @@
     "description": "描述",
     "reload_app": "重载应用以应用更改",
     "set_all_to_default": "将所有快捷键重置为默认值",
-    "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？"
+    "confirm_reset": "您确定要将所有键盘快捷键重置为默认值吗？",
+    "no_results": "未找到与“{{filter}}”匹配的快捷方式"
   },
   "spellcheck": {
     "title": "拼写检查",
@@ -1427,7 +1452,7 @@
     "will_be_deleted_in": "此附件将在 {{time}} 后自动删除",
     "will_be_deleted_soon": "该附件在不久后将被自动删除",
     "deletion_reason": "，因为该附件未链接在笔记的内容中。为防止被删除，请将附件链接重新添加到内容中或将附件转换为笔记。",
-    "role_and_size": "角色：{{role}}，大小：{{size}}",
+    "role_and_size": "角色：{{role}}，大小：{{size}}，文件类型：{{- mimeType}}",
     "link_copied": "附件链接已复制到剪贴板。",
     "unrecognized_role": "无法识别的附件角色 '{{role}}'。"
   },
@@ -1481,7 +1506,10 @@
     "duplicate": "复制",
     "open-in-popup": "快速编辑",
     "archive": "归档",
-    "unarchive": "解压"
+    "unarchive": "解压",
+    "open-in-a-new-window": "在新窗口中打开",
+    "hide-subtree": "隐藏子树",
+    "show-subtree": "显示子树"
   },
   "shared_info": {
     "help_link": "访问 <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a> 获取帮助。",
@@ -1542,7 +1570,11 @@
   },
   "highlights_list_2": {
     "title": "高亮列表",
-    "options": "选项"
+    "options": "选项",
+    "title_with_count_other": "{{count}} 处高亮",
+    "modal_title": "配置高亮列表",
+    "menu_configure": "配置高亮列表...",
+    "no_highlights": "未找到高亮内容。"
   },
   "quick-search": {
     "placeholder": "快速搜索",
@@ -1566,7 +1598,15 @@
     "create-child-note": "创建子笔记",
     "unhoist": "取消聚焦",
     "toggle-sidebar": "切换侧边栏",
-    "dropping-not-allowed": "不允许移动笔记到此处。"
+    "dropping-not-allowed": "不允许移动笔记到此处。",
+    "shared-indicator-tooltip": "此笔记已公开分享",
+    "shared-indicator-tooltip-with-url": "此笔记已公开分享至：{{- url}}",
+    "clone-indicator-tooltip": "此笔记有 {{- count}} 个父级： {{- parents}}",
+    "clone-indicator-tooltip-single": "此笔记已克隆（1 个额外的父级：{{- parent}}）",
+    "subtree-hidden-tooltip_other": "从树中隐藏的 {{count}} 篇子笔记",
+    "subtree-hidden-moved-title": "已添加到 {{title}}",
+    "subtree-hidden-moved-description-collection": "此集合隐藏其树中的子笔记。",
+    "subtree-hidden-moved-description-other": "子笔记隐藏于此笔记的树中。"
   },
   "title_bar_buttons": {
     "window-on-top": "保持此窗口置顶"
@@ -1574,10 +1614,24 @@
   "note_detail": {
     "could_not_find_typewidget": "找不到类型为 '{{type}}' 的 typeWidget",
     "printing": "正在打印…",
-    "printing_pdf": "正在导出为PDF…"
+    "printing_pdf": "正在导出为PDF…",
+    "print_report_title": "打印报告",
+    "print_report_collection_content_other": "集合中的 {{count}} 篇笔记无法打印，因为它们不受支持或受到保护。",
+    "print_report_collection_details_button": "查看详情",
+    "print_report_collection_details_ignored_notes": "忽略的笔记",
+    "print_report_error_title": "打印失败",
+    "print_report_stack_trace": "堆栈跟踪"
   },
   "note_title": {
-    "placeholder": "请输入笔记标题..."
+    "placeholder": "请输入笔记标题...",
+    "created_on": "建立于 <Value />",
+    "last_modified": "修改于 <Value />",
+    "note_type_switcher_label": "从 {{type}} 切换到:",
+    "note_type_switcher_others": "其他笔记类型",
+    "note_type_switcher_templates": "模板",
+    "note_type_switcher_collection": "集合",
+    "edited_notes": "今天编辑过的笔记",
+    "promoted_attributes": "升级属性"
   },
   "search_result": {
     "no_notes_found": "没有找到符合搜索条件的笔记。",
@@ -1587,7 +1641,11 @@
     "configure_launchbar": "配置启动栏"
   },
   "sql_result": {
-    "no_rows": "此查询没有返回任何数据"
+    "no_rows": "此查询没有返回任何数据",
+    "not_executed": "查询尚未执行。",
+    "failed": "SQL 查询执行失败",
+    "execute_now": "立即执行",
+    "statement_result": "执行结果"
   },
   "sql_table_schemas": {
     "tables": "表"
@@ -1606,7 +1664,8 @@
   },
   "toc": {
     "table_of_contents": "目录",
-    "options": "选项"
+    "options": "选项",
+    "no_headings": "无标题。"
   },
   "watched_file_update_status": {
     "file_last_modified": "文件 <code class=\"file-path\"></code> 最后修改时间为 <span class=\"file-last-modified\"></span>。",
@@ -1725,8 +1784,8 @@
     "desktop-application": "桌面应用程序",
     "native-title-bar": "原生标题栏",
     "native-title-bar-description": "对于 Windows 和 macOS，关闭原生标题栏可使应用程序看起来更紧凑。在 Linux 上，保留原生标题栏可以更好地与系统集成。",
-    "background-effects": "启用背景效果（仅适用于 Windows 11）",
-    "background-effects-description": "Mica 效果为应用窗口添加模糊且时尚的背景，营造出深度感和现代外观。「原生标题栏」必須被禁用。",
+    "background-effects": "启用背景效果",
+    "background-effects-description": "为应用窗口添加模糊且时尚的背景，营造出深度感和现代外观。「原生标题栏」必須被禁用。",
     "restart-app-button": "重启应用程序以查看更改",
     "zoom-factor": "缩放系数"
   },
@@ -1745,7 +1804,8 @@
   "geo-map": {
     "create-child-note-title": "创建一个新的子笔记并将其添加到地图中",
     "create-child-note-instruction": "单击地图以在该位置创建新笔记，或按 Escape 以取消。",
-    "unable-to-load-map": "无法加载地图。"
+    "unable-to-load-map": "无法加载地图。",
+    "create-child-note-text": "添加标记"
   },
   "geo-map-context": {
     "open-location": "打开位置",
@@ -1939,8 +1999,9 @@
     "unknown_widget": "未知组件：\"{{id}}\"."
   },
   "note_language": {
-    "not_set": "不设置",
-    "configure-languages": "设置语言..."
+    "not_set": "未设置语言",
+    "configure-languages": "设置语言...",
+    "help-on-languages": "内容语言帮助..."
   },
   "content_language": {
     "title": "内容语言",
@@ -2007,7 +2068,7 @@
   "book_properties_config": {
     "hide-weekends": "隐藏周末",
     "display-week-numbers": "显示周数",
-    "map-style": "地图样式：",
+    "map-style": "地图样式",
     "max-nesting-depth": "最大嵌套深度：",
     "raster": "栅格",
     "vector_light": "矢量（浅色）",
@@ -2051,7 +2112,7 @@
     "configure_launch_bar_description": "打开启动栏配置，添加或移除项目。"
   },
   "content_renderer": {
-    "open_externally": "在外部打开"
+    "open_externally": "用外部程序打开"
   },
   "modal": {
     "close": "关闭",
@@ -2059,19 +2120,25 @@
   },
   "call_to_action": {
     "background_effects_title": "背景效果现已推出稳定版本",
-    "background_effects_message": "在 Windows 装置上，背景效果现在已完全稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。此技术也用于其他应用程序，例如 Windows 资源管理器。",
+    "background_effects_message": "在 Windows 和 macOS 设备上，背景效果现在已稳定。背景效果通过模糊背后的背景，为使用者界面增添一抹色彩。",
     "background_effects_button": "启用背景效果",
     "next_theme_title": "试用新 Trilium 主题",
     "next_theme_message": "当前使用旧版主题，要试用新主题吗？",
     "next_theme_button": "试用新主题",
-    "dismiss": "关闭"
+    "dismiss": "关闭",
+    "new_layout_message": "我们为 Trilium 引入了现代化的布局。Ribbon 界面已被移除并无缝集成到主界面中，新的状态栏和可展开部分（例如“已提升属性”）取代了其主要功能。\n\n新布局默认启用，您可以通过“选项”→“外观”暂时禁用它。",
+    "new_layout_button": "更多信息",
+    "new_layout_title": "新布局"
   },
   "settings": {
     "related_settings": "相关设置"
   },
   "settings_appearance": {
     "related_code_blocks": "文本笔记中代码块的色彩方案",
-    "related_code_notes": "代码笔记的色彩方案"
+    "related_code_notes": "代码笔记的色彩方案",
+    "ui": "用户界面",
+    "ui_old_layout": "旧布局",
+    "ui_new_layout": "新布局"
   },
   "units": {
     "percentage": "%"
@@ -2086,7 +2153,7 @@
   },
   "pagination": {
     "page_title": "第 {{startIndex}} 页 - 第 {{endIndex}} 页",
-    "total_notes": "{{count}} 笔记"
+    "total_notes": "{{count}} 篇笔记"
   },
   "collections": {
     "rendering_error": "出现错误无法显示内容。"
@@ -2116,5 +2183,95 @@
     "unknown_http_error_title": "与服务器通讯错误",
     "unknown_http_error_content": "状态码: {{statusCode}}\n地址: {{method}} {{url}}\n信息: {{message}}",
     "traefik_blocks_requests": "如果您使用 Traefik 反向代理，它引入了一项影响与服务器的通信重大更改。"
+  },
+  "experimental_features": {
+    "title": "实验选项",
+    "disclaimer": "这些选项处于实验阶段，可能导致系统不稳定。请谨慎使用。",
+    "new_layout_name": "新布局",
+    "new_layout_description": "尝试全新布局，呈现更现代的外观并提升易用性。后续版本将进行重大调整。"
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "返回前一笔记",
+    "go-forward": "前往下一笔记"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "只读",
+    "read_only_auto": "自动只读",
+    "shared_publicly": "公开共享",
+    "shared_locally": "本地共享",
+    "read_only_explicit_description": "此笔记已被手动设置为只读。\n点击可临时编辑。",
+    "read_only_auto_description": "出于性能原因，此笔记已被自动设置为只读模式。此自动限制可以在设置中调整。\n\n点击可临时编辑。",
+    "read_only_temporarily_disabled": "临时编辑",
+    "read_only_temporarily_disabled_description": "此笔记当前可编辑，但通常是只读的。一旦你切换到其他笔记，该笔记将恢复为只读模式。\n\n点击以重新启用只读模式。",
+    "clipped_note": "网页剪辑",
+    "clipped_note_description": "此笔记最初来自 {{url}}。\n\n点击即可跳转至源网页。",
+    "execute_script": "运行脚本",
+    "execute_script_description": "这是一篇脚本笔记。点击即可执行脚本。",
+    "execute_sql": "运行SQL",
+    "execute_sql_description": "这是一篇 SQL 笔记。点击即可执行 SQL 查询。",
+    "shared_copy_to_clipboard": "复制链接到剪贴板",
+    "shared_open_in_browser": "在浏览器中打开链接",
+    "shared_unshare": "取消共享",
+    "save_status_saved": "已保存",
+    "save_status_saving": "保存中...",
+    "save_status_unsaved": "未保存",
+    "save_status_error": "保存失败",
+    "save_status_unsaved_tooltip": "还有一些更改尚未保存。它们将稍后自动保存。",
+    "save_status_error_tooltip": "保存笔记时出错。如果可以，请尝试将笔记内容复制到其他位置并重新加载应用程序。",
+    "save_status_saving_tooltip": "更改正在保存。"
+  },
+  "status_bar": {
+    "language_title": "更改内容语言",
+    "note_info_title": "查看笔记信息（例如日期，笔记大小）",
+    "backlinks_title_other": "查看反链",
+    "attachments_title_other": "在新标签页中查看附件",
+    "attributes_other": "{{count}} 个属性",
+    "attributes_title": "拥有的属性和继承的属性",
+    "note_paths_title": "笔记路径",
+    "code_note_switcher": "更改语言模式",
+    "backlinks_other": "{{count}} 个反链",
+    "attachments_other": "{{count}} 个附件",
+    "note_paths_other": "{{count}} 条路径"
+  },
+  "breadcrumb": {
+    "workspace_badge": "工作空间",
+    "scroll_to_top_title": "跳转到笔记开始",
+    "hoisted_badge_title": "取消聚焦",
+    "hoisted_badge": "聚焦",
+    "create_new_note": "新建子笔记",
+    "empty_hide_archived_notes": "隐藏已存档的笔记"
+  },
+  "right_pane": {
+    "empty_button": "隐藏面板",
+    "toggle": "切换右侧面板",
+    "custom_widget_go_to_source": "跳转到源码",
+    "empty_message": "这篇笔记没有展示内容"
+  },
+  "attributes_panel": {
+    "title": "笔记属性"
+  },
+  "pdf": {
+    "attachments_other": "{{count}} 个附件",
+    "pages_other": "共{{count}}页",
+    "pages_alt": "第{{pageNumber}}页",
+    "pages_loading": "加载中...",
+    "layers_other": "{{count}} 层"
+  },
+  "platform_indicator": {
+    "available_on": "在 {{platform}} 上可用"
+  },
+  "mobile_tab_switcher": {
+    "title_other": "{{count}} 选项卡",
+    "more_options": "更多选项"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "书签"
+  },
+  "web_view_setup": {
+    "title": "直接在 Trilium 中创建网页的实时视图",
+    "url_placeholder": "输入或粘贴网站地址，例如 https://triliumnotes.org",
+    "create_button": "创建网页视图",
+    "invalid_url_title": "无效的地址",
+    "invalid_url_message": "请输入有效的网址，例如 https://triliumnotes.org。"
   }
 }

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

@@ -108,6 +108,11 @@
     "cloned_note_prefix_title": "Klonovaná poznámka se zobrazí ve stromu poznámek s danou předponou",
     "clone_to_selected_note": "Klonovat vybranou poznámku",
     "no_path_to_clone_to": "Žádná cest pro klonování.",
-    "note_cloned": "Poznámka: „{{clonedTitle}}“ bylo naklonováno do „{{targetTitle}}“"
+    "note_cloned": "Poznámka „{{clonedTitle}}“ bylo naklonována do „{{targetTitle}}“"
+  },
+  "zpetne_odkazy": {
+    "backlink_one": "{{count}} zpětný odkaz",
+    "backlink_few": "{{count}} zpětné odkazy",
+    "backlink_other": "{{count}} zpětných odkazů"
   }
 }

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

@@ -21,8 +21,17 @@
     },
     "bundle-error": {
       "title": "Benutzerdefiniertes Skript konnte nicht geladen werden",
-      "message": "Skript aus der Notiz \"{{title}}\" mit der ID \"{{id}}\", konnte nicht ausgeführt werden wegen:\n\n{{message}}"
-    }
+      "message": "Skript konnte nicht ausgeführt werden wegen:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Abruf der Liste von Widgets vom Server ist fehlgeschlagen"
+    },
+    "open-script-note": "Script-Notiz öffnen",
+    "widget-render-error": {
+      "title": "Benutzerdefiniertes React-Widget konnte nicht dargestellt werden"
+    },
+    "widget-missing-parent": "Benutzerdefiniertes Widget hat die erforderliche '{{property}}'-Eigenschaft nicht korrekt definiert.\n\nFalls dieses Skript ohne UI-Element ausgeführt werden soll, benutze stattdessen '#run=frontendStartup'.",
+    "scripting-error": "Benutzerdefinierter Skriptfehler: {{title}}"
   },
   "add_link": {
     "add_link": "Link hinzufügen",
@@ -120,7 +129,7 @@
     "scrollToActiveNote": "Scrolle zur aktiven Notiz",
     "jumpToParentNote": "Zur übergeordneten Notiz springen",
     "collapseWholeTree": "Reduziere den gesamten Notizbaum",
-    "collapseSubTree": "Teilbaum einklappen",
+    "collapseSubTree": "Zweig einklappen",
     "tabShortcuts": "Tab-Tastenkürzel",
     "newTabNoteLink": "auf den Notizlink öffnet die Notiz in einem neuen Tab",
     "onlyInDesktop": "Nur im Desktop (Electron Build)",
@@ -205,7 +214,8 @@
   "info": {
     "modalTitle": "Infonachricht",
     "closeButton": "Schließen",
-    "okButton": "OK"
+    "okButton": "OK",
+    "copy_to_clipboard": "In Zwischenablage kopieren"
   },
   "jump_to_note": {
     "search_button": "Suche im Volltext",
@@ -220,7 +230,7 @@
   "move_to": {
     "dialog_title": "Notizen verschieben nach ...",
     "notes_to_move": "Notizen zum Verschieben",
-    "target_parent_note": "Ziel-Elternnotiz",
+    "target_parent_note": "Übergeordnete Notiz bestimmen",
     "search_placeholder": "Suche nach einer Notiz anhand ihres Namens",
     "move_button": "Zur ausgewählten Notiz wechseln",
     "error_no_path": "Kein Weg, auf den man sich bewegen kann.",
@@ -278,7 +288,6 @@
     "download_button": "Herunterladen",
     "mime": "MIME: ",
     "file_size": "Dateigröße:",
-    "preview": "Vorschau:",
     "preview_not_available": "Für diesen Notiztyp ist keine Vorschau verfügbar.",
     "restore_button": "Wiederherstellen",
     "delete_button": "Löschen",
@@ -324,8 +333,8 @@
     "target_note_title": "Eine Beziehung ist eine benannte Verbindung zwischen Quellnotiz und Zielnotiz.",
     "target_note": "Zielnotiz",
     "promoted_title": "Das heraufgestufte Attribut wird deutlich in der Notiz angezeigt.",
-    "promoted": "Gefördert",
-    "promoted_alias_title": "Der Name, der in der Benutzeroberfläche für heraufgestufte Attribute angezeigt werden soll.",
+    "promoted": "Hervorgehoben",
+    "promoted_alias_title": "Der Name, der in der Benutzeroberfläche für hervorgehobene Attribute angezeigt werden soll.",
     "promoted_alias": "Alias",
     "multiplicity_title": "Multiplizität definiert, wie viele Attribute mit demselben Namen erstellt werden können – maximal 1 oder mehr als 1.",
     "multiplicity": "Vielzahl",
@@ -358,7 +367,7 @@
     "disable_versioning": "deaktiviert die automatische Versionierung. Nützlich z.B. große, aber unwichtige Notizen – z.B. große JS-Bibliotheken, die für die Skripterstellung verwendet werden",
     "calendar_root": "Markiert eine Notiz, die als Basis für Tagesnotizen verwendet werden soll. Nur einer sollte als solcher gekennzeichnet sein.",
     "archived": "Notizen mit dieser Bezeichnung werden standardmäßig nicht in den Suchergebnissen angezeigt (auch nicht in den Dialogen „Springen zu“, „Link hinzufügen“ usw.).",
-    "exclude_from_export": "Notizen (mit ihrem Unterbaum) werden nicht in den Notizexport einbezogen",
+    "exclude_from_export": "Notizen (mit ihrem Unterbaum) werden nicht im Notizexport inkludiert",
     "run": "Definiert, bei welchen Ereignissen das Skript ausgeführt werden soll. Mögliche Werte sind:\n<ul>\n<li>frontendStartup - wenn das Trilium-Frontend startet (oder aktualisiert wird), außer auf mobilen Geräten.</li>\n<li>mobileStartup - wenn das Trilium-Frontend auf einem mobilen Gerät startet (oder aktualisiert wird).</li>\n<li>backendStartup - wenn das Trilium-Backend startet</li>\n<li>hourly - einmal pro Stunde ausführen. Du kannst das zusätzliche Label <code>runAtHour</code> verwenden, um die genaue Stunde festzulegen.</li>\n<li>daily - einmal pro Tag ausführen</li>\n</ul>",
     "run_on_instance": "Definiere, auf welcher Trilium-Instanz dies ausgeführt werden soll. Standardmäßig alle Instanzen.",
     "run_at_hour": "Zu welcher Stunde soll das laufen? Sollte zusammen mit <code>#runu003dhourly</code> verwendet werden. Kann für mehr Läufe im Laufe des Tages mehrfach definiert werden.",
@@ -367,7 +376,7 @@
     "sort_direction": "ASC (Standard) oder DESC",
     "sort_folders_first": "Ordner (Notizen mit Unternotizen) sollten oben sortiert werden",
     "top": "Behalte die angegebene Notiz oben in der übergeordneten Notiz (gilt nur für sortierte übergeordnete Notizen)",
-    "hide_promoted_attributes": "Heraufgestufte Attribute für diese Notiz ausblenden",
+    "hide_promoted_attributes": "Hervorgehobene Attribute für diese Notiz ausblenden",
     "read_only": "Der Editor befindet sich im schreibgeschützten Modus. Funktioniert nur für Text- und Codenotizen.",
     "auto_read_only_disabled": "Text-/Codenotizen können automatisch in den Lesemodus versetzt werden, wenn sie zu groß sind. Du kannst dieses Verhalten für jede einzelne Notiz deaktivieren, indem du diese Beschriftung zur Notiz hinzufügst",
     "app_css": "markiert CSS-Notizen, die in die Trilium-Anwendung geladen werden und somit zur Änderung des Aussehens von Trilium verwendet werden können.",
@@ -407,13 +416,13 @@
     "toc": "<code>#toc</code> oder <code>#tocu003dshow</code> erzwingen die Anzeige des Inhaltsverzeichnisses, <code>#tocu003dhide</code> erzwingt das Ausblenden. Wenn die Bezeichnung nicht vorhanden ist, wird die globale Einstellung beachtet",
     "color": "Definiert die Farbe der Notiz im Notizbaum, in Links usw. Verwende einen beliebigen gültigen CSS-Farbwert wie „rot“ oder #a13d5f",
     "keyboard_shortcut": "Definiert eine Tastenkombination, die sofort zu dieser Notiz springt. Beispiel: „Strg+Alt+E“. Erfordert ein Neuladen des Frontends, damit die Änderung wirksam wird.",
-    "keep_current_hoisting": "Das Öffnen dieses Links ändert das Hochziehen nicht, selbst wenn die Notiz im aktuell hochgezogenen Unterbaum nicht angezeigt werden kann.",
+    "keep_current_hoisting": "Das Öffnen dieses Links ändert das Hochziehen nicht, selbst wenn die Notiz im aktuell hochgezogenen Zweig nicht angezeigt werden kann.",
     "execute_button": "Titel der Schaltfläche, welche die aktuelle Codenotiz ausführt",
     "execute_description": "Längere Beschreibung der aktuellen Codenotiz, die zusammen mit der Schaltfläche „Ausführen“ angezeigt wird",
     "exclude_from_note_map": "Notizen mit dieser Bezeichnung werden in der Notizenkarte ausgeblendet",
     "new_notes_on_top": "Neue Notizen werden oben in der übergeordneten Notiz erstellt, nicht unten.",
-    "hide_highlight_widget": "Widget „Hervorhebungsliste“ ausblenden",
-    "run_on_note_creation": "Wird ausgeführt, wenn eine Notiz im Backend erstellt wird. Verwende diese Beziehung, wenn du das Skript für alle Notizen ausführen möchtest, die unter einer bestimmten Unternotiz erstellt wurden. Erstelle es in diesem Fall auf der Unternotiz-Stammnotiz und mache es vererbbar. Eine neue Notiz, die innerhalb der Unternotiz (beliebige Tiefe) erstellt wird, löst das Skript aus.",
+    "hide_highlight_widget": "Widget „Markierungsliste“ ausblenden",
+    "run_on_note_creation": "Wird ausgeführt, wenn eine Notiz im Backend erstellt wird. Verwende diese Beziehung, wenn du das Skript für alle Notizen ausführen möchtest, die unter einem bestimmten Zweig erstellt wurden. Erstelle es in diesem Fall auf der Stammnotiz und mache es vererbbar. Eine neue Notiz, die innerhalb des Zweigs (beliebige Tiefe) erstellt wird, löst das Skript aus.",
     "run_on_child_note_creation": "Wird ausgeführt, wenn eine neue Notiz unter der Notiz erstellt wird, in der diese Beziehung definiert ist",
     "run_on_note_title_change": "Wird ausgeführt, wenn der Notiztitel geändert wird (einschließlich der Notizerstellung)",
     "run_on_note_content_change": "Wird ausgeführt, wenn der Inhalt einer Notiz geändert wird (einschließlich der Erstellung von Notizen).",
@@ -424,8 +433,8 @@
     "run_on_branch_deletion": "wird ausgeführt, wenn ein Zweig gelöscht wird. Der Zweig ist eine Verknüpfung zwischen der übergeordneten Notiz und der untergeordneten Notiz und wird z. B. gelöscht. beim Verschieben der Notiz (alter Zweig/Link wird gelöscht).",
     "run_on_attribute_creation": "wird ausgeführt, wenn für die Notiz ein neues Attribut erstellt wird, das diese Beziehung definiert",
     "run_on_attribute_change": " wird ausgeführt, wenn das Attribut einer Notiz geändert wird, die diese Beziehung definiert. Dies wird auch ausgelöst, wenn das Attribut gelöscht wird",
-    "relation_template": "Die Attribute der Notiz werden auch ohne eine Eltern-Kind-Beziehung vererbt. Der Inhalt und der Unterbaum der Notiz werden den Instanznotizen hinzugefügt, wenn sie leer sind. Einzelheiten findest du in der Dokumentation.",
-    "inherit": "Die Attribute einer Notiz werden auch ohne eine Eltern-Kind-Beziehung vererbt. Ein ähnliches Konzept findest du unter Vorlagenbeziehung. Siehe Attributvererbung in der Dokumentation.",
+    "relation_template": "Die Attribute der Notiz werden auch ohne eine Hierarchische-Beziehung vererbt. Der Inhalt und der Zweig werden den Instanznotizen hinzugefügt, wenn sie leer sind. Einzelheiten findest du in der Dokumentation.",
+    "inherit": "Die Attribute einer Notiz werden auch ohne eine Hierarchische-Beziehung vererbt. Ein ähnliches Konzept findest du unter Vorlagenbeziehung. Siehe Attributsvererbung in der Dokumentation.",
     "render_note": "Notizen vom Typ \"HTML-Notiz rendern\" werden mit einer Code-Notiz (HTML oder Skript) gerendert, und es ist notwendig, über diese Beziehung anzugeben, welche Notiz gerendert werden soll",
     "widget_relation": "Das Ziel dieser Beziehung wird ausgeführt und als Widget in der Seitenleiste gerendert",
     "share_css": "CSS-Hinweis, der in die Freigabeseite eingefügt wird. Die CSS-Notiz muss sich ebenfalls im gemeinsamen Unterbaum befinden. Erwäge auch die Verwendung von „share_hidden_from_tree“ und „share_omit_default_css“.",
@@ -623,7 +632,7 @@
     "show_toc": "Inhaltsverzeichnis anzeigen"
   },
   "show_highlights_list_widget_button": {
-    "show_highlights_list": "Hervorhebungen anzeigen"
+    "show_highlights_list": "Markierungsliste anzeigen"
   },
   "global_menu": {
     "menu": "Menü",
@@ -636,8 +645,8 @@
     "zoom_out": "Herauszoomen",
     "reset_zoom_level": "Zoomstufe zurücksetzen",
     "zoom_in": "Hineinzoomen",
-    "configure_launchbar": "Konfiguriere die Launchbar",
-    "show_shared_notes_subtree": "Unterbaum „Freigegebene Notizen“ anzeigen",
+    "configure_launchbar": "Konfiguriere die Starterleiste",
+    "show_shared_notes_subtree": "Zweig „Freigegebene Notizen“ anzeigen",
     "advanced": "Erweitert",
     "open_dev_tools": "Öffne die Entwicklungstools",
     "open_sql_console": "Öffne die SQL-Konsole",
@@ -646,14 +655,15 @@
     "show_backend_log": "Backend-Protokoll anzeigen",
     "reload_hint": "Ein Neuladen kann bei einigen visuellen Störungen Abhilfe schaffen, ohne die gesamte App neu starten zu müssen.",
     "reload_frontend": "Frontend neu laden",
-    "show_hidden_subtree": "Versteckten Teilbaum anzeigen",
+    "show_hidden_subtree": "Versteckten Zweig anzeigen",
     "show_help": "Hilfe anzeigen",
     "about": "Über Trilium Notes",
     "logout": "Abmelden",
     "show-cheatsheet": "Cheatsheet anzeigen",
     "toggle-zen-mode": "Zen Modus",
     "new-version-available": "Neues Update verfügbar",
-    "download-update": "Version {{latestVersion}} herunterladen"
+    "download-update": "Version {{latestVersion}} herunterladen",
+    "search_notes": "Notizen durchsuchen"
   },
   "sync_status": {
     "unknown": "<p>Der Synchronisations-Status wird bekannt, sobald der nächste Synchronisierungsversuch gestartet wird.</p><p>Klicke, um eine Synchronisierung jetzt auszulösen.</p>",
@@ -689,7 +699,13 @@
     "convert_into_attachment_successful": "Notiz '{{title}}' wurde als Anhang konvertiert.",
     "convert_into_attachment_prompt": "Bist du dir sicher, dass du die Notiz '{{title}}' in ein Anhang der übergeordneten Notiz konvertieren möchtest?",
     "print_pdf": "Export als PDF...",
-    "open_note_on_server": "Öffne Notiz auf dem Server"
+    "open_note_on_server": "Öffne Notiz auf dem Server",
+    "export_as_image": "Als Bild exportieren",
+    "export_as_image_png": "PNG (Raster)",
+    "export_as_image_svg": "SVG (Vektor)",
+    "note_map": "Notizen Karte",
+    "view_revisions": "Notizrevisionen...",
+    "advanced": "Erweitert"
   },
   "onclick_button": {
     "no_click_handler": "Das Schaltflächen-Widget „{{componentId}}“ hat keinen definierten Klick-Handler"
@@ -705,7 +721,7 @@
     "update_available": "Update verfügbar"
   },
   "note_launcher": {
-    "this_launcher_doesnt_define_target_note": "Dieser Launcher definiert keine Zielnotiz."
+    "this_launcher_doesnt_define_target_note": "Dieser Starter definiert keine Zielnotiz."
   },
   "code_buttons": {
     "execute_button_title": "Skript ausführen",
@@ -727,7 +743,7 @@
     "button_title": "Diagramm als SVG exportieren"
   },
   "relation_map_buttons": {
-    "create_child_note_title": "Erstelle eine neue untergeordnete Notiz und füge sie dieser Beziehungskarte hinzu",
+    "create_child_note_title": "Erstelle eine untergeordnete Notiz und füge sie dieser Karte hinzu",
     "reset_pan_zoom_title": "Schwenken und Zoomen auf die ursprünglichen Koordinaten und Vergrößerung zurücksetzen",
     "zoom_in_title": "Hineinzoom",
     "zoom_out_title": "Herauszoomen"
@@ -742,13 +758,22 @@
     "delete_this_note": "Diese Notiz löschen",
     "error_cannot_get_branch_id": "BranchId für notePath „{{notePath}}“ kann nicht abgerufen werden",
     "error_unrecognized_command": "Unbekannter Befehl {{command}}",
-    "note_revisions": "Notiz Revisionen"
+    "note_revisions": "Notiz Revisionen",
+    "backlinks": "Rücklinks",
+    "content_language_switcher": "Inhaltssprache: {{language}}"
   },
   "note_icon": {
     "change_note_icon": "Notiz-Icon ändern",
-    "category": "Kategorie:",
     "search": "Suche:",
-    "reset-default": "Standard wiederherstellen"
+    "reset-default": "Standard wiederherstellen",
+    "search_placeholder_one": "Suche {{number}} Symbole über {{count}} Pakete",
+    "search_placeholder_other": "Suche {{number}} Symbole über {{count}} Pakete",
+    "search_placeholder_filtered": "Suche {{number}} Icons in {{name}}",
+    "filter": "Filter",
+    "filter-none": "Alle Icons",
+    "filter-default": "Standard Icons",
+    "icon_tooltip": "{{name}}\nIcon Paket: {{iconPack}}",
+    "no_results": "Keine Icons gefunden."
   },
   "basic_properties": {
     "note_type": "Notiztyp",
@@ -775,7 +800,8 @@
     "expand_all_levels": "Alle Ebenen erweitern",
     "expand_tooltip": "Erweitert die direkten Unterelemente dieser Sammlung (eine Ebene tiefer). Für weitere Optionen auf den Pfeil rechts klicken.",
     "expand_first_level": "Direkte Unterelemente erweitern",
-    "expand_nth_level": "{{depth}} Ebenen erweitern"
+    "expand_nth_level": "{{depth}} Ebenen erweitern",
+    "hide_child_notes": "Unternotizen im Baum ausblenden"
   },
   "edited_notes": {
     "no_edited_notes_found": "An diesem Tag wurden noch keine Notizen bearbeitet...",
@@ -788,7 +814,7 @@
     "file_type": "Dateityp",
     "file_size": "Dateigröße",
     "download": "Herunterladen",
-    "open": "Offen",
+    "open": "Extern öffnen",
     "upload_new_revision": "Neue Revision hochladen",
     "upload_success": "Neue Dateirevision wurde hochgeladen.",
     "upload_failed": "Das Hochladen einer neuen Dateirevision ist fehlgeschlagen.",
@@ -808,7 +834,8 @@
   },
   "inherited_attribute_list": {
     "title": "Geerbte Attribute",
-    "no_inherited_attributes": "Keine geerbten Attribute."
+    "no_inherited_attributes": "Keine geerbten Attribute.",
+    "none": "Keine"
   },
   "note_info_widget": {
     "note_id": "Notiz-ID",
@@ -818,8 +845,10 @@
     "note_size": "Notengröße",
     "note_size_info": "Die Notizgröße bietet eine grobe Schätzung des Speicherbedarfs für diese Notiz. Es berücksichtigt den Inhalt der Notiz und den Inhalt ihrer Notizrevisionen.",
     "calculate": "berechnen",
-    "subtree_size": "(Teilbaumgröße: {{size}} in {{count}} Notizen)",
-    "title": "Notizinfo"
+    "subtree_size": "(Zweiggröße: {{size}} in {{count}} Notizen)",
+    "title": "Notizinfo",
+    "mime": "MIME Typ",
+    "show_similar_notes": "Zeige ähnliche Notizen"
   },
   "note_map": {
     "open_full": "Vollständig erweitern",
@@ -845,7 +874,7 @@
     "owned_attributes": "Eigene Attribute"
   },
   "promoted_attributes": {
-    "promoted_attributes": "Übergebene Attribute",
+    "promoted_attributes": "Hervorgehobene Attribute",
     "url_placeholder": "http://website...",
     "open_external_link": "Externen Link öffnen",
     "unknown_label_type": "Unbekannter Labeltyp „{{type}}“",
@@ -882,7 +911,9 @@
     "search_parameters": "Suchparameter",
     "unknown_search_option": "Unbekannte Suchoption {{searchOptionName}}",
     "search_note_saved": "Suchnotiz wurde in {{-notePathTitle}} gespeichert",
-    "actions_executed": "Aktionen wurden ausgeführt."
+    "actions_executed": "Aktionen wurden ausgeführt.",
+    "view_options": "Optionen anzeigen:",
+    "option": "Option"
   },
   "similar_notes": {
     "title": "Ähnliche Notizen",
@@ -986,7 +1017,12 @@
   "editable_text": {
     "placeholder": "Gebe hier den Inhalt deiner Notiz ein...",
     "auto-detect-language": "Automatisch erkannt",
-    "keeps-crashing": "Die Bearbeitungskomponente stürzt immer wieder ab. Bitte starten Sie Trilium neu. Wenn das Problem weiterhin besteht, erstellen Sie einen Fehlerbericht."
+    "keeps-crashing": "Die Bearbeitungskomponente stürzt immer wieder ab. Bitte starten Sie Trilium neu. Wenn das Problem weiterhin besteht, erstellen Sie einen Fehlerbericht.",
+    "editor_crashed_title": "Der Text Editor ist abgestürzt",
+    "editor_crashed_content": "Ihr Inhalt wurde erfolgreich wiederhergestellt, aber kürzlich gemachte Änderungen wurden unter Umständen nicht gespeichert.",
+    "editor_crashed_details_button": "Mehr Details anzeigen...",
+    "editor_crashed_details_intro": "Falls dieser Fehler häufiger auftritt, ziehen Sie in Betracht uns diesen über GitHub zu melden, indem Sie die folgenden Informationen bereitstellen.",
+    "editor_crashed_details_title": "Technische Informationen"
   },
   "empty": {
     "open_note_instruction": "Öffne eine Notiz, indem du den Titel der Notiz in die Eingabe unten eingibst oder eine Notiz in der Baumstruktur auswählst.",
@@ -1031,11 +1067,6 @@
     "note_detail_render_help_1": "Diese Hilfesnotiz wird angezeigt, da diese Notiz vom Typ „HTML rendern“ nicht über die erforderliche Beziehung verfügt, um ordnungsgemäß zu funktionieren.",
     "note_detail_render_help_2": "Render-HTML-Notiztyp wird benutzt für <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. Kurzgesagt, du hast ein HTML-Code-Notiz (optional mit JavaScript) und diese Notiz rendert es. Damit es funktioniert, musst du eine a <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">Beziehung</a> namens \"renderNote\" zeigend auf die HTML-Notiz zum rendern definieren."
   },
-  "web_view": {
-    "web_view": "Webansicht",
-    "embed_websites": "Notiz vom Typ Web View ermöglicht das Einbetten von Websites in Trilium.",
-    "create_label": "Um zu beginnen, erstelle bitte ein Label mit einer URL-Adresse, die eingebettet werden soll, z. B. #webViewSrc=\"https://www.google.com\""
-  },
   "backend_log": {
     "refresh": "Aktualisieren"
   },
@@ -1083,7 +1114,7 @@
   "vacuum_database": {
     "title": "Datenbank aufräumen",
     "description": "Dadurch wird die Datenbank neu erstellt, was normalerweise zu einer kleineren Datenbankdatei führt. Es werden keine Daten tatsächlich geändert.",
-    "button_text": "Vakuumdatenbank",
+    "button_text": "Datenbank aufräumen",
     "vacuuming_database": "Datenbank wird geleert...",
     "database_vacuumed": "Die Datenbank wurde geleert"
   },
@@ -1124,7 +1155,7 @@
   },
   "ribbon": {
     "widgets": "Multifunktionsleisten-Widgets",
-    "promoted_attributes_message": "Die Multifunktionsleisten-Registerkarte „Heraufgestufte Attribute“ wird automatisch geöffnet, wenn in der Notiz heraufgestufte Attribute vorhanden sind",
+    "promoted_attributes_message": "Die „Hervorgehobene Attribute“-Leiste wird automatisch geöffnet, wenn in der Notiz hervorgehobene Attribute vorhanden sind",
     "edited_notes_message": "Die Multifunktionsleisten-Registerkarte „Bearbeitete Notizen“ wird bei Tagesnotizen automatisch geöffnet"
   },
   "theme": {
@@ -1137,7 +1168,7 @@
     "layout": "Layout",
     "layout-vertical-title": "Vertikal",
     "layout-horizontal-title": "Horizontal",
-    "layout-vertical-description": "Startleiste ist auf der linken Seite (standard)",
+    "layout-vertical-description": "Startleiste ist auf der linken Seite (Standard)",
     "layout-horizontal-description": "Startleiste ist unter der Tableiste. Die Tableiste wird dadurch auf die ganze Breite erweitert.",
     "auto_theme": "Alt (Folge dem Farbschema des Systems)",
     "light_theme": "Alt (Hell)",
@@ -1145,7 +1176,7 @@
   },
   "zoom_factor": {
     "title": "Zoomfaktor (nur Desktop-Build)",
-    "description": "Das Zoomen kann auch mit den Tastenkombinationen STRG+- und STRG+u003d gesteuert werden."
+    "description": "Das Zoomen kann auch mit den Tastenkombinationen Strg+- und Strg+= gesteuert werden."
   },
   "code_auto_read_only_size": {
     "title": "Automatische schreibgeschützte Größe",
@@ -1234,16 +1265,16 @@
     "markdown": "Markdown-Stil"
   },
   "highlights_list": {
-    "title": "Highlights-Liste",
-    "description": "Du kannst die im rechten Bereich angezeigte Highlights-Liste anpassen:",
+    "title": "Markierungsliste",
+    "description": "Du kannst die im rechten Bereich angezeigte Markierungsliste anpassen:",
     "bold": "Fettgedruckter Text",
     "italic": "Kursiver Text",
     "underline": "Unterstrichener Text",
     "color": "Farbiger Text",
     "bg_color": "Text mit Hintergrundfarbe",
-    "visibility_title": "Sichtbarkeit der Highlights-Liste",
-    "visibility_description": "Du kannst das Hervorhebungs-Widget pro Notiz ausblenden, indem du die Beschriftung #hideHighlightWidget hinzufügst.",
-    "shortcut_info": "Du kannst eine Tastenkombination zum schnellen Umschalten des rechten Bereichs (einschließlich Hervorhebungen) in den Optionen -> Tastenkombinationen konfigurieren (Name „toggleRightPane“)."
+    "visibility_title": "Sichtbarkeit der Markierungsliste",
+    "visibility_description": "Du kannst das Markierungs-Widget pro Notiz ausblenden, indem du die Beschriftung #hideHighlightWidget hinzufügst.",
+    "shortcut_info": "Du kannst eine Tastenkombination zum schnellen Umschalten des rechten Bereichs (einschließlich Markierungen) in den Optionen -> Tastenkombinationen konfigurieren (Name „toggleRightPane“)."
   },
   "table_of_contents": {
     "title": "Inhaltsverzeichnis",
@@ -1351,7 +1382,8 @@
     "description": "Beschreibung",
     "reload_app": "Lade die App neu, um die Änderungen zu übernehmen",
     "set_all_to_default": "Setze alle Verknüpfungen auf die Standardeinstellungen",
-    "confirm_reset": "Möchtest du wirklich alle Tastaturkürzel auf die Standardeinstellungen zurücksetzen?"
+    "confirm_reset": "Möchtest du wirklich alle Tastaturkürzel auf die Standardeinstellungen zurücksetzen?",
+    "no_results": "Keine Tastenkürzel für '{{filter}}' gefunden"
   },
   "spellcheck": {
     "title": "Rechtschreibprüfung",
@@ -1386,7 +1418,7 @@
     "will_be_deleted_in": "Dieser Anhang wird in {{time}} automatisch gelöscht",
     "will_be_deleted_soon": "Dieser Anhang wird bald automatisch gelöscht",
     "deletion_reason": ", da der Anhang nicht im Inhalt der Notiz verlinkt ist. Um das Löschen zu verhindern, füge den Anhangslink wieder in den Inhalt ein oder wandel den Anhang in eine Notiz um.",
-    "role_and_size": "Rolle: {{role}}, Größe: {{size}}",
+    "role_and_size": "Rolle: {{role}}, Größe: {{size}}, MIME: {{- mimeType}}",
     "link_copied": "Anhangslink in die Zwischenablage kopiert.",
     "unrecognized_role": "Unbekannte Anhangsrolle „{{role}}“."
   },
@@ -1413,19 +1445,19 @@
     "insert-note-after": "Notiz dahinter einfügen",
     "insert-child-note": "Unternotiz einfügen",
     "delete": "Löschen",
-    "search-in-subtree": "Im Notizbaum suchen",
+    "search-in-subtree": "Im Zweig suchen",
     "hoist-note": "Notiz-Fokus setzen",
     "unhoist-note": "Notiz-Fokus aufheben",
     "edit-branch-prefix": "Zweig-Präfix bearbeiten",
     "advanced": "Erweitert",
-    "expand-subtree": "Unterzweig aufklappen",
-    "collapse-subtree": "Notizbaum einklappen",
+    "expand-subtree": "Zweig aufklappen",
+    "collapse-subtree": "Zweig einklappen",
     "sort-by": "Sortieren nach...",
-    "recent-changes-in-subtree": "Kürzliche Änderungen im Notizbaum",
+    "recent-changes-in-subtree": "Kürzliche Änderungen im Zweig",
     "convert-to-attachment": "Als Anhang konvertieren",
     "copy-note-path-to-clipboard": "Notiz-Pfad in die Zwischenablage kopieren",
-    "protect-subtree": "Notizbaum schützen",
-    "unprotect-subtree": "Notizenbaum-Schutz aufheben",
+    "protect-subtree": "Zweig schützen",
+    "unprotect-subtree": "Zweig-Schutz aufheben",
     "copy-clone": "Kopieren / Klonen",
     "clone-to": "Klonen nach...",
     "cut": "Ausschneiden",
@@ -1437,14 +1469,17 @@
     "import-into-note": "In Notiz importieren",
     "apply-bulk-actions": "Massenaktionen anwenden",
     "converted-to-attachments": "{{count}} Notizen wurden als Anhang konvertiert.",
-    "convert-to-attachment-confirm": "Bist du sicher, dass du die ausgewählten Notizen in Anhänge ihrer übergeordneten Notizen umwandeln möchtest?",
+    "convert-to-attachment-confirm": "Bist du sicher, dass du die ausgewählten Notizen in Anhänge ihrer übergeordneten Notizen umwandeln möchtest? Diese Operation wird nur auf Bildnotizes angewandt. Andere Notizen werden übersprungen.",
     "open-in-popup": "Schnellbearbeitung",
     "archive": "Archiviere",
-    "unarchive": "Entarchivieren"
+    "unarchive": "Entarchivieren",
+    "open-in-a-new-window": "In neuem Fenster öffnen",
+    "hide-subtree": "Zweig ausblenden",
+    "show-subtree": "Zweig anzeigen"
   },
   "shared_info": {
-    "shared_publicly": "Diese Notiz ist öffentlich geteilt auf {{- link}}.",
-    "shared_locally": "Diese Notiz ist lokal geteilt auf {{- link}}.",
+    "shared_publicly": "Diese Notiz ist öffentlich freigegeben über {{- link}}.",
+    "shared_locally": "Diese Notiz ist lokal freigegeben über {{- link}}.",
     "help_link": "Für Hilfe besuche <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a>."
   },
   "note_types": {
@@ -1455,12 +1490,12 @@
     "note-map": "Notizkarte",
     "render-note": "Render Notiz",
     "mermaid-diagram": "Mermaid Diagramm",
-    "canvas": "Canvas",
+    "canvas": "Leinwand",
     "web-view": "Webansicht",
     "mind-map": "Mind Map",
     "file": "Datei",
     "image": "Bild",
-    "launcher": "Launcher",
+    "launcher": "Starter",
     "doc": "Dokument",
     "widget": "Widget",
     "confirm-change": "Es is nicht empfehlenswert den Notiz-Typ zu ändern, wenn der Inhalt der Notiz nicht leer ist. Möchtest du dennoch fortfahren?",
@@ -1479,10 +1514,10 @@
     "toggle-off-hint": "Notiz ist geschützt, klicken, um den Schutz aufzuheben"
   },
   "shared_switch": {
-    "shared": "Teilen",
-    "toggle-on-title": "Notiz teilen",
+    "shared": "Freigegeben",
+    "toggle-on-title": "Notiz freigeben",
     "toggle-off-title": "Notiz-Freigabe aufheben",
-    "shared-branch": "Diese Notiz existiert nur als geteilte Notiz, das Aufheben der Freigabe würde sie löschen. Möchtest du fortfahren und die Notiz damit löschen?",
+    "shared-branch": "Diese Notiz existiert nur als freigegebene Notiz, das Aufheben der Freigabe würde sie löschen. Möchtest du fortfahren und die Notiz damit löschen?",
     "inherited": "Die Notiz kann hier nicht von der Freigabe entfernt werden, da sie über Vererbung von einer übergeordneten Notiz geteilt wird."
   },
   "template_switch": {
@@ -1500,8 +1535,13 @@
     "replace_all": "Alle Ersetzen"
   },
   "highlights_list_2": {
-    "title": "Hervorhebungs-Liste",
-    "options": "Optionen"
+    "title": "Markierungsliste",
+    "options": "Optionen",
+    "title_with_count_one": "{{count}} Markierung",
+    "title_with_count_other": "{{count}} Markierungen",
+    "modal_title": "Markierungsliste konfigurieren",
+    "menu_configure": "Markierungsliste konfigurieren…",
+    "no_highlights": "Keine Markierungen gefunden."
   },
   "quick-search": {
     "placeholder": "Schnellsuche",
@@ -1525,7 +1565,16 @@
     "create-child-note": "Unternotiz anlegen",
     "unhoist": "Fokus verlassen",
     "toggle-sidebar": "Seitenleiste ein-/ausblenden",
-    "dropping-not-allowed": "Ablegen von Notizen an dieser Stelle ist nicht zulässig."
+    "dropping-not-allowed": "Ablegen von Notizen an dieser Stelle ist nicht zulässig.",
+    "clone-indicator-tooltip": "Diese Notiz hat {{- count}} übergeordnete Knoten: {{- parents}}",
+    "clone-indicator-tooltip-single": "Diese Notiz ist geklont (1 weitere Quelle: {{- parent}})",
+    "shared-indicator-tooltip": "Diese Notiz ist öffentlich freigegeben",
+    "shared-indicator-tooltip-with-url": "Diese Notiz ist öffentlich freigegeben unter: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} untergeordnete Notiz, die im Baum ausgeblendet ist",
+    "subtree-hidden-tooltip_other": "{{count}} untergeordnete Notizen, die im Baum ausgeblendet sind",
+    "subtree-hidden-moved-title": "Zu {{title}} hinzugefügt",
+    "subtree-hidden-moved-description-collection": "Diese Sammlung blendet ihre Unternotizen im Baum aus.",
+    "subtree-hidden-moved-description-other": "Untergeordnete Notizen sind im Baum für diese Notiz ausgeblendet."
   },
   "title_bar_buttons": {
     "window-on-top": "Dieses Fenster immer oben halten"
@@ -1533,20 +1582,39 @@
   "note_detail": {
     "could_not_find_typewidget": "Konnte typeWidget für Typ ‚{{type}}‘ nicht finden",
     "printing": "Druckvorgang läuft…",
-    "printing_pdf": "PDF-Export läuft…"
+    "printing_pdf": "PDF-Export läuft…",
+    "print_report_title": "Druckreport",
+    "print_report_collection_details_button": "Details anzeigen",
+    "print_report_collection_details_ignored_notes": "Ignorierte Notizen",
+    "print_report_collection_content_one": "{{count}} Notiz in der Sammlung konnte nicht gedruckt werden, weil sie nicht unterstützt oder geschützt ist.",
+    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt oder geschützt sind.",
+    "print_report_error_title": "Druck fehlgeschlagen",
+    "print_report_stack_trace": "Stapelzurückverfolgung"
   },
   "note_title": {
-    "placeholder": "Titel der Notiz hier eingeben…"
+    "placeholder": "Titel der Notiz hier eingeben…",
+    "created_on": "Erstellt am <Value />",
+    "last_modified": "Bearbeitet am <Value />",
+    "note_type_switcher_label": "Ändere von {{type}} zu:",
+    "note_type_switcher_others": "Andere Notizart",
+    "note_type_switcher_templates": "Vorlage",
+    "note_type_switcher_collection": "Sammlung",
+    "edited_notes": "Notizen, bearbeitet an diesem Tag",
+    "promoted_attributes": "Hervorgehobene Attribute"
   },
   "search_result": {
     "no_notes_found": "Es wurden keine Notizen mit den angegebenen Suchparametern gefunden.",
     "search_not_executed": "Die Suche wurde noch nicht ausgeführt. Klicke oben auf „Suchen“, um die Ergebnisse anzuzeigen."
   },
   "spacer": {
-    "configure_launchbar": "Startleiste konfigurieren"
+    "configure_launchbar": "Starterleiste konfigurieren"
   },
   "sql_result": {
-    "no_rows": "Es wurden keine Zeilen für diese Abfrage zurückgegeben"
+    "no_rows": "Es wurden keine Zeilen für diese Abfrage zurückgegeben",
+    "not_executed": "Die Abfrage wurde noch nicht ausgeführt.",
+    "failed": "SQL-Abfrage ist fehlgeschlagen",
+    "execute_now": "Jetzt ausführen",
+    "statement_result": "Abfrageergebnis"
   },
   "sql_table_schemas": {
     "tables": "Tabellen"
@@ -1565,7 +1633,8 @@
   },
   "toc": {
     "table_of_contents": "Inhaltsverzeichnis",
-    "options": "Optionen"
+    "options": "Optionen",
+    "no_headings": "Keine Überschriften."
   },
   "watched_file_update_status": {
     "file_last_modified": "Datei <code class=\"file-path\"></code> wurde zuletzt geändert am <span class=\"file-last-modified\"></span>.",
@@ -1616,16 +1685,16 @@
     "confirm_unhoisting": "Die angeforderte Notiz ‚{{requestedNote}}‘ befindet sich außerhalb des hoisted Bereichs der Notiz ‚{{hoistedNote}}‘. Du musst sie unhoisten, um auf die Notiz zuzugreifen. Möchtest du mit dem Unhoisting fortfahren?"
   },
   "launcher_context_menu": {
-    "reset_launcher_confirm": "Möchtest du „{{title}}“ wirklich zurücksetzen? Alle Daten / Einstellungen in dieser Notiz (und ihren Unternotizen) gehen verloren und der Launcher wird an seinen ursprünglichen Standort zurückgesetzt.",
-    "add-note-launcher": "Launcher für Notiz hinzufügen",
-    "add-script-launcher": "Launcher für Skript hinzufügen",
+    "reset_launcher_confirm": "Möchtest du „{{title}}“ wirklich zurücksetzen? Alle Daten / Einstellungen in dieser Notiz (und ihren Unternotizen) gehen verloren und der Starter wird an seinen ursprünglichen Standort zurückgesetzt.",
+    "add-note-launcher": "Notiz-Starter hinzufügen",
+    "add-script-launcher": "Skript-Starter hinzufügen",
     "add-custom-widget": "Benutzerdefiniertes Widget hinzufügen",
-    "add-spacer": "Spacer hinzufügen",
+    "add-spacer": "Abstandhalter hinzufügen",
     "delete": "Löschen <kbd data-command=\"deleteNotes\"></kbd>",
     "reset": "Zurücksetzen",
-    "move-to-visible-launchers": "Zu sichtbaren Launchern verschieben",
-    "move-to-available-launchers": "Zu verfügbaren Launchern verschieben",
-    "duplicate-launcher": "Launcher duplizieren <kbd data-command=\"duplicateSubtree\">"
+    "move-to-visible-launchers": "Zu sichtbaren Startern verschieben",
+    "move-to-available-launchers": "Zu verfügbaren Startern verschieben",
+    "duplicate-launcher": "Starter duplizieren <kbd data-command=\"duplicateSubtree\">"
   },
   "highlighting": {
     "description": "Steuert die Syntaxhervorhebung für Codeblöcke in Textnotizen, Code-Notizen sind nicht betroffen.",
@@ -1634,7 +1703,7 @@
   },
   "code_block": {
     "word_wrapping": "Wortumbruch",
-    "theme_none": "Keine Syntax-Hervorhebung",
+    "theme_none": "Keine Syntaxhervorhebung",
     "theme_group_light": "Helle Themen",
     "theme_group_dark": "Dunkle Themen",
     "copy_title": "Kopiere in Zwischenablage"
@@ -1677,14 +1746,15 @@
     "open_note_in_new_tab": "Notiz in neuen Tab öffnen",
     "open_note_in_new_split": "Notiz in neuen geteilten Tab öffnen",
     "open_note_in_new_window": "Notiz in neuen Fenster öffnen",
-    "open_note_in_popup": "Schnellbearbeitung"
+    "open_note_in_popup": "Schnellbearbeitung",
+    "open_note_in_other_split": "Notiz in neuer Spalte öffnen"
   },
   "electron_integration": {
     "desktop-application": "Desktop Anwendung",
     "native-title-bar": "Native Anwendungsleiste",
     "native-title-bar-description": "In Windows und macOS, sorgt das Deaktivieren der nativen Anwendungsleiste für ein kompakteres Aussehen. Unter Linux, sorgt das Aktivieren der nativen Anwendungsleiste für eine bessere Integration mit anderen Teilen des Systems.",
-    "background-effects": "Hintergrundeffekte aktivieren (nur Windows 11)",
-    "background-effects-description": "Der Mica Effekt fügt einen unscharfen, stylischen Hintergrund in Anwendungsfenstern ein. Dieser erzeugt Tiefe und ein modernes Auftreten. \"Native Titelleiste\" muss deaktiviert sein.",
+    "background-effects": "Hintergrundeffekte aktivieren",
+    "background-effects-description": "Fügt einen unscharfen, stylischen Hintergrund in das Anwendungsfenstern ein. Dies erzeugt Tiefe und ein modernes Auftreten. \"Native Titelleiste\" muss deaktiviert sein.",
     "restart-app-button": "Anwendung neustarten um Änderungen anzuwenden",
     "zoom-factor": "Zoomfaktor"
   },
@@ -1703,7 +1773,8 @@
   "geo-map": {
     "create-child-note-title": "Neue Unternotiz anlegen und zur Karte hinzufügen",
     "create-child-note-instruction": "Auf die Karte klicken, um eine neue Notiz an der Stelle zu erstellen oder Escape drücken um abzubrechen.",
-    "unable-to-load-map": "Karte konnte nicht geladen werden."
+    "unable-to-load-map": "Karte konnte nicht geladen werden.",
+    "create-child-note-text": "Marker hinzufügen"
   },
   "geo-map-context": {
     "open-location": "Ort öffnen",
@@ -1932,7 +2003,7 @@
     "check_share_root": "Status des Freigabe-Roots prüfen",
     "share_root_found": "Freigabe-Root-Notiz '{{noteTitle}}' ist bereit",
     "share_root_not_found": "Keine Notiz mit #shareRoot Label gefunden",
-    "share_root_not_shared": "Notiz '{{noteTitle}}' hat das #shareRoot Label, wurde jedoch noch nicht geteilt"
+    "share_root_not_shared": "Notiz '{{noteTitle}}' hat das #shareRoot Label, wurde jedoch noch nicht freigegeben"
   },
   "tasks": {
     "due": {
@@ -1945,8 +2016,9 @@
     "unknown_widget": "Unbekanntes Widget für '{{id}}'."
   },
   "note_language": {
-    "not_set": "Nicht gesetzt",
-    "configure-languages": "Konfiguriere Sprachen..."
+    "not_set": "Keine Sprache ausgewählt",
+    "configure-languages": "Konfiguriere Sprachen...",
+    "help-on-languages": "Zu Übersetzungen beitragen..."
   },
   "content_language": {
     "title": "Inhaltssprachen",
@@ -1964,7 +2036,8 @@
     "button_title": "Exportiere Diagramm als PNG"
   },
   "svg": {
-    "export_to_png": "Das Diagramm konnte als PNG nicht exportiert werden."
+    "export_to_png": "Das Diagramm konnte als PNG nicht exportiert werden.",
+    "export_to_svg": "Das Diagramm konnte nicht als SVG exportiert werden."
   },
   "code_theme": {
     "title": "Aussehen",
@@ -2012,7 +2085,7 @@
   "book_properties_config": {
     "hide-weekends": "Wochenenden ausblenden",
     "display-week-numbers": "Zeige Kalenderwoche",
-    "map-style": "Kartenstil:",
+    "map-style": "Kartenstil",
     "max-nesting-depth": "Maximale Verschachtelungstiefe:",
     "raster": "Raster",
     "vector_light": "Vektor (Hell)",
@@ -2048,8 +2121,8 @@
     "show_attachments_description": "Notizanhänge anzeigen",
     "search_notes_title": "Suche Notiz",
     "search_notes_description": "Öffne erweiterte Suche",
-    "search_subtree_title": "Im Unterzweig suchen",
-    "search_subtree_description": "Im aktuellen Unterzweig suchen",
+    "search_subtree_title": "Im Zweig suchen",
+    "search_subtree_description": "Im aktuellen Zweig suchen",
     "search_history_title": "Zeige Suchhistorie",
     "search_history_description": "Zeige vorherige Suchen",
     "configure_launch_bar_title": "Startleiste anpassen",
@@ -2063,16 +2136,22 @@
     "next_theme_message": "Es wird aktuell das alte Design verwendet. Möchten Sie das neue Design ausprobieren?",
     "next_theme_button": "Teste das neue Design",
     "background_effects_title": "Hintergrundeffekte sind jetzt zuverlässig nutzbar",
-    "background_effects_message": "Auf Windows-Geräten sind die Hintergrundeffekte nun vollständig stabil. Die Hintergrundeffekte verleihen der Benutzeroberfläche einen Farbakzent, indem der Hintergrund dahinter weichgezeichnet wird. Diese Technik wird auch in anderen Anwendungen wie dem Windows-Explorer eingesetzt.",
+    "background_effects_message": "Auf Windows- und macOS-Geräten sind die Hintergrundeffekte nun stabil. Die Hintergrundeffekte verleihen der Benutzeroberfläche einen Farbakzent, indem der Hintergrund dahinter weichgezeichnet wird.",
     "background_effects_button": "Aktiviere Hintergrundeffekte",
-    "dismiss": "Ablehnen"
+    "dismiss": "Ablehnen",
+    "new_layout_title": "Neues Layout",
+    "new_layout_message": "Wir haben ein modernisiertes Layout für Trilium eingeführt. Die Multifunktionsleiste wurde entfernt und als neue Statusanzeige und ausklappbaren Sektionen (wie hervorgehobenen Attributen), welche Schlüsselfunktionen übernehmen, nahtlos in das Hauptinterface integriert.\n\nDas neue Layout ist standardmäßig aktiviert und kann temporär in Optionen → Anzeige deaktiviert werden.",
+    "new_layout_button": "Mehr Informationen"
   },
   "settings": {
     "related_settings": "Ähnliche Einstellungen"
   },
   "settings_appearance": {
     "related_code_blocks": "Farbschema für Code-Blöcke in Textnotizen",
-    "related_code_notes": "Farbschema für Code-Notizen"
+    "related_code_notes": "Farbschema für Code-Notizen",
+    "ui": "Benutzeroberfläche",
+    "ui_old_layout": "Altes Layout",
+    "ui_new_layout": "Neues Layout"
   },
   "units": {
     "percentage": "%"
@@ -2104,5 +2183,110 @@
   },
   "popup-editor": {
     "maximize": "Wechsele zum vollständigen Editor"
+  },
+  "experimental_features": {
+    "title": "Experimentelle Optionen",
+    "disclaimer": "Diese Optionen sind experimentell und können Instabilitäten verursachen. Achtsam zu verwenden.",
+    "new_layout_name": "Neues Layout",
+    "new_layout_description": "Probiere das neue Layout für eine modernere Darstellung und verbesserte Benutzbarkeit aus. Kann sich in Zukunft stark ändern."
+  },
+  "server": {
+    "unknown_http_error_title": "Kommunikationsfehler mit dem Server",
+    "unknown_http_error_content": "Statuscode: {{statusCode}}\nURL: {{method}} {{url}}\nNachricht: {{message}}",
+    "traefik_blocks_requests": "Der Traefik Reverse-Proxy hat eine Änderung erfahren, welches die Kommunikation mit dem Server beeinflusst."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Zur vorherigen Notiz zurück kehren",
+    "go-forward": "Zur nächsten Notiz"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Gehoben",
+    "hoisted_badge_title": "Abgesenkt",
+    "workspace_badge": "Arbeitsfläche",
+    "scroll_to_top_title": "Zum Anfang der Notiz springen",
+    "create_new_note": "Neue Unternotiz erstellen",
+    "empty_hide_archived_notes": "Archivierte Notizen ausblenden"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Schreibgeschützt",
+    "read_only_explicit_description": "Diese Notiz wurde händisch schreibgeschützt.\nKlicke hier um sie temporär zu bearbeiten.",
+    "read_only_auto": "Automatisch schreibgeschützt",
+    "read_only_auto_description": "Diese Notiz wurde automatisch aus Leistungsgründen als schreibgeschützt markiert. Dieses automatische Limit kann in den Einstellungen angepasst werden.\n\nKlicke hier, um sie temporär zu bearbeiten.",
+    "read_only_temporarily_disabled": "Temporär bearbeitbar",
+    "read_only_temporarily_disabled_description": "Diese Notiz ist aktuell bearbeitbar, ist aber normalerweise schreibgeschützt. Sobald du zu einer anderen Notiz navigierst wird diese wieder schreibgeschützt.\n\nKlicke hier, um die Notiz wieder schreibgeschützt zu machen.",
+    "shared_publicly": "Öffentlich freigegeben",
+    "shared_locally": "Lokal freigegeben",
+    "shared_copy_to_clipboard": "Link in die Zwischenablage kopieren",
+    "shared_open_in_browser": "Link im Browser öffnen",
+    "shared_unshare": "Freigabe aufheben",
+    "clipped_note": "Internetschnellverweis",
+    "clipped_note_description": "Diese Notiz wurde von {{url}} übernommen.\n\nKlicke hier, um zur Quelle zu gehen.",
+    "execute_script": "Skript ausführen",
+    "execute_script_description": "Diese Notiz ist eine Skriptnotiz. Klicke hier, um das Skript auszuführen.",
+    "execute_sql": "SQL ausführen",
+    "execute_sql_description": "Diese Notiz ist eine SQL-Notiz. Klicke hier, um die SQL-Abfrage auszuführen.",
+    "save_status_saved": "Gespeichert",
+    "save_status_saving": "Speichere...",
+    "save_status_unsaved": "Nicht gespeichert",
+    "save_status_error": "Speichern fehlgeschlagen",
+    "save_status_saving_tooltip": "Änderungen werden gespeichert.",
+    "save_status_unsaved_tooltip": "Es gibt ungespeicherte Änderungen, welche gleich automatisch gespeichert werden.",
+    "save_status_error_tooltip": "Beim speichern der Notiz ist ein Fehler aufgetreten. Wenn möglich, versuche die Notiz woandershin zu kopieren und die Anwendung neu zu laden."
+  },
+  "status_bar": {
+    "language_title": "Inhaltssprache ändern",
+    "note_info_title": "Notizinfo anzeigen (z.B.: Datum, Notizgröße)",
+    "backlinks_one": "{{count}} Rücklink",
+    "backlinks_other": "{{count}} Rücklinks",
+    "backlinks_title_one": "Rücklink anzeigen",
+    "backlinks_title_other": "Rücklinks anzeigen",
+    "attachments_one": "{{count}} Anhang",
+    "attachments_other": "{{count}} Anhänge",
+    "attachments_title_one": "Anhang in einem neuen Tab öffnen",
+    "attachments_title_other": "Anhänge in einem neuen Tab öffnen",
+    "attributes_one": "{{count}} Attribut",
+    "attributes_other": "{{count}} Attribute",
+    "attributes_title": "Eigene und geerbte Attribute",
+    "note_paths_one": "{{count}} Pfad",
+    "note_paths_other": "{{count}} Pfade",
+    "note_paths_title": "Notizpfade",
+    "code_note_switcher": "Sprachmodus ändern"
+  },
+  "attributes_panel": {
+    "title": "Notizattribute"
+  },
+  "right_pane": {
+    "empty_message": "Für diese Notiz gibt es nichts anzuzeigen",
+    "empty_button": "Leiste ausblenden",
+    "toggle": "Rechte Leiste umschalten",
+    "custom_widget_go_to_source": "Zum Quellcode"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} Anhang",
+    "attachments_other": "{{count}} Anhänge",
+    "layers_one": "{{count}} Ebene",
+    "layers_other": "{{count}} Ebenen",
+    "pages_one": "{{count}} Seite",
+    "pages_other": "{{count}} Seiten",
+    "pages_alt": "Seite {{pageNumber}}",
+    "pages_loading": "Lädt..."
+  },
+  "platform_indicator": {
+    "available_on": "Verfügbar auf {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} Tab",
+    "title_other": "{{count}} Tabs",
+    "more_options": "Weitere Optionen"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Lesezeichen"
+  },
+  "web_view_setup": {
+    "title": "Erstelle eine Live-Ansicht einer Webseite direkt in Trilium",
+    "url_placeholder": "Gib oder füge die Adresse der Webseite ein, zum Beispiel https://triliumnotes.org",
+    "create_button": "Erstelle Web Ansicht",
+    "invalid_url_title": "Ungültige Adresse",
+    "invalid_url_message": "Füge eine valide Webadresse ein, zum Beispiel https://triliumnotes.org."
   }
 }

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

@@ -13,6 +13,61 @@
     "critical-error": {
       "title": "Κρίσιμο σφάλμα",
       "message": "Συνέβη κάποιο κρίσιμο σφάλμα, το οποίο δεν επιτρέπει στην εφαρμογή χρήστη να ξεκινήσει:\n\n{{message}}\n\nΤο πιθανότερο είναι να προκλήθηκε από κάποιο script που απέτυχε απρόοπτα. Δοκιμάστε να ξεκινήσετε την εφαρμογή σε ασφαλή λειτουργία για να λύσετε το πρόβλημα."
-    }
+    },
+    "widget-error": {
+      "title": "Δεν ήταν δυνατή η αρχικοποίηση του widget",
+      "message-custom": "Προσαρμοσμένο widget της σημείωσης με ID \"{{id}}\", με τίτλο \"{{title}}\", δεν ήταν δυνατό να αρχικοποιηθεί λόγω:\n\n{{message}}",
+      "message-unknown": "Άγνωστο widget δεν ήταν δυνατό να αρχικοποιηθεί λόγω:\n\n{{message}}"
+    },
+    "bundle-error": {
+      "title": "Δεν ήταν δυνατή η φόρτωση προσαρμοσμένου script",
+      "message": "Το script δεν ήταν δυνατό να εκτελεστεί λόγω:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Δεν ήταν δυνατή η λήψη της λίστας των widgets από τον server"
+    },
+    "widget-render-error": {
+      "title": "Δεν ήταν δυνατή η απόδοση προσαρμοσμένου React widget"
+    },
+    "widget-missing-parent": "Το προσαρμοσμένο widget δεν έχει ορισμένη την υποχρεωτική ιδιότητα '{{property}}'.\n\nΕάν το script προορίζεται για εκτέλεση χωρίς UI element, χρησιμοποιήστε '#run=frontendStartup' αντί για αυτό.",
+    "open-script-note": "Άνοιγμα σημείωσης script",
+    "scripting-error": "Σφάλμα προσαρμοσμένου script: {{title}}"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Σελιδοδείκτες"
+  },
+  "add_link": {
+    "add_link": "Προσθήκη συνδέσμου",
+    "help_on_links": "Βοήθεια για συνδέσμους",
+    "note": "Σημείωση",
+    "search_note": "Αναζήτηση σημείωσης με βάση το όνομά της",
+    "link_title_mirrors": "Ο τίτλος του συνδέσμου αντικατοπτρίζει τον τρέχοντα τίτλο της σημείωσης",
+    "link_title_arbitrary": "Ο τίτλος του συνδέσμου μπορεί να τροποποιηθεί ελεύθερα",
+    "link_title": "Τίτλος συνδέσμου",
+    "button_add_link": "Προσθήκη συνδέσμου"
+  },
+  "branch_prefix": {
+    "edit_branch_prefix": "Επεξεργασία προθέματος κλάδου",
+    "edit_branch_prefix_multiple": "Επεξεργασία προθέματος κλάδου για {{count}} κλάδους",
+    "help_on_tree_prefix": "Βοήθεια για πρόθεμα δέντρου",
+    "prefix": "Πρόθεμα: ",
+    "save": "Αποθήκευση",
+    "branch_prefix_saved": "Το πρόθεμα κλάδου αποθηκεύτηκε.",
+    "branch_prefix_saved_multiple": "Το πρόθεμα κλάδου αποθηκεύτηκε για {{count}} κλάδους.",
+    "affected_branches": "Επηρεαζόμενοι κλάδοι ({{count}}):"
+  },
+  "bulk_actions": {
+    "bulk_actions": "Μαζικές ενέργειες",
+    "affected_notes": "Επηρεαζόμενες σημειώσεις",
+    "include_descendants": "Συμπερίληψη απογόνων των επιλεγμένων σημειώσεων",
+    "available_actions": "Διαθέσιμες ενέργειες",
+    "chosen_actions": "Επιλεγμένες ενέργειες",
+    "execute_bulk_actions": "Εκτέλεση μαζικών ενεργειών",
+    "bulk_actions_executed": "Οι μαζικές ενέργειες εκτελέστηκαν επιτυχώς.",
+    "none_yet": "Καμία ακόμη… προσθέστε μια ενέργεια επιλέγοντας μία από τις διαθέσιμες παραπάνω.",
+    "labels": "Ετικέτες",
+    "relations": "Συσχετίσεις",
+    "notes": "Σημειώσεις",
+    "other": "Λοιπά"
   }
 }

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

@@ -69,5 +69,8 @@
     "clear-color": "Clear note colour",
     "set-color": "Set note colour",
     "set-custom-color": "Set custom note colour"
+  },
+  "about": {
+    "title": "About Trilium Notes"
   }
 }

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

@@ -21,8 +21,17 @@
     },
     "bundle-error": {
       "title": "Failed to load a custom script",
-      "message": "Script from note with ID \"{{id}}\", titled \"{{title}}\" could not be executed due to:\n\n{{message}}"
-    }
+      "message": "Script could not be executed due to:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Failed to obtain the list of widgets from the server"
+    },
+    "widget-render-error": {
+      "title": "Failed to render a custom React widget"
+    },
+    "widget-missing-parent": "Custom widget does not have mandatory '{{property}}' property defined.\n\nIf this script is meant to be run without a UI element, use '#run=frontendStartup' instead.",
+    "open-script-note": "Open script note",
+    "scripting-error": "Custom script error: {{title}}"
   },
   "add_link": {
     "add_link": "Add link",
@@ -286,7 +295,6 @@
     "download_button": "Download",
     "mime": "MIME: ",
     "file_size": "File size:",
-    "preview": "Preview:",
     "preview_not_available": "Preview isn't available for this note type."
   },
   "sort_child_notes": {
@@ -654,7 +662,8 @@
     "show-cheatsheet": "Show Cheatsheet",
     "toggle-zen-mode": "Zen Mode",
     "new-version-available": "New Update Available",
-    "download-update": "Get Version {{latestVersion}}"
+    "download-update": "Get Version {{latestVersion}}",
+    "search_notes": "Search notes"
   },
   "zen_mode": {
     "button_exit": "Exit Zen Mode"
@@ -689,11 +698,17 @@
     "export_note": "Export note",
     "delete_note": "Delete note",
     "print_note": "Print note",
+    "view_revisions": "Note revisions...",
     "save_revision": "Save revision",
+    "advanced": "Advanced",
     "convert_into_attachment_failed": "Converting note '{{title}}' failed.",
     "convert_into_attachment_successful": "Note '{{title}}' has been converted to attachment.",
     "convert_into_attachment_prompt": "Are you sure you want to convert note '{{title}}' into an attachment of the parent note?",
-    "print_pdf": "Export as PDF..."
+    "print_pdf": "Export as PDF...",
+    "export_as_image": "Export as image",
+    "export_as_image_png": "PNG (raster)",
+    "export_as_image_svg": "SVG (vector)",
+    "note_map": "Note map"
   },
   "onclick_button": {
     "no_click_handler": "Button widget '{{componentId}}' has no defined click handler"
@@ -731,7 +746,7 @@
     "button_title": "Export diagram as SVG"
   },
   "relation_map_buttons": {
-    "create_child_note_title": "Create new child note and add it into this relation map",
+    "create_child_note_title": "Create child note and add it to map",
     "reset_pan_zoom_title": "Reset pan & zoom to initial coordinates and magnification",
     "zoom_in_title": "Zoom In",
     "zoom_out_title": "Zoom Out"
@@ -746,13 +761,22 @@
     "delete_this_note": "Delete this note",
     "note_revisions": "Note revisions",
     "error_cannot_get_branch_id": "Cannot get branchId for notePath '{{notePath}}'",
-    "error_unrecognized_command": "Unrecognized command {{command}}"
+    "error_unrecognized_command": "Unrecognized command {{command}}",
+    "backlinks": "Backlinks",
+    "content_language_switcher": "Content language: {{language}}"
   },
   "note_icon": {
     "change_note_icon": "Change note icon",
-    "category": "Category:",
     "search": "Search:",
-    "reset-default": "Reset to default icon"
+    "search_placeholder_one": "Search {{number}} icons across {{count}} packs",
+    "search_placeholder_other": "Search {{number}} icons across {{count}} packs",
+    "search_placeholder_filtered": "Search {{number}} icons in {{name}}",
+    "reset-default": "Reset to default icon",
+    "filter": "Filter",
+    "filter-none": "All icons",
+    "filter-default": "Default icons",
+    "icon_tooltip": "{{name}}\nIcon pack: {{iconPack}}",
+    "no_results": "No icons found."
   },
   "basic_properties": {
     "note_type": "Note type",
@@ -779,7 +803,8 @@
     "geo-map": "Geo Map",
     "board": "Board",
     "presentation": "Presentation",
-    "include_archived_notes": "Show archived notes"
+    "include_archived_notes": "Show archived notes",
+    "hide_child_notes": "Hide child notes in tree"
   },
   "edited_notes": {
     "no_edited_notes_found": "No edited notes on this day yet...",
@@ -792,7 +817,7 @@
     "file_type": "File type",
     "file_size": "File size",
     "download": "Download",
-    "open": "Open",
+    "open": "Open externally",
     "upload_new_revision": "Upload new revision",
     "upload_success": "New file revision has been uploaded.",
     "upload_failed": "Upload of a new file revision failed.",
@@ -812,18 +837,21 @@
   },
   "inherited_attribute_list": {
     "title": "Inherited Attributes",
-    "no_inherited_attributes": "No inherited attributes."
+    "no_inherited_attributes": "No inherited attributes.",
+    "none": "none"
   },
   "note_info_widget": {
     "note_id": "Note ID",
     "created": "Created",
     "modified": "Modified",
     "type": "Type",
+    "mime": "MIME type",
     "note_size": "Note size",
     "note_size_info": "Note size provides rough estimate of storage requirements for this note. It takes into account note's content and content of its note revisions.",
     "calculate": "calculate",
     "subtree_size": "(subtree size: {{size}} in {{count}} notes)",
-    "title": "Note Info"
+    "title": "Note Info",
+    "show_similar_notes": "Show similar notes"
   },
   "note_map": {
     "open_full": "Expand to full",
@@ -880,13 +908,15 @@
     "debug": "debug",
     "debug_description": "Debug will print extra debugging information into the console to aid in debugging complex queries",
     "action": "action",
+    "option": "option",
     "search_button": "Search",
     "search_execute": "Search & Execute actions",
     "save_to_note": "Save to note",
     "search_parameters": "Search Parameters",
     "unknown_search_option": "Unknown search option {{searchOptionName}}",
     "search_note_saved": "Search note has been saved into {{- notePathTitle}}",
-    "actions_executed": "Actions have been executed."
+    "actions_executed": "Actions have been executed.",
+    "view_options": "View options:"
   },
   "similar_notes": {
     "title": "Similar Notes",
@@ -1037,13 +1067,21 @@
     "click_on_canvas_to_place_new_note": "Click on canvas to place new note"
   },
   "render": {
-    "note_detail_render_help_1": "This help note is shown because this note of type Render HTML doesn't have required relation to function properly.",
-    "note_detail_render_help_2": "Render HTML note type is used for <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. In short, you have a HTML code note (optionally with some JavaScript) and this note will render it. To make it work, you need to define a <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relation</a> called \"renderNote\" pointing to the HTML note to render."
+    "setup_title": "Display custom HTML or Preact JSX inside this note",
+    "setup_create_sample_preact": "Create sample note with Preact",
+    "setup_create_sample_html": "Create sample note with HTML",
+    "setup_sample_created": "A sample note was created as a child note.",
+    "disabled_description": "This render notes comes from an external source. To protect you from malicious content, it is not enabled by default. Make sure you trust the source before enabling it.",
+    "disabled_button_enable": "Enable render note"
   },
-  "web_view": {
-    "web_view": "Web View",
-    "embed_websites": "Note of type Web View allows you to embed websites into Trilium.",
-    "create_label": "To start, please create a label with a URL address you want to embed, e.g. #webViewSrc=\"https://www.google.com\""
+  "web_view_setup": {
+    "title": "Create a live view of a webpage directly into Trilium",
+    "url_placeholder": "Enter or paste the website address, for example https://triliumnotes.org",
+    "create_button": "Create Web View",
+    "invalid_url_title": "Invalid address",
+    "invalid_url_message": "Insert a valid web address, for example https://triliumnotes.org.",
+    "disabled_description": "This web view was imported from an external source. To help protect you from phishing or malicious content, it isn’t loading automatically. You can enable it if you trust the source.",
+    "disabled_button_enable": "Enable web view"
   },
   "backend_log": {
     "refresh": "Refresh"
@@ -1096,6 +1134,12 @@
     "vacuuming_database": "Vacuuming database...",
     "database_vacuumed": "Database has been vacuumed"
   },
+  "experimental_features": {
+    "title": "Experimental Options",
+    "disclaimer": "These options are experimental and may cause instability. Use with caution.",
+    "new_layout_name": "New Layout",
+    "new_layout_description": "Try out the new layout for a more modern look and improved usability. Subject to heavy change in the upcoming releases."
+  },
   "fonts": {
     "theme_defined": "Theme defined",
     "fonts": "Fonts",
@@ -1553,7 +1597,8 @@
     "description": "Description",
     "reload_app": "Reload app to apply changes",
     "set_all_to_default": "Set all shortcuts to the default",
-    "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?"
+    "confirm_reset": "Do you really want to reset all keyboard shortcuts to the default?",
+    "no_results": "No shortcuts found matching '{{filter}}'"
   },
   "spellcheck": {
     "title": "Spell Check",
@@ -1588,7 +1633,7 @@
     "will_be_deleted_in": "This attachment will be automatically deleted in {{time}}",
     "will_be_deleted_soon": "This attachment will be automatically deleted soon",
     "deletion_reason": ", because the attachment is not linked in the note's content. To prevent deletion, add the attachment link back into the content or convert the attachment into note.",
-    "role_and_size": "Role: {{role}}, Size: {{size}}",
+    "role_and_size": "Role: {{role}}, size: {{size}}, MIME: {{- mimeType}}",
     "link_copied": "Attachment link copied to clipboard.",
     "unrecognized_role": "Unrecognized attachment role '{{role}}'."
   },
@@ -1612,6 +1657,7 @@
   "tree-context-menu": {
     "open-in-a-new-tab": "Open in a new tab",
     "open-in-a-new-split": "Open in a new split",
+    "open-in-a-new-window": "Open in a new window",
     "insert-note-after": "Insert note after",
     "insert-child-note": "Insert child note",
     "archive": "Archive",
@@ -1624,6 +1670,8 @@
     "advanced": "Advanced",
     "expand-subtree": "Expand subtree",
     "collapse-subtree": "Collapse subtree",
+    "hide-subtree": "Hide subtree",
+    "show-subtree": "Show subtree",
     "sort-by": "Sort by...",
     "recent-changes-in-subtree": "Recent changes in subtree",
     "convert-to-attachment": "Convert to attachment",
@@ -1708,7 +1756,12 @@
   },
   "highlights_list_2": {
     "title": "Highlights List",
-    "options": "Options"
+    "title_with_count_one": "{{count}} highlight",
+    "title_with_count_other": "{{count}} highlights",
+    "options": "Options",
+    "modal_title": "Configure Highlights List",
+    "menu_configure": "Configure highlights list...",
+    "no_highlights": "No highlights found."
   },
   "quick-search": {
     "placeholder": "Quick search",
@@ -1732,7 +1785,16 @@
     "create-child-note": "Create child note",
     "unhoist": "Unhoist",
     "toggle-sidebar": "Toggle sidebar",
-    "dropping-not-allowed": "Dropping notes into this location is not allowed."
+    "dropping-not-allowed": "Dropping notes into this location is not allowed.",
+    "clone-indicator-tooltip": "This note has {{- count}} parents: {{- parents}}",
+    "clone-indicator-tooltip-single": "This note is cloned (1 additional parent: {{- parent}})",
+    "shared-indicator-tooltip": "This note is shared publicly",
+    "shared-indicator-tooltip-with-url": "This note is shared publicly at: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} child note that is hidden from the tree",
+    "subtree-hidden-tooltip_other": "{{count}} child notes that are hidden from the tree",
+    "subtree-hidden-moved-title": "Added to {{title}}",
+    "subtree-hidden-moved-description-collection": "This collection hides its child notes in the tree.",
+    "subtree-hidden-moved-description-other": "Child notes are hidden in the tree for this note."
   },
   "title_bar_buttons": {
     "window-on-top": "Keep Window on Top"
@@ -1740,10 +1802,25 @@
   "note_detail": {
     "could_not_find_typewidget": "Could not find typeWidget for type '{{type}}'",
     "printing": "Printing in progress...",
-    "printing_pdf": "Exporting to PDF in progress..."
+    "printing_pdf": "Exporting to PDF in progress...",
+    "print_report_title": "Print report",
+    "print_report_error_title": "Failed to print",
+    "print_report_stack_trace": "Stack trace",
+    "print_report_collection_content_one": "{{count}} note in the collection could not be printed because they are not supported or they are protected.",
+    "print_report_collection_content_other": "{{count}} notes in the collection could not be printed because they are not supported or they are protected.",
+    "print_report_collection_details_button": "See details",
+    "print_report_collection_details_ignored_notes": "Ignored notes"
   },
   "note_title": {
-    "placeholder": "type note's title here..."
+    "placeholder": "type note's title here...",
+    "created_on": "Created on <Value />",
+    "last_modified": "Modified on <Value />",
+    "note_type_switcher_label": "Switch from {{type}} to:",
+    "note_type_switcher_others": "Other note type",
+    "note_type_switcher_templates": "Template",
+    "note_type_switcher_collection": "Collection",
+    "edited_notes": "Notes edited on this day",
+    "promoted_attributes": "Promoted attributes"
   },
   "search_result": {
     "no_notes_found": "No notes have been found for given search parameters.",
@@ -1753,7 +1830,11 @@
     "configure_launchbar": "Configure Launchbar"
   },
   "sql_result": {
-    "no_rows": "No rows have been returned for this query"
+    "not_executed": "The query has not been executed yet.",
+    "no_rows": "No rows have been returned for this query",
+    "failed": "SQL query execution has failed",
+    "statement_result": "Statement result",
+    "execute_now": "Execute now"
   },
   "sql_table_schemas": {
     "tables": "Tables"
@@ -1772,7 +1853,8 @@
   },
   "toc": {
     "table_of_contents": "Table of Contents",
-    "options": "Options"
+    "options": "Options",
+    "no_headings": "No headings."
   },
   "watched_file_update_status": {
     "file_last_modified": "File <code class=\"file-path\"></code> has been last modified on <span class=\"file-last-modified\"></span>.",
@@ -1891,8 +1973,8 @@
     "desktop-application": "Desktop Application",
     "native-title-bar": "Native title bar",
     "native-title-bar-description": "For Windows and macOS, keeping the native title bar off makes the application look more compact. On Linux, keeping the native title bar on integrates better with the rest of the system.",
-    "background-effects": "Enable background effects (Windows 11 only)",
-    "background-effects-description": "The Mica effect adds a blurred, stylish background to app windows, creating depth and a modern look. \"Native title bar\" must be disabled.",
+    "background-effects": "Enable background effects",
+    "background-effects-description": "Adds a blurred, stylish background to app windows, creating depth and a modern look. \"Native title bar\" must be disabled.",
     "restart-app-button": "Restart the application to view the changes",
     "zoom-factor": "Zoom factor"
   },
@@ -1910,6 +1992,7 @@
   },
   "geo-map": {
     "create-child-note-title": "Create a new child note and add it to the map",
+    "create-child-note-text": "Add marker",
     "create-child-note-instruction": "Click on the map to create a new note at that location or press Escape to dismiss.",
     "unable-to-load-map": "Unable to load map."
   },
@@ -1953,8 +2036,9 @@
     "unknown_widget": "Unknown widget for \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "Not set",
-    "configure-languages": "Configure languages..."
+    "not_set": "No language set",
+    "configure-languages": "Configure languages...",
+    "help-on-languages": "Help on content languages..."
   },
   "content_language": {
     "title": "Content languages",
@@ -2021,12 +2105,13 @@
   "book_properties_config": {
     "hide-weekends": "Hide weekends",
     "display-week-numbers": "Display week numbers",
-    "map-style": "Map style:",
+    "map-style": "Map style",
     "max-nesting-depth": "Max nesting depth:",
     "raster": "Raster",
     "vector_light": "Vector (Light)",
     "vector_dark": "Vector (Dark)",
-    "show-scale": "Show scale"
+    "show-scale": "Show scale",
+    "show-labels": "Show marker names"
   },
   "table_context_menu": {
     "delete_row": "Delete row"
@@ -2084,8 +2169,11 @@
     "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_message": "On Windows and macOS devices, background effects are now stable. The background effects adds a touch of color to the user interface by blurring the background behind it.",
     "background_effects_button": "Enable background effects",
+    "new_layout_title": "New layout",
+    "new_layout_message": "We’ve introduced a modernized layout for Trilium. The ribbon has been removed and seamlessly integrated into the main interface, with a new status bar and expandable sections (such as promoted attributes) taking over key functions.\n\nThe new layout is enabled by default, and can be temporarily disabled via Options → Appearance.",
+    "new_layout_button": "More info",
     "dismiss": "Dismiss"
   },
   "settings": {
@@ -2093,14 +2181,18 @@
   },
   "settings_appearance": {
     "related_code_blocks": "Color scheme for code blocks in text notes",
-    "related_code_notes": "Color scheme for code notes"
+    "related_code_notes": "Color scheme for code notes",
+    "ui": "User interface",
+    "ui_old_layout": "Old layout",
+    "ui_new_layout": "New layout"
   },
   "units": {
     "percentage": "%"
   },
   "pagination": {
-    "page_title": "Page of {{startIndex}} - {{endIndex}}",
-    "total_notes": "{{count}} notes"
+    "total_notes": "{{count}} notes",
+    "prev_page": "Previous page",
+    "next_page": "Next page"
   },
   "collections": {
     "rendering_error": "Unable to show content due to an error."
@@ -2121,5 +2213,115 @@
   "tab_history_navigation_buttons": {
     "go-back": "Go back to previous note",
     "go-forward": "Go forward to next note"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Hoisted",
+    "hoisted_badge_title": "Unhoist",
+    "workspace_badge": "Workspace",
+    "scroll_to_top_title": "Jump to the beginning of the note",
+    "create_new_note": "Create new child note",
+    "empty_hide_archived_notes": "Hide archived notes"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Read-only",
+    "read_only_explicit_description": "This note has been manually set to read-only.\nClick to edit it temporarily.",
+    "read_only_auto": "Auto read-only",
+    "read_only_auto_description": "This note was set automatically to read-only mode for performance reasons. This automatic limit is adjustable from settings.\n\nClick to edit it temporarily.",
+    "read_only_temporarily_disabled": "Temporarily editable",
+    "read_only_temporarily_disabled_description": "This note is currently editable, but it is normally read-only. The note will go back to being read-only as soon as you navigate to another note.\n\nClick to re-enable read-only mode.",
+    "shared_publicly": "Shared publicly",
+    "shared_locally": "Shared locally",
+    "shared_copy_to_clipboard": "Copy link to clipboard",
+    "shared_open_in_browser": "Open link in browser",
+    "shared_unshare": "Remove share",
+    "clipped_note": "Web clip",
+    "clipped_note_description": "This note was originally taken from {{url}}.\n\nClick to navigate to the source webpage.",
+    "execute_script": "Run script",
+    "execute_script_description": "This note is a script note. Click to execute the script.",
+    "execute_sql": "Run SQL",
+    "execute_sql_description": "This note is a SQL note. Click to execute the SQL query.",
+    "save_status_saved": "Saved",
+    "save_status_saving": "Saving...",
+    "save_status_unsaved": "Unsaved",
+    "save_status_error": "Save failed",
+    "save_status_saving_tooltip": "Changes are being saved.",
+    "save_status_unsaved_tooltip": "There are unsaved changes. They will be saved automatically in a moment.",
+    "save_status_error_tooltip": "An error occurred while saving the note. If possible, try copying the note content elsewhere and reloading the application."
+  },
+  "status_bar": {
+    "language_title": "Change content language",
+    "note_info_title": "View note info (e.g., dates, note size)",
+    "backlinks_one": "{{count}} backlink",
+    "backlinks_other": "{{count}} backlinks",
+    "backlinks_title_one": "View backlink",
+    "backlinks_title_other": "View backlinks",
+    "attachments_one": "{{count}} attachment",
+    "attachments_other": "{{count}} attachments",
+    "attachments_title_one": "View attachment in a new tab",
+    "attachments_title_other": "View attachments in a new tab",
+    "attributes_one": "{{count}} attribute",
+    "attributes_other": "{{count}} attributes",
+    "attributes_title": "Owned attributes and inherited attributes",
+    "note_paths_one": "{{count}} path",
+    "note_paths_other": "{{count}} paths",
+    "note_paths_title": "Note paths",
+    "code_note_switcher": "Change language mode"
+  },
+  "attributes_panel": {
+    "title": "Note Attributes"
+  },
+  "right_pane": {
+    "empty_message": "Nothing to show for this note",
+    "empty_button": "Hide the panel",
+    "toggle": "Toggle right panel",
+    "custom_widget_go_to_source": "Go to source code"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} attachment",
+    "attachments_other": "{{count}} attachments",
+    "layers_one": "{{count}} layer",
+    "layers_other": "{{count}} layers",
+    "pages_one": "{{count}} page",
+    "pages_other": "{{count}} pages",
+    "pages_alt": "Page {{pageNumber}}",
+    "pages_loading": "Loading..."
+  },
+  "platform_indicator": {
+    "available_on": "Available on {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} tab",
+    "title_other": "{{count}} tabs",
+    "more_options": "More options"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Bookmarks"
+  },
+  "active_content_badges": {
+    "type_icon_pack": "Icon pack",
+    "type_backend_script": "Backend script",
+    "type_frontend_script": "Frontend script",
+    "type_widget": "Widget",
+    "type_app_css": "Custom CSS",
+    "type_render_note": "Render note",
+    "type_web_view": "Web view",
+    "type_app_theme": "Custom theme",
+    "toggle_tooltip_enable_tooltip": "Click to enable this {{type}}.",
+    "toggle_tooltip_disable_tooltip": "Click to disable this {{type}}.",
+    "menu_docs": "Open documentation",
+    "menu_execute_now": "Execute script now",
+    "menu_run": "Run automatically",
+    "menu_run_disabled": "Manually",
+    "menu_run_backend_startup": "When the backend starts up",
+    "menu_run_hourly": "Hourly",
+    "menu_run_daily": "Daily",
+    "menu_run_frontend_startup": "When the desktop frontend starts up",
+    "menu_run_mobile_startup": "When the mobile frontend starts up",
+    "menu_change_to_widget": "Change to widget",
+    "menu_change_to_frontend_script": "Change to frontend script",
+    "menu_theme_base": "Theme base"
+  },
+  "setup_form": {
+    "more_info": "Learn more"
   }
 }

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

@@ -21,8 +21,17 @@
     },
     "bundle-error": {
       "title": "Hubo un fallo al cargar un script personalizado",
-      "message": "El script de la nota con ID \"{{id}}\", titulado \"{{title}}\" no pudo ser ejecutado debido a:\n\n{{message}}"
-    }
+      "message": "El script no pudo ser ejecutado debido a:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Hubo un fallo al obtener la lista de widgets del servidor"
+    },
+    "widget-render-error": {
+      "title": "Hubo un fallo al renderizar un widget personalizado de React"
+    },
+    "widget-missing-parent": "El widget personalizado no tiene definida la propiedad obligatoria '{{property}}'.\n\nSi este script está pensado para ejecutarse sin un elemento de interfaz de usuario, utilice '#run=frontendStartup' en su lugar.",
+    "open-script-note": "Abrir script",
+    "scripting-error": "Error en script personalizado: {{title}}"
   },
   "add_link": {
     "add_link": "Agregar enlace",
@@ -162,7 +171,8 @@
     "other": "Otro",
     "quickSearch": "centrarse en la entrada de búsqueda rápida",
     "inPageSearch": "búsqueda en la página",
-    "title": "Hoja de ayuda"
+    "title": "Hoja de ayuda",
+    "editShortcuts": "Editar atajos de teclado"
   },
   "import": {
     "importIntoNote": "Importar a nota",
@@ -204,7 +214,8 @@
   "info": {
     "modalTitle": "Mensaje informativo",
     "closeButton": "Cerrar",
-    "okButton": "Aceptar"
+    "okButton": "Aceptar",
+    "copy_to_clipboard": "Copiar al portapapeles"
   },
   "jump_to_note": {
     "search_button": "Buscar en texto completo",
@@ -279,7 +290,6 @@
     "download_button": "Descargar",
     "mime": "MIME: ",
     "file_size": "Tamaño del archivo:",
-    "preview": "Vista previa:",
     "preview_not_available": "La vista previa no está disponible para este tipo de notas.",
     "diff_off": "Mostrar contenido",
     "diff_on": "Mostrar diferencia",
@@ -652,7 +662,8 @@
     "show-cheatsheet": "Mostrar hoja de trucos",
     "toggle-zen-mode": "Modo Zen",
     "new-version-available": "Nueva actualización disponible",
-    "download-update": "Obtener versión {{latestVersion}}"
+    "download-update": "Obtener versión {{latestVersion}}",
+    "search_notes": "Buscar notas"
   },
   "zen_mode": {
     "button_exit": "Salir del modo Zen"
@@ -691,7 +702,13 @@
     "convert_into_attachment_successful": "La nota '{{title}}' ha sido convertida a un archivo adjunto.",
     "convert_into_attachment_prompt": "¿Está seguro que desea convertir la nota '{{title}}' en un archivo adjunto de la nota padre?",
     "print_pdf": "Exportar como PDF...",
-    "open_note_on_server": "Abrir nota en el servidor"
+    "open_note_on_server": "Abrir nota en servidor",
+    "view_revisions": "Revisiones de la nota...",
+    "advanced": "Avanzado",
+    "export_as_image": "Exportar como imagen",
+    "export_as_image_png": "PNG (ráster)",
+    "export_as_image_svg": "SVG (vectorial)",
+    "note_map": "Mapa de la nota"
   },
   "onclick_button": {
     "no_click_handler": "El widget de botón '{{componentId}}' no tiene un controlador de clics definido"
@@ -729,7 +746,7 @@
     "button_title": "Exportar diagrama como SVG"
   },
   "relation_map_buttons": {
-    "create_child_note_title": "Crear una nueva subnota y agregarla a este mapa de relaciones",
+    "create_child_note_title": "Crear una subnota y agregarla al mapa",
     "reset_pan_zoom_title": "Restablecer la panorámica y el zoom a las coordenadas y ampliación iniciales",
     "zoom_in_title": "Acercar",
     "zoom_out_title": "Alejar"
@@ -737,21 +754,31 @@
   "zpetne_odkazy": {
     "relation": "relación",
     "backlink_one": "{{count}} Vínculo de retroceso",
-    "backlink_many": "",
-    "backlink_other": "{{count}} vínculos de retroceso"
+    "backlink_many": "{{count}} Vínculos de retroceso",
+    "backlink_other": "{{count}} Vínculos de retroceso"
   },
   "mobile_detail_menu": {
     "insert_child_note": "Insertar subnota",
     "delete_this_note": "Eliminar esta nota",
     "error_cannot_get_branch_id": "No se puede obtener el branchID del notePath '{{notePath}}'",
     "error_unrecognized_command": "Comando no reconocido {{command}}",
-    "note_revisions": "Revisiones de notas"
+    "note_revisions": "Revisiones de notas",
+    "backlinks": "Vínculos de retroceso",
+    "content_language_switcher": "Idioma de contenido: {{language}}"
   },
   "note_icon": {
     "change_note_icon": "Cambiar icono de nota",
-    "category": "Categoría:",
     "search": "Búsqueda:",
-    "reset-default": "Restablecer a icono por defecto"
+    "reset-default": "Restablecer a icono por defecto",
+    "search_placeholder_one": "Buscar {{number}} icono a través de {{count}} paquetes",
+    "search_placeholder_many": "Buscar {{number}} iconos a través de {{count}} paquetes",
+    "search_placeholder_other": "Buscar {{number}} iconos a través de {{count}} paquetes",
+    "search_placeholder_filtered": "Buscar {{number}} iconos en {{name}}",
+    "filter": "Filtro",
+    "filter-none": "Todos los iconos",
+    "filter-default": "Iconos predeterminados",
+    "icon_tooltip": "{{name}}\nPaquete de iconos: {{iconPack}}",
+    "no_results": "No se encontraron iconos."
   },
   "basic_properties": {
     "note_type": "Tipo de nota",
@@ -775,10 +802,11 @@
     "board": "Tablero",
     "include_archived_notes": "Mostrar notas archivadas",
     "presentation": "Presentación",
-    "expand_tooltip": "Expande las notas hijas inmediatas de esta colección (un nivel). Para más opciones, pulsa la flecha a la derecha.",
+    "expand_tooltip": "Expande las subnotas inmediatas de esta colección (un nivel). Para más opciones, pulsa la flecha a la derecha.",
     "expand_first_level": "Expandir hijos inmediatos",
     "expand_nth_level": "Expandir {{depth}} niveles",
-    "expand_all_levels": "Expandir todos los niveles"
+    "expand_all_levels": "Expandir todos los niveles",
+    "hide_child_notes": "Ocultar subnotas en el árbol"
   },
   "edited_notes": {
     "no_edited_notes_found": "Aún no hay notas editadas en este día...",
@@ -791,7 +819,7 @@
     "file_type": "Tipo de archivo",
     "file_size": "Tamaño del archivo",
     "download": "Descargar",
-    "open": "Abrir",
+    "open": "Abrir externamente",
     "upload_new_revision": "Subir nueva revisión",
     "upload_success": "Se ha subido una nueva revisión de archivo.",
     "upload_failed": "Error al cargar una nueva revisión de archivo.",
@@ -811,7 +839,8 @@
   },
   "inherited_attribute_list": {
     "title": "Atributos heredados",
-    "no_inherited_attributes": "Sin atributos heredados."
+    "no_inherited_attributes": "Sin atributos heredados.",
+    "none": "ninguno"
   },
   "note_info_widget": {
     "note_id": "ID de nota",
@@ -822,7 +851,9 @@
     "note_size_info": "El tamaño de la nota proporciona una estimación aproximada de los requisitos de almacenamiento para esta nota. Toma en cuenta el contenido de la nota y el contenido de sus revisiones de nota.",
     "calculate": "calcular",
     "subtree_size": "(tamaño del subárbol: {{size}} en {{count}} notas)",
-    "title": "Información de nota"
+    "title": "Información de nota",
+    "mime": "Tipo MIME",
+    "show_similar_notes": "Mostrar notas similares"
   },
   "note_map": {
     "open_full": "Ampliar al máximo",
@@ -885,7 +916,9 @@
     "search_parameters": "Parámetros de búsqueda",
     "unknown_search_option": "Opción de búsqueda desconocida {{searchOptionName}}",
     "search_note_saved": "La nota de búsqueda se ha guardado en {{- notePathTitle}}",
-    "actions_executed": "Las acciones han sido ejecutadas."
+    "actions_executed": "Las acciones han sido ejecutadas.",
+    "view_options": "Ver opciones:",
+    "option": "opción"
   },
   "similar_notes": {
     "title": "Notas similares",
@@ -988,7 +1021,13 @@
   },
   "editable_text": {
     "placeholder": "Escribe aquí el contenido de tu nota...",
-    "auto-detect-language": "Detectado automáticamente"
+    "auto-detect-language": "Detectado automáticamente",
+    "editor_crashed_title": "El editor de texto ha dejado de responder",
+    "editor_crashed_content": "Su contenido ha sido recuperado con éxito, pero puede que algunos de sus cambios más recientes no se hayan guardado.",
+    "editor_crashed_details_button": "Ver más detalles...",
+    "editor_crashed_details_intro": "Si experimenta este error varias veces, considere informarlo en GitHub adjuntando la siguiente información.",
+    "editor_crashed_details_title": "Información técnica",
+    "keeps-crashing": "El componente de edición sigue fallando. Por favor, intente reiniciar Trilium. Si el problema persiste, considere crear un informe de fallos."
   },
   "empty": {
     "open_note_instruction": "Abra una nota escribiendo el título de la nota en la entrada a continuación o elija una nota en el árbol.",
@@ -1033,11 +1072,6 @@
     "note_detail_render_help_1": "Esta nota de ayuda se muestra porque esta nota de tipo Renderizar HTML no tiene la relación requerida para funcionar correctamente.",
     "note_detail_render_help_2": "El tipo de nota Render HTML es usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. De forma resumida, tiene una nota con código HTML (opcionalmente con algo de JavaScript) y esta nota la renderizará. Para que funcione, es necesario definir una <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relación</a> llamada \"renderNote\" apuntando a la nota HTML nota a renderizar."
   },
-  "web_view": {
-    "web_view": "Vista web",
-    "embed_websites": "La nota de tipo Web View le permite insertar sitios web en Trilium.",
-    "create_label": "Para comenzar, por favor cree una etiqueta con una dirección URL que desee empotrar, e.g. #webViewSrc=\"https://www.google.com\""
-  },
   "backend_log": {
     "refresh": "Refrescar"
   },
@@ -1304,11 +1338,11 @@
   "code_mime_types": {
     "title": "Tipos MIME disponibles en el menú desplegable",
     "tooltip_syntax_highlighting": "Resaltado de sintaxis",
-    "tooltip_code_block_syntax": "Bloques de código en notas de texto",
+    "tooltip_code_block_syntax": "Bloques de código en Notas de texto",
     "tooltip_code_note_syntax": "Notas de código"
   },
   "vim_key_bindings": {
-    "use_vim_keybindings_in_code_notes": "Atajos de teclas de Vim",
+    "use_vim_keybindings_in_code_notes": "Combinaciones de teclas Vim",
     "enable_vim_keybindings": "Habilitar los atajos de teclas de Vim en la notas de código (no es modo ex)"
   },
   "wrap_lines": {
@@ -1382,16 +1416,16 @@
     "markdown": "Estilo Markdown"
   },
   "highlights_list": {
-    "title": "Lista de aspectos destacados",
-    "description": "Puede personalizar la lista de aspectos destacados que se muestra en el panel derecho:",
+    "title": "Lista de puntos destacados",
+    "description": "Puede personalizar la lista de puntos destacados que se muestra en el panel derecho:",
     "bold": "Texto en negrita",
     "italic": "Texto en cursiva",
     "underline": "Texto subrayado",
     "color": "Texto con color",
     "bg_color": "Texto con color de fondo",
-    "visibility_title": "Visibilidad de la lista de aspectos destacados",
-    "visibility_description": "Puede ocultar el widget de aspectos destacados por nota agregando una etiqueta #hideHighlightWidget.",
-    "shortcut_info": "Puede configurar un método abreviado de teclado para alternar rápidamente el panel derecho (incluidos los aspectos destacados) en Opciones -> Atajos (nombre 'toggleRightPane')."
+    "visibility_title": "Visibilidad de la lista de puntos destacados",
+    "visibility_description": "Puede ocultar el widget de puntos destacados por nota agregando la etiqueta #hideHighlightWidget.",
+    "shortcut_info": "Puede configurar un método abreviado de teclado para alternar rápidamente el panel derecho (incluidos los puntos destacados) en Opciones -> Atajos (nombre 'toggleRightPane')."
   },
   "table_of_contents": {
     "title": "Tabla de contenido",
@@ -1538,7 +1572,8 @@
     "description": "Descripción",
     "reload_app": "Vuelva a cargar la aplicación para aplicar los cambios",
     "set_all_to_default": "Establecer todos los accesos directos al valor predeterminado",
-    "confirm_reset": "¿Realmente desea restablecer todos los atajos de teclado a sus valores predeterminados?"
+    "confirm_reset": "¿Realmente desea restablecer todos los atajos de teclado a sus valores predeterminados?",
+    "no_results": "No se encontraron atajos que coincidan con '{{filter}} '"
   },
   "spellcheck": {
     "title": "Revisión ortográfica",
@@ -1573,13 +1608,13 @@
     "will_be_deleted_in": "Este archivo adjunto se eliminará automáticamente en {{time}}",
     "will_be_deleted_soon": "Este archivo adjunto se eliminará automáticamente pronto",
     "deletion_reason": ", porque el archivo adjunto no está vinculado en el contenido de la nota. Para evitar la eliminación, vuelva a agregar el enlace del archivo adjunto al contenido o convierta el archivo adjunto en una nota.",
-    "role_and_size": "Rol: {{role}}, Tamaño: {{size}}",
+    "role_and_size": "Rol: {{role}}, tamaño: {{size}}, MIME: {{- mimeType}}",
     "link_copied": "Enlace del archivo adjunto copiado al portapapeles.",
     "unrecognized_role": "Rol de archivo adjunto no reconocido '{{role}}'."
   },
   "bookmark_switch": {
     "bookmark": "Marcador",
-    "bookmark_this_note": "Añadir esta nota a marcadores en el panel lateral izquierdo",
+    "bookmark_this_note": "Agregar esta nota a marcadores en el panel lateral izquierdo",
     "remove_bookmark": "Eliminar marcador"
   },
   "editability_select": {
@@ -1624,10 +1659,13 @@
     "import-into-note": "Importar a nota",
     "apply-bulk-actions": "Aplicar acciones en lote",
     "converted-to-attachments": "{{count}} notas han sido convertidas en archivos adjuntos.",
-    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres?",
+    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres? Esta operación solo aplica a notas de Imagen, otras notas serán omitidas.",
     "open-in-popup": "Edición rápida",
     "archive": "Archivar",
-    "unarchive": "Desarchivar"
+    "unarchive": "Desarchivar",
+    "open-in-a-new-window": "Abrir en una nueva ventana",
+    "hide-subtree": "Ocultar subárbol",
+    "show-subtree": "Mostrar subárbol"
   },
   "shared_info": {
     "shared_publicly": "Esta nota está compartida públicamente en {{- link}}.",
@@ -1688,7 +1726,13 @@
   },
   "highlights_list_2": {
     "title": "Lista de destacados",
-    "options": "Opciones"
+    "options": "Opciones",
+    "title_with_count_one": "{{count}} punto destacado",
+    "title_with_count_many": "{{count}} puntos destacados",
+    "title_with_count_other": "{{count}} puntos destacados",
+    "modal_title": "Configurar la lista de puntos destacados",
+    "menu_configure": "Configurar la lista de puntos destacados...",
+    "no_highlights": "Ningún punto destacado encontrado."
   },
   "quick-search": {
     "placeholder": "Búsqueda rápida",
@@ -1711,7 +1755,18 @@
     "refresh-saved-search-results": "Refrescar resultados de búsqueda guardados",
     "create-child-note": "Crear subnota",
     "unhoist": "Desanclar",
-    "toggle-sidebar": "Alternar barra lateral"
+    "toggle-sidebar": "Alternar barra lateral",
+    "dropping-not-allowed": "No está permitido soltar notas en esta ubicación.",
+    "clone-indicator-tooltip": "Esta nota tiene {{- count}} padres: {{- parents}}",
+    "clone-indicator-tooltip-single": "Esta nota está clonada (1 padre adicional: {{- parent}})",
+    "shared-indicator-tooltip": "Esta nota está compartida públicamente",
+    "shared-indicator-tooltip-with-url": "Esta nota está compartida públicamente en: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} subnota que está oculta del árbol",
+    "subtree-hidden-tooltip_many": "{{count}} subnotas que están ocultas del árbol",
+    "subtree-hidden-tooltip_other": "{{count}} subnotas que están ocultas del árbol",
+    "subtree-hidden-moved-title": "Agregado a {{title}}",
+    "subtree-hidden-moved-description-collection": "Esta colección oculta sus subnotas en el árbol.",
+    "subtree-hidden-moved-description-other": "Las subnotas están ocultas en el árbol para esta nota."
   },
   "title_bar_buttons": {
     "window-on-top": "Mantener esta ventana en la parte superior"
@@ -1719,10 +1774,26 @@
   "note_detail": {
     "could_not_find_typewidget": "No se pudo encontrar typeWidget para el tipo '{{type}}'",
     "printing": "Impresión en curso...",
-    "printing_pdf": "Exportando a PDF en curso.."
+    "printing_pdf": "Exportando a PDF en curso..",
+    "print_report_collection_content_one": "{{count}} nota en la colección no se puede imprimir porque no son compatibles o está protegida.",
+    "print_report_collection_content_many": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
+    "print_report_collection_content_other": "{{count}} notas en la colección no se pueden imprimir porque no son compatibles o están protegidas.",
+    "print_report_title": "Imprimir informe",
+    "print_report_collection_details_button": "Ver detalles",
+    "print_report_collection_details_ignored_notes": "Notas ignoradas",
+    "print_report_stack_trace": "Rastreo de pila",
+    "print_report_error_title": "Fallo al imprimir"
   },
   "note_title": {
-    "placeholder": "escriba el título de la nota aquí..."
+    "placeholder": "escriba el título de la nota aquí...",
+    "created_on": "Creado en <Value />",
+    "last_modified": "Modificado en <Value />",
+    "note_type_switcher_label": "Cambiar de {{type}} a:",
+    "note_type_switcher_others": "Otro tipo de nota",
+    "note_type_switcher_templates": "Plantilla",
+    "note_type_switcher_collection": "Colección",
+    "edited_notes": "Notas editadas en este día",
+    "promoted_attributes": "Atributos promovidos"
   },
   "search_result": {
     "no_notes_found": "No se han encontrado notas para los parámetros de búsqueda dados.",
@@ -1732,7 +1803,11 @@
     "configure_launchbar": "Configurar barra de lanzamiento"
   },
   "sql_result": {
-    "no_rows": "No se han devuelto filas para esta consulta"
+    "no_rows": "No se han devuelto filas para esta consulta",
+    "not_executed": "La consulta aún no ha sido ejecutada.",
+    "failed": "La ejecución de la consulta SQL ha fallado",
+    "statement_result": "Resultado de declaración",
+    "execute_now": "Ejecutar ahora"
   },
   "sql_table_schemas": {
     "tables": "Tablas"
@@ -1751,7 +1826,8 @@
   },
   "toc": {
     "table_of_contents": "Tabla de contenido",
-    "options": "Opciones"
+    "options": "Opciones",
+    "no_headings": "Sin encabezados."
   },
   "watched_file_update_status": {
     "file_last_modified": "Archivo <code class=\"file-path\"></code> ha sido modificado por última vez en<span class=\"file-last-modified\"></span>.",
@@ -1863,14 +1939,15 @@
     "open_note_in_new_tab": "Abrir nota en una pestaña nueva",
     "open_note_in_new_split": "Abrir nota en una nueva división",
     "open_note_in_new_window": "Abrir nota en una nueva ventana",
-    "open_note_in_popup": "Edición rápida"
+    "open_note_in_popup": "Edición rápida",
+    "open_note_in_other_split": "Abrir nota en la otra división"
   },
   "electron_integration": {
     "desktop-application": "Aplicación de escritorio",
     "native-title-bar": "Barra de título nativa",
     "native-title-bar-description": "Para Windows y macOS, quitar la barra de título nativa hace que la aplicación se vea más compacta. En Linux, mantener la barra de título nativa hace que se integre mejor con el resto del sistema.",
-    "background-effects": "Habilitar efectos de fondo (sólo en Windows 11)",
-    "background-effects-description": "El efecto Mica agrega un fondo borroso y elegante a las ventanas de la aplicación, creando profundidad y un aspecto moderno. \"Título nativo de la barra\" debe deshabilitarse.",
+    "background-effects": "Habilitar efectos de fondo",
+    "background-effects-description": "Agrega un fondo borroso y elegante a las ventanas de la aplicación, creando profundidad y un aspecto moderno. \"Título nativo de la barra\" debe deshabilitarse.",
     "restart-app-button": "Reiniciar la aplicación para ver los cambios",
     "zoom-factor": "Factor de zoom"
   },
@@ -1889,7 +1966,8 @@
   "geo-map": {
     "create-child-note-title": "Crear una nueva subnota y agregarla al mapa",
     "create-child-note-instruction": "Dé clic en el mapa para crear una nueva nota en esa ubicación o presione Escape para cancelar.",
-    "unable-to-load-map": "No se puede cargar el mapa."
+    "unable-to-load-map": "No se puede cargar el mapa.",
+    "create-child-note-text": "Agregar marcador"
   },
   "geo-map-context": {
     "open-location": "Abrir ubicación",
@@ -1931,11 +2009,12 @@
     "unknown_widget": "Widget desconocido para \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "No establecido",
-    "configure-languages": "Configurar idiomas..."
+    "not_set": "Idioma no establecido",
+    "configure-languages": "Configurar idiomas...",
+    "help-on-languages": "Ayuda en idiomas de contenido..."
   },
   "content_language": {
-    "title": "Contenido de idiomas",
+    "title": "Idiomas de contenido",
     "description": "Seleccione uno o más idiomas que deben aparecer en la selección del idioma en la sección Propiedades Básicas de una nota de texto de solo lectura o editable. Esto permitirá características tales como corrección de ortografía o soporte de derecha a izquierda."
   },
   "switch_layout_button": {
@@ -1950,7 +2029,8 @@
     "button_title": "Exportar diagrama como PNG"
   },
   "svg": {
-    "export_to_png": "El diagrama no pudo ser exportado a PNG."
+    "export_to_png": "El diagrama no pudo ser exportado a PNG.",
+    "export_to_svg": "El diagrama no pudo ser exportado a SVG."
   },
   "code_theme": {
     "title": "Apariencia",
@@ -1970,7 +2050,7 @@
     "hide-weekends": "Ocultar fines de semana",
     "show-scale": "Mostrar escala",
     "display-week-numbers": "Mostrar números de semana",
-    "map-style": "Estilo de mapa:",
+    "map-style": "Estilo de mapa",
     "max-nesting-depth": "Máxima profundidad de anidamiento:",
     "vector_light": "Vector (claro)",
     "vector_dark": "Vector (oscuro)",
@@ -2053,9 +2133,12 @@
     "next_theme_message": "Estás 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_message": "En los dispositivos Windows y macOS, los efectos de fondo ya son estables. Los efectos de fondo añaden un toque de color a la interfaz de usuario difuminando el fondo que hay detrás.",
     "background_effects_button": "Activar efectos de fondo",
-    "dismiss": "Desestimar"
+    "dismiss": "Desestimar",
+    "new_layout_title": "Nuevo diseño",
+    "new_layout_message": "Hemos introducido un diseño modernizado para Trilium. La cinta se ha eliminado y se ha integrado perfectamente en la interfaz principal, con una nueva barra de estado y secciones ampliables (como los atributos promovidos) que tienen funciones clave.\n\nEl nuevo diseño está habilitado por defecto, y puede ser deshabilitado temporalmente a través de Opciones → Apariencia.",
+    "new_layout_button": "Más información"
   },
   "ui-performance": {
     "title": "Rendimiento",
@@ -2070,7 +2153,10 @@
   },
   "settings_appearance": {
     "related_code_blocks": "Esquema de colores para bloques de código en notas de texto",
-    "related_code_notes": "Esquema de colores para notas de código"
+    "related_code_notes": "Esquema de colores para notas de código",
+    "ui": "Interfaz de usuario",
+    "ui_old_layout": "Antiguo diseño",
+    "ui_new_layout": "Nuevo diseño"
   },
   "units": {
     "percentage": "%"
@@ -2099,5 +2185,123 @@
     "clear-color": "Borrar color de nota",
     "set-color": "Asignar color de nota",
     "set-custom-color": "Asignar color de nota personalizado"
+  },
+  "status_bar": {
+    "backlinks_one": "{{count}} vínculo de retroceso",
+    "backlinks_many": "{{count}} vínculos de retroceso",
+    "backlinks_other": "{{count}} vínculos de retroceso",
+    "backlinks_title_one": "Ver vínculo de retroceso",
+    "backlinks_title_many": "Ver vínculos de retroceso",
+    "backlinks_title_other": "Ver vínculos de retroceso",
+    "attachments_one": "{{count}} adjunto",
+    "attachments_many": "{{count}} adjuntos",
+    "attachments_other": "{{count}} adjuntos",
+    "attachments_title_one": "Ver adjunto en una nueva pestaña",
+    "attachments_title_many": "Ver adjuntos en una nueva pestaña",
+    "attachments_title_other": "Ver adjuntos en una nueva pestaña",
+    "attributes_one": "{{count}} atributo",
+    "attributes_many": "{{count}} atributos",
+    "attributes_other": "{{count}} atributos",
+    "note_paths_one": "{{count}} ruta",
+    "note_paths_many": "{{count}} rutas",
+    "note_paths_other": "{{count}} rutas",
+    "language_title": "Cambiar el idioma del contenido",
+    "note_info_title": "Ver información de la nota (p. e., fechas, tamaño de la nota)",
+    "attributes_title": "Atributos propios y atributos heredados",
+    "note_paths_title": "Rutas de nota",
+    "code_note_switcher": "Cambiar modo de idioma"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} adjunto",
+    "attachments_many": "{{count}} adjuntos",
+    "attachments_other": "{{count}} adjuntos",
+    "layers_one": "{{count}} capa",
+    "layers_many": "{{count}} capas",
+    "layers_other": "{{count}} capas",
+    "pages_one": "{{count}} página",
+    "pages_many": "{{count}} páginas",
+    "pages_other": "{{count}} páginas",
+    "pages_alt": "Página {{pageNumber}}",
+    "pages_loading": "Cargando..."
+  },
+  "experimental_features": {
+    "title": "Opciones experimentales",
+    "disclaimer": "Estas opciones son experimentales y pueden causar inestabilidad. Úselas con precaución.",
+    "new_layout_name": "Nuevo diseño",
+    "new_layout_description": "Pruebe el nuevo diseño para tener un aspecto más moderno y usabilidad mejorada. Sujeto a grandes cambios en las próximas versiones."
+  },
+  "popup-editor": {
+    "maximize": "Cambiar a editor completo"
+  },
+  "server": {
+    "unknown_http_error_title": "Error de comunicación con el servidor",
+    "unknown_http_error_content": "Código de estado: {{statusCode}}\nURL: {{method}} {{url}}\nMensaje: {{message}}",
+    "traefik_blocks_requests": "Si está usando el proxy inverso Traefik, este introdujo un cambio que afecta la comunicación con el servidor."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Volver a la nota anterior",
+    "go-forward": "Avanzar a la siguiente nota"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Anclada",
+    "hoisted_badge_title": "Desanclar",
+    "workspace_badge": "Espacio de trabajo",
+    "scroll_to_top_title": "Saltar al inicio de la nota",
+    "create_new_note": "Crear nueva subnota",
+    "empty_hide_archived_notes": "Ocultar notas archivadas"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Sólo lectura",
+    "read_only_explicit_description": "Esta nota se ha fijado manualmente como sólo lectura.\nHaga clic para editarla temporalmente.",
+    "read_only_auto": "Sólo lectura automática",
+    "read_only_auto_description": "Esta nota se fijó automáticamente con el modo de sólo lectura por razones de rendimiento. Este límite automático es ajustable desde los ajustes.\n\nHaga clic para editarla temporalmente.",
+    "read_only_temporarily_disabled": "Temporalmente editable",
+    "read_only_temporarily_disabled_description": "Esta nota actualmente es editable, pero normalmente es de sólo lectura. La nota volverá a ser de sólo lectura tan pronto como navegue a otra nota.\n\nHaga clic para volver a habilitar el modo de sólo lectura.",
+    "shared_publicly": "Compartida públicamente",
+    "shared_locally": "Compartida localmente",
+    "shared_copy_to_clipboard": "Copiar enlace al portapapeles",
+    "shared_open_in_browser": "Abrir enlace en el navegador",
+    "shared_unshare": "Eliminar compartido",
+    "clipped_note_description": "Esta nota fue tomada originalmente de {{url}}.\n\nHaga clic para navegar a la página web de origen.",
+    "execute_script": "Ejecutar script",
+    "execute_script_description": "Esta nota es una nota de script. Haga clic para ejecutar el script.",
+    "execute_sql": "Ejecutar SQL",
+    "execute_sql_description": "Esta nota es una nota SQL. Haga clic para ejecutar la consulta SQL.",
+    "save_status_saved": "Guardado",
+    "save_status_saving": "Guardando...",
+    "save_status_unsaved": "Sin guardar",
+    "save_status_error": "Fallo al guardar",
+    "save_status_saving_tooltip": "Los cambios están siendo guardados.",
+    "save_status_unsaved_tooltip": "Hay cambios sin guardar. Se guardarán automáticamente en un momento.",
+    "save_status_error_tooltip": "Se produjo un error al guardar la nota. Si es posible, trate de copiar el contenido de la nota en otro lugar y recargar la aplicación.",
+    "clipped_note": "Clip web"
+  },
+  "attributes_panel": {
+    "title": "Atributos de nota"
+  },
+  "right_pane": {
+    "empty_message": "Nada que mostrar para esta nota",
+    "empty_button": "Ocultar el panel",
+    "toggle": "Alternar panel derecho",
+    "custom_widget_go_to_source": "Ir al código fuente"
+  },
+  "platform_indicator": {
+    "available_on": "Disponible en {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} pestaña",
+    "title_many": "{{count}} pestañas",
+    "title_other": "{{count}} pestañas",
+    "more_options": "Más opciones"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Marcadores"
+  },
+  "web_view_setup": {
+    "title": "Crear una vista en vivo de una página web directamente en Trilium",
+    "url_placeholder": "Ingresar o pegar la dirección del sitio web, por ejemplo https://triliumnotes.org",
+    "create_button": "Crear Vista Web",
+    "invalid_url_title": "Dirección inválida",
+    "invalid_url_message": "Ingrese una dirección web válida, por ejemplo https://triliumnotes.org."
   }
 }

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

@@ -21,7 +21,13 @@
     },
     "bundle-error": {
       "title": "Echec du chargement d'un script personnalisé",
-      "message": "Le script de la note avec l'ID \"{{id}}\", intitulé \"{{title}}\" n'a pas pu être exécuté à cause de\n\n{{message}}"
+      "message": "Le script n'a pas pu être exécuté à cause de\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Impossible d'obtenir la liste des widgets depuis le serveur"
+    },
+    "widget-render-error": {
+      "title": "Rendu impossible d'un widget React custom"
     }
   },
   "add_link": {
@@ -107,7 +113,8 @@
     "export_status": "Statut d'exportation",
     "export_in_progress": "Exportation en cours : {{progressCount}}",
     "export_finished_successfully": "L'exportation s'est terminée avec succès.",
-    "format_pdf": "PDF - pour l'impression ou le partage de documents."
+    "format_pdf": "PDF - pour l'impression ou le partage de documents.",
+    "share-format": "HTML pour la publication Web - utilise le même thème que celui utilisé pour les notes partagées, mais peut être publié sous forme de site Web statique."
   },
   "help": {
     "noteNavigation": "Navigation dans les notes",
@@ -161,7 +168,8 @@
     "quickSearch": "aller à la recherche rapide",
     "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"
+    "newTabWithActivationNoteLink": "Lorsqu’on clique sur un lien de note, celle-ci s’ouvre et devient active dans un nouvel onglet",
+    "editShortcuts": "Modifier les raccourcis clavier"
   },
   "import": {
     "importIntoNote": "Importer dans la note",
@@ -203,7 +211,8 @@
   "info": {
     "modalTitle": "Message d'information",
     "closeButton": "Fermer",
-    "okButton": "OK"
+    "okButton": "OK",
+    "copy_to_clipboard": "Copier dans le presse-papiers"
   },
   "jump_to_note": {
     "search_button": "Rechercher dans le texte intégral",
@@ -276,7 +285,6 @@
     "download_button": "Télécharger",
     "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.",
     "restore_button": "Restaurer",
     "delete_button": "Supprimer",
@@ -689,7 +697,13 @@
     "convert_into_attachment_failed": "La conversion de la note '{{title}}' a échoué.",
     "convert_into_attachment_successful": "La note '{{title}}' a été convertie en pièce jointe.",
     "convert_into_attachment_prompt": "Êtes-vous sûr de vouloir convertir la note '{{title}}' en une pièce jointe de la note parente ?",
-    "print_pdf": "Exporter en PDF..."
+    "print_pdf": "Exporter en PDF...",
+    "open_note_on_server": "Ouvrir la note sur le serveur",
+    "view_revisions": "Révisions...",
+    "advanced": "Avancé",
+    "export_as_image": "Exporter en tant qu'image",
+    "export_as_image_png": "PNG",
+    "export_as_image_svg": "SVG (vectoriel)"
   },
   "onclick_button": {
     "no_click_handler": "Le widget bouton '{{componentId}}' n'a pas de gestionnaire de clic défini"
@@ -747,9 +761,12 @@
   },
   "note_icon": {
     "change_note_icon": "Changer l'icône de note",
-    "category": "Catégorie :",
     "search": "Recherche :",
-    "reset-default": "Réinitialiser l'icône par défaut"
+    "reset-default": "Réinitialiser l'icône par défaut",
+    "filter": "Filtre",
+    "filter-none": "Toutes les icônes",
+    "filter-default": "Icônes par défaut",
+    "icon_tooltip": "{{name}}\nPack d'icônes : {{iconPack}}"
   },
   "basic_properties": {
     "note_type": "Type de note",
@@ -772,7 +789,11 @@
     "geo-map": "Carte géographique",
     "board": "Tableau de bord",
     "include_archived_notes": "Afficher les notes archivées",
-    "presentation": "Présentation"
+    "presentation": "Présentation",
+    "expand_tooltip": "Développe les éléments enfants directs de cette collection (à un niveau). Pour plus d'options, appuyez sur la flèche à droite.",
+    "expand_first_level": "Développer les enfants directs",
+    "expand_nth_level": "Développer sur {{depth}} niveaux",
+    "expand_all_levels": "Développer tous les niveaux"
   },
   "edited_notes": {
     "no_edited_notes_found": "Aucune note modifiée ce jour-là...",
@@ -816,7 +837,9 @@
     "note_size_info": "La taille de la note fournit une estimation approximative des besoins de stockage pour cette note. Il prend en compte le contenu de la note et de ses versions.",
     "calculate": "calculer",
     "subtree_size": "(taille du sous-arbre : {{size}} pour {{count}} notes)",
-    "title": "Infos sur la Note"
+    "title": "Infos sur la Note",
+    "mime": "type MIME",
+    "show_similar_notes": "Afficher des notes similaires"
   },
   "note_map": {
     "open_full": "Développer au maximum",
@@ -879,7 +902,8 @@
     "search_parameters": "Paramètres de recherche",
     "unknown_search_option": "Option de recherche inconnue {{searchOptionName}}",
     "search_note_saved": "La note de recherche a été enregistrée dans {{- notePathTitle}}",
-    "actions_executed": "Les actions ont été exécutées."
+    "actions_executed": "Les actions ont été exécutées.",
+    "view_options": "Afficher les options:"
   },
   "similar_notes": {
     "title": "Notes similaires",
@@ -982,7 +1006,13 @@
   },
   "editable_text": {
     "placeholder": "Saisir le contenu de votre note ici...",
-    "auto-detect-language": "Détecté automatiquement"
+    "auto-detect-language": "Détecté automatiquement",
+    "editor_crashed_title": "L'éditeur de texte a cessé de fonctionner",
+    "editor_crashed_content": "Votre contenu a été récupéré avec succès, mais certaines de vos modifications les plus récentes n'ont peut-être pas été enregistrées.",
+    "editor_crashed_details_button": "Afficher plus de détails...",
+    "editor_crashed_details_intro": "Si cette erreur se produit plusieurs fois, pensez à la signaler sur GitHub en collant les informations ci-dessous.",
+    "editor_crashed_details_title": "Informations techniques",
+    "keeps-crashing": "Le composant d'édition cesse de fonctionner. Veuillez essayer de redémarrer Trilium. Si le problème persiste, envisager de créer un rapport de bogue."
   },
   "empty": {
     "open_note_instruction": "Ouvrez une note en tapant son titre dans la zone ci-dessous ou choisissez une note dans l'arborescence.",
@@ -1027,11 +1057,6 @@
     "note_detail_render_help_1": "Cette note d'aide s'affiche car cette note de type Rendu HTML n'a pas la relation requise pour fonctionner correctement.",
     "note_detail_render_help_2": "Le type de note Rendu HTML est utilisé pour les <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripts</a>. En résumé, vous disposez d'une note de code HTML (éventuellement contenant JavaScript) et cette note affichera le rendu. Pour que cela fonctionne, vous devez définir une <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relation</a> appelée \"renderNote\" pointant vers la note HTML à rendre."
   },
-  "web_view": {
-    "web_view": "Affichage Web",
-    "embed_websites": "Les notes de type Affichage Web vous permet d'intégrer des sites Web dans Trilium.",
-    "create_label": "Pour commencer, veuillez créer un label avec l'adresse URL que vous souhaitez intégrer, par ex. #webViewSrc=\"https://www.google.com\""
-  },
   "backend_log": {
     "refresh": "Rafraîchir"
   },
@@ -1077,9 +1102,9 @@
     "failed": "Échec de la synchronisation : {{message}}"
   },
   "vacuum_database": {
-    "title": "Nettoyage la base de donnée",
+    "title": "Nettoyage de la base de données",
     "description": "Cela reconstruira la base de données, ce qui générera un fichier de base de données généralement plus petit. Aucune donnée ne sera réellement modifiée.",
-    "button_text": "Nettoyer de la base de donnée",
+    "button_text": "Nettoyer la base de données",
     "vacuuming_database": "Nettoyage de la base de données en cours...",
     "database_vacuumed": "La base de données a été nettoyée"
   },
@@ -1110,7 +1135,8 @@
     "title": "Largeur du contenu",
     "default_description": "Trilium limite par défaut la largeur maximale du contenu pour améliorer la lisibilité sur des écrans larges.",
     "max_width_label": "Largeur maximale du contenu en pixels",
-    "max_width_unit": "Pixels"
+    "max_width_unit": "Pixels",
+    "centerContent": "Garder le contenu centré"
   },
   "native_title_bar": {
     "title": "Barre de titre native (nécessite le redémarrage de l'application)",
@@ -1149,7 +1175,10 @@
     "unit": "caractères"
   },
   "code_mime_types": {
-    "title": "Types MIME disponibles dans la liste déroulante"
+    "title": "Types MIME disponibles dans la liste déroulante",
+    "tooltip_syntax_highlighting": "Souligner la syntaxe",
+    "tooltip_code_block_syntax": "Blocs de code dans les notes de texte",
+    "tooltip_code_note_syntax": "Notes de code"
   },
   "vim_key_bindings": {
     "use_vim_keybindings_in_code_notes": "Raccourcis clavier Vim",
@@ -1516,7 +1545,8 @@
     "refresh-saved-search-results": "Rafraîchir les résultats de recherche enregistrée",
     "create-child-note": "Créer une note enfant",
     "unhoist": "Désactiver le focus",
-    "toggle-sidebar": "Basculer la barre latérale"
+    "toggle-sidebar": "Basculer la barre latérale",
+    "dropping-not-allowed": "Lâcher des notes à cet endroit n'est pas autorisé"
   },
   "title_bar_buttons": {
     "window-on-top": "Épingler cette fenêtre au premier plan"
@@ -1524,10 +1554,19 @@
   "note_detail": {
     "could_not_find_typewidget": "Impossible de trouver typeWidget pour le type '{{type}}'",
     "printing": "Impression en cours...",
-    "printing_pdf": "Export au format PDF en cours..."
+    "printing_pdf": "Export au format PDF en cours...",
+    "print_report_title": "Imprimer le rapport",
+    "print_report_collection_details_button": "Consulter les détails",
+    "print_report_collection_details_ignored_notes": "Notes ignorées"
   },
   "note_title": {
-    "placeholder": "saisir le titre de la note ici..."
+    "placeholder": "saisir le titre de la note ici...",
+    "created_on": "Créé le <Value />",
+    "last_modified": "Modifié le <Value />",
+    "note_type_switcher_label": "Basculer de {{type}} à :",
+    "note_type_switcher_others": "Autre type de note",
+    "note_type_switcher_templates": "Modèle",
+    "note_type_switcher_collection": "Collection"
   },
   "search_result": {
     "no_notes_found": "Aucune note n'a été trouvée pour les paramètres de recherche donnés.",
@@ -1556,7 +1595,8 @@
   },
   "toc": {
     "table_of_contents": "Table des matières",
-    "options": "Options"
+    "options": "Options",
+    "no_headings": "Pas d'en-tête."
   },
   "watched_file_update_status": {
     "file_last_modified": "Le fichier <code class=\"file-path\"></code> a été modifié pour la dernière fois le <span class=\"file-last-modified\"></span>.",
@@ -1657,7 +1697,8 @@
     "copy-link": "Copier le lien",
     "paste": "Coller",
     "paste-as-plain-text": "Coller comme texte brut",
-    "search_online": "Rechercher «{{term}}» avec {{searchEngine}}"
+    "search_online": "Rechercher «{{term}}» avec {{searchEngine}}",
+    "search_in_trilium": "Rechercher \"{{term}}\" dans Trilium"
   },
   "image_context_menu": {
     "copy_reference_to_clipboard": "Copier la référence dans le presse-papiers",
@@ -1966,7 +2007,8 @@
     "add-column": "Ajouter une colonne",
     "add-column-placeholder": "Entrez le nom de la colonne...",
     "edit-note-title": "Cliquez pour modifier le titre de la note",
-    "edit-column-title": "Cliquez pour modifier le titre de la colonne"
+    "edit-column-title": "Cliquez pour modifier le titre de la colonne",
+    "column-already-exists": "Cette colonne existe déjà dans le tableau."
   },
   "presentation_view": {
     "edit-slide": "Modifier cette diapositive",
@@ -2050,7 +2092,8 @@
     "button_title": "Exporter le diagramme au format PNG"
   },
   "svg": {
-    "export_to_png": "Le diagramme n'a pas pu être exporté au format PNG."
+    "export_to_png": "Le diagramme n'a pas pu être exporté au format PNG.",
+    "export_to_svg": "Le diagramme n'a pas pu être exporté en SVG."
   },
   "code_theme": {
     "title": "Apparence",
@@ -2074,5 +2117,19 @@
     "note_completion_description": "Si cette option est activée, des liens vers des notes peuvent être créés en tapant `@` suivi du titre d'une note.",
     "slash_commands_enabled": "Activer les commandes slash",
     "slash_commands_description": "Si cette option est activée, les commandes d'édition telles que l'insertion de sauts de ligne ou d'en-têtes peuvent être activées en tapant `/`."
+  },
+  "experimental_features": {
+    "title": "Options expérimentales",
+    "disclaimer": "Ces options sont expérimentales et peuvent provoquer une instabilité. Utilisez avec prudence.",
+    "new_layout_name": "Nouvelle mise en page",
+    "new_layout_description": "Essayez la nouvelle mise en page pour un look plus moderne et un usage améliorée. Sous réserve de changements importants dans les prochaines versions."
+  },
+  "read-only-info": {
+    "read-only-note": "Vous consultez actuellement une note en lecture seule.",
+    "auto-read-only-note": "Cette note s'affiche en mode lecture seule pour un chargement plus rapide.",
+    "edit-note": "Editer la note"
+  },
+  "calendar_view": {
+    "delete_note": "Effacer la note..."
   }
 }

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

@@ -1,5 +1,50 @@
 {
   "about": {
-    "title": "ट्रिलियम नोट्स के बारें में"
+    "title": "ट्रिलियम नोट्स के बारें में",
+    "build_date": "निर्माण की तारीख:",
+    "app_version": "ऐप वर्ज़न:",
+    "db_version": "DB वर्ज़न:",
+    "build_revision": "बिल्ड रिविज़न:"
+  },
+  "toast": {
+    "widget-error": {
+      "title": "एक विजेट को इनिशियलाइज़ करने में विफल रहा"
+    },
+    "bundle-error": {
+      "title": "एक कस्टम स्क्रिप्ट लोड करने में विफल रहा"
+    },
+    "widget-list-error": {
+      "title": "सर्वर से विजेट्स की सूची प्राप्त करने में विफल"
+    },
+    "open-script-note": "स्क्रिप्ट नोट खोलें"
+  },
+  "update_available": {
+    "update_available": "उपलब्ध अद्यतन"
+  },
+  "code_buttons": {
+    "execute_button_title": "स्क्रिप्ट एक्सीक्यूट करें",
+    "trilium_api_docs_button_title": "ट्रिलियम एपीआई डॉक्स खोलें",
+    "save_to_note_button_title": "नोट में सेव करें"
+  },
+  "hide_floating_buttons_button": {
+    "button_title": "बटन छुपाएं"
+  },
+  "show_floating_buttons_button": {
+    "button_title": "बटन दिखाएं"
+  },
+  "add_link": {
+    "note": "नोट"
+  },
+  "bulk_actions": {
+    "other": "अन्य"
+  },
+  "clone_to": {
+    "search_for_note_by_its_name": "नोट क नाम से नोट खोजें"
+  },
+  "confirm": {
+    "also_delete_note": "नोट भी डिलीट करें"
+  },
+  "delete_notes": {
+    "delete_notes_preview": "नोट्स प्रिव्यू डिलीट करें"
   }
 }

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

@@ -21,7 +21,13 @@
     },
     "bundle-error": {
       "title": "Nem sikerült betölteni az egyéni szkriptet",
-      "message": "A(z) \"{{id}}\" azonosítójú, \"{{title}}\" című jegyzetből származó szkript nem hajtható végre a következő ok miatt:\n\n{{message}}"
+      "message": "A skript nem hajtható végre a következő ok miatt:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "A Widget-ek letöltése sikertelen volt"
+    },
+    "widget-render-error": {
+      "title": "Nem sikerült renderelni a React widget-et"
     }
   },
   "add_link": {

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

@@ -11,8 +11,8 @@
   },
   "toast": {
     "critical-error": {
-      "title": "Kesalahan kritis",
-      "message": "Telah terjadi kesalahan kritis yang mencegah aplikasi klien untuk memulai:\n\n{{message}}\n\nHal ini kemungkinan besar disebabkan oleh skrip yang gagal secara tidak terduga. Coba jalankan aplikasi dalam mode aman dan atasi masalahnya."
+      "title": "Eror kritikal",
+      "message": "Telah terjadi eror kritikal yang mencegah aplikasi klien untuk memulai:\n\n{{message}}\n\nHal ini kemungkinan besar disebabkan oleh skrip yang gagal secara tidak terduga. Coba jalankan aplikasi dalam mode aman dan atasi masalahnya."
     },
     "widget-error": {
       "title": "Gagal menginisialisasi widget",
@@ -21,12 +21,71 @@
     },
     "bundle-error": {
       "title": "Gagal memuat skrip kustom",
-      "message": "Skrip dari catatan dengan ID \"{{id}}\", berjudul \"{{title}}\" tidak dapat dijalankan karena:\n\n{{message}}"
-    }
+      "message": "Skrip tidak dapat dijalankan:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Gagal mendapatkan daftar widget dari server"
+    },
+    "open-script-note": "Buka skrip catatan",
+    "widget-render-error": {
+      "title": "Gagal render widget React custom"
+    },
+    "widget-missing-parent": "Widget custom '{{property}}' tidak terdefinisi.\n\nJika skrip ini bermaksud untuk bisa dijalankan tanpa elemen UI, gunakanlah '#run=frontendStartup'.",
+    "scripting-error": "Skrip custom eror : {{title}}"
   },
   "add_link": {
     "add_link": "Tambah tautan",
     "help_on_links": "Bantuan pada tautan",
-    "note": "Catatan"
+    "note": "Catatan",
+    "search_note": "cari catatan berdasarkan nama",
+    "link_title_mirrors": "judul tautan mencerminkan judul catatan saat ini",
+    "link_title_arbitrary": "judul tautan dapat diubah secara bebas",
+    "link_title": "Judul tautan",
+    "button_add_link": "Tambah tautan"
+  },
+  "branch_prefix": {
+    "edit_branch_prefix_multiple": "Edit prefiks cabang untuk {{count}} cabang",
+    "help_on_tree_prefix": "Bantuan pada prefiks pohon catatan",
+    "prefix": "Prefiks: ",
+    "save": "Simpan",
+    "branch_prefix_saved": "Prefiks cabang telah disimpan.",
+    "branch_prefix_saved_multiple": "Prefix cabang telah disimpan pada {{count}} cabang.",
+    "affected_branches": "Cabang terdampak ({{count}}):",
+    "edit_branch_prefix": "Sunting awalan cabang"
+  },
+  "bulk_actions": {
+    "bulk_actions": "Aksi borongan",
+    "affected_notes": "Catatan terdampak",
+    "include_descendants": "Sertakan anakan dari catatan yang dipilih",
+    "available_actions": "Pilihan aksi",
+    "chosen_actions": "Aksi terpilih",
+    "execute_bulk_actions": "Eksekusi aksi borongan",
+    "bulk_actions_executed": "Aksi borongan telah di eksekusi dengan sukses.",
+    "none_yet": "Belum ada... tambahkan aksi dengan memilih salah satu dari aksi di atas.",
+    "labels": "Label-label",
+    "relations": "Hubungan",
+    "notes": "Catatan",
+    "other": "Lainnya"
+  },
+  "confirm": {
+    "cancel": "Batal",
+    "ok": "Oke",
+    "are_you_sure_remove_note": "Apakah anda yakin mau membuang catatan \"{{title}}\" dari peta relasi? ",
+    "if_you_dont_check": "Jika Anda tidak mencentang ini, catatan hanya akan dihapus dari peta relasi.",
+    "also_delete_note": "Hapus juga catatannya"
+  },
+  "delete_notes": {
+    "delete_notes_preview": "Hapus pratinjau catatan",
+    "close": "Tutup",
+    "delete_all_clones_description": "Hapus seluruh duplikat (bisa dikembalikan di menu revisi)",
+    "erase_notes_description": "Penghapusan normal hanya menandai catatan sebagai dihapus dan dapat dipulihkan (melalui dialog versi revisi) dalam jangka waktu tertentu. Mencentang opsi ini akan menghapus catatan secara permanen seketika dan catatan tidak akan bisa dipulihkan kembali.",
+    "erase_notes_warning": "Hapus catatan secara permanen (tidak bisa dikembalikan), termasuk semua duplikat. Aksi akan memaksa aplikasi untuk mengulang kembali.",
+    "notes_to_be_deleted": "Catatan-catatan berikut akan dihapuskan ({{notesCount}})",
+    "no_note_to_delete": "Tidak ada Catatan yang akan dihapus (hanya duplikat)."
+  },
+  "clone_to": {
+    "clone_notes_to": "Duplikat catatan ke…",
+    "help_on_links": "Bantuan pada tautan",
+    "notes_to_clone": "Catatan untuk kloning"
   }
 }

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

@@ -16,13 +16,22 @@
     },
     "bundle-error": {
       "title": "Non si è riusciti a caricare uno script personalizzato",
-      "message": "Lo script della nota con ID \"{{id}}\", dal titolo \"{{title}}\" non è stato inizializzato a causa di:\n\n{{message}}"
+      "message": "Impossibile eseguire lo script a causa di:\n\n{{message}}"
     },
     "widget-error": {
       "title": "Impossibile inizializzare un widget",
       "message-custom": "Il widget personalizzato dalla nota con ID “{{id}}”, intitolato “{{title}}”, non è stato possibile inizializzare a causa di:\n\n{{message}}",
       "message-unknown": "Un widget sconosciuto non è stato inizializzato a causa di:\n\n{{message}}"
-    }
+    },
+    "widget-list-error": {
+      "title": "Impossibile ottenere l'elenco dei widget dal server"
+    },
+    "widget-render-error": {
+      "title": "Impossibile eseguire il rendering di un widget React personalizzato"
+    },
+    "widget-missing-parent": "Il widget personalizzato non ha la proprietà obbligatoria '{{property}}' definita.\n\nSe questo script deve essere eseguito senza un elemento dell'interfaccia utente, utilizzare invece '#run=frontendStartup'.",
+    "open-script-note": "Apri script note",
+    "scripting-error": "Errore script personalizzato: {{title}}"
   },
   "add_link": {
     "add_link": "Aggiungi un collegamento",
@@ -94,7 +103,8 @@
   "info": {
     "okButton": "OK",
     "closeButton": "Chiudi",
-    "modalTitle": "Messaggio informativo"
+    "modalTitle": "Messaggio informativo",
+    "copy_to_clipboard": "Copia negli appunti"
   },
   "export": {
     "close": "Chiudi",
@@ -176,7 +186,8 @@
   "geo-map": {
     "create-child-note-title": "Crea una nota figlia e aggiungila alla mappa",
     "create-child-note-instruction": "Clicca sulla mappa per creare una nuova nota qui o premi Escape per uscire.",
-    "unable-to-load-map": "Impossibile caricare la mappa."
+    "unable-to-load-map": "Impossibile caricare la mappa.",
+    "create-child-note-text": "Aggiungi indicatore"
   },
   "geo-map-context": {
     "open-location": "Apri la posizione",
@@ -314,8 +325,11 @@
     "import-into-note": "Importa nella nota",
     "apply-bulk-actions": "Applica azioni in blocco",
     "converted-to-attachments": "{{count}} note sono state convertite in allegati.",
-    "convert-to-attachment-confirm": "Sei sicuro di voler convertire le note selezionate in allegati delle note padre?",
-    "open-in-popup": "Modifica rapida"
+    "convert-to-attachment-confirm": "Sei sicuro di voler convertire le note selezionate in allegati delle note principali? Questa operazione si applica solo alle note immagine, le altre note verranno ignorate.",
+    "open-in-popup": "Modifica rapida",
+    "open-in-a-new-window": "Apri in una nuova finestra",
+    "hide-subtree": "Nascondi sottostruttura",
+    "show-subtree": "Mostra sottoalbero"
   },
   "electron_context_menu": {
     "cut": "Taglia",
@@ -408,7 +422,9 @@
     "search_parameters": "Parametri di ricerca",
     "unknown_search_option": "Opzione di ricerca sconosciuta {{searchOptionName}}",
     "search_note_saved": "La nota di ricerca è stata salvata in {{- notePathTitle}}",
-    "actions_executed": "Le azioni sono state eseguite."
+    "actions_executed": "Le azioni sono state eseguite.",
+    "view_options": "Opzioni di visualizzazione:",
+    "option": "opzione"
   },
   "modal": {
     "close": "Chiudi",
@@ -521,7 +537,8 @@
   },
   "toc": {
     "table_of_contents": "Sommario",
-    "options": "Opzioni"
+    "options": "Opzioni",
+    "no_headings": "Nessun titolo."
   },
   "table_of_contents": {
     "title": "Sommario",
@@ -554,7 +571,13 @@
   },
   "highlights_list_2": {
     "title": "Punti salienti",
-    "options": "Opzioni"
+    "options": "Opzioni",
+    "title_with_count_one": "{{count}} evidenza",
+    "title_with_count_many": "{{count}} evidenze",
+    "title_with_count_other": "{{count}} evidenze",
+    "modal_title": "Configura elenco dei punti salienti",
+    "menu_configure": "Configura elenco dei punti salienti...",
+    "no_highlights": "Nessun punto saliente trovato."
   },
   "quick-search": {
     "placeholder": "Ricerca rapida",
@@ -884,7 +907,6 @@
     "download_button": "Scarica",
     "mime": "MIME: ",
     "file_size": "Dimensione del file:",
-    "preview": "Anteprima:",
     "preview_not_available": "L'anteprima non è disponibile per questo tipo di nota."
   },
   "sort_child_notes": {
@@ -1221,7 +1243,8 @@
     "show-cheatsheet": "Mostra il foglietto illustrativo",
     "toggle-zen-mode": "Modalità Zen",
     "new-version-available": "Nuovo aggiornamento disponibile",
-    "download-update": "Ottieni la versione {{latestVersion}}"
+    "download-update": "Ottieni la versione {{latestVersion}}",
+    "search_notes": "Cerca note"
   },
   "zen_mode": {
     "button_exit": "Esci dalla modalità Zen"
@@ -1260,7 +1283,13 @@
     "convert_into_attachment_successful": "Nota '{{title}}' è stato convertito in allegato.",
     "convert_into_attachment_prompt": "Sei sicuro di voler convertire la nota '{{title}}' in un allegato della nota padre?",
     "print_pdf": "Esporta come PDF...",
-    "open_note_on_server": "Apri una nota sul server"
+    "open_note_on_server": "Apri una nota sul server",
+    "view_revisions": "Revisioni...",
+    "advanced": "Avanzato",
+    "export_as_image": "Esporta come immagine",
+    "export_as_image_png": "PNG (raster)",
+    "export_as_image_svg": "SVG (vector)",
+    "note_map": "Mappa"
   },
   "onclick_button": {
     "no_click_handler": "Il widget pulsante '{{componentId}}' non ha un gestore di clic definito"
@@ -1314,13 +1343,23 @@
     "delete_this_note": "Elimina questa nota",
     "note_revisions": "Revisioni delle note",
     "error_cannot_get_branch_id": "Impossibile ottenere branchId per notePath '{{notePath}}'",
-    "error_unrecognized_command": "Comando non riconosciuto {{command}}"
+    "error_unrecognized_command": "Comando non riconosciuto {{command}}",
+    "backlinks": "Backlinks",
+    "content_language_switcher": "Lingua dei contenuti: {{language}}"
   },
   "note_icon": {
     "change_note_icon": "Cambia icona nota",
-    "category": "Categoria:",
     "search": "Ricerca:",
-    "reset-default": "Ripristina l'icona predefinita"
+    "reset-default": "Ripristina l'icona predefinita",
+    "search_placeholder_one": "Cerca {{number}} icona in {{count}} pacchetto",
+    "search_placeholder_many": "Cerca {{number}} icone in {{count}} pacchetti",
+    "search_placeholder_other": "Cerca {{number}} icone in {{count}} pacchetti",
+    "search_placeholder_filtered": "Cerca {{number}} icone in {{name}}",
+    "filter": "Filtro",
+    "filter-none": "Tutte le icone",
+    "filter-default": "Icone predefinite",
+    "icon_tooltip": "{{name}}\nPacchetto icone: {{iconPack}}",
+    "no_results": "Nessuna icona trovata."
   },
   "basic_properties": {
     "note_type": "Tipo di nota",
@@ -1347,7 +1386,8 @@
     "expand_tooltip": "Espande i figli diretti di questa raccolta (a un livello di profondità). Per ulteriori opzioni, premere la freccia a destra.",
     "expand_first_level": "Espandi figli diretti",
     "expand_nth_level": "Espandi {{depth}} livelli",
-    "expand_all_levels": "Espandi tutti i livelli"
+    "expand_all_levels": "Espandi tutti i livelli",
+    "hide_child_notes": "Nascondi note secondarie nell'albero"
   },
   "edited_notes": {
     "no_edited_notes_found": "Nessuna nota modificata per questo giorno...",
@@ -1360,7 +1400,7 @@
     "file_type": "Tipo di file",
     "file_size": "Dimensione del file",
     "download": "Scaricamento",
-    "open": "Aprire",
+    "open": "Aprire esternamente",
     "upload_new_revision": "Carica nuova revisione",
     "upload_success": "È stata caricata una nuova revisione del file.",
     "upload_failed": "Caricamento di una nuova revisione del file non riuscito.",
@@ -1380,7 +1420,8 @@
   },
   "inherited_attribute_list": {
     "title": "Attributi ereditati",
-    "no_inherited_attributes": "Nessun attributo ereditato."
+    "no_inherited_attributes": "Nessun attributo ereditato.",
+    "none": "nessuno"
   },
   "note_info_widget": {
     "note_id": "ID nota",
@@ -1391,7 +1432,9 @@
     "note_size_info": "La dimensione della nota fornisce una stima approssimativa dei requisiti di archiviazione per questa nota. Tiene conto del contenuto della nota e del contenuto delle sue revisioni.",
     "calculate": "calcolare",
     "subtree_size": "(dimensione del sottoalbero: {{size}} in {{count}} note)",
-    "title": "Nota informativa"
+    "title": "Nota informativa",
+    "show_similar_notes": "Mostra note simili",
+    "mime": "Tipo MIME"
   },
   "note_map": {
     "open_full": "Espandi completamente",
@@ -1493,7 +1536,12 @@
   "editable_text": {
     "placeholder": "Digita qui il contenuto della tua nota...",
     "auto-detect-language": "Rilevato automaticamente",
-    "keeps-crashing": "Il componente di modifica continua a bloccarsi. Prova a riavviare Trilium. Se il problema persiste, valuta la possibilità di creare una segnalazione di bug."
+    "keeps-crashing": "Il componente di modifica continua a bloccarsi. Prova a riavviare Trilium. Se il problema persiste, valuta la possibilità di creare una segnalazione di bug.",
+    "editor_crashed_title": "L'editor di testo si è bloccato",
+    "editor_crashed_content": "I tuoi contenuti sono stati recuperati con successo, ma alcune delle modifiche più recenti potrebbero non essere state salvate.",
+    "editor_crashed_details_button": "Visualizza ulteriori dettagli...",
+    "editor_crashed_details_intro": "Se questo errore si verifica più volte, valuta la possibilità di segnalarlo su GitHub incollando le informazioni riportate di seguito.",
+    "editor_crashed_details_title": "Informazioni tecniche"
   },
   "empty": {
     "open_note_instruction": "Apri una nota digitandone il titolo nel campo sottostante oppure scegli una nota nell'albero.",
@@ -1538,11 +1586,6 @@
     "note_detail_render_help_1": "Questa nota di aiuto viene visualizzata perché questa nota di tipo Render HTML non ha la relazione richiesta per funzionare correttamente.",
     "note_detail_render_help_2": "Il tipo di nota HTML Render viene utilizzato per lo <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">scripting</a>. In breve, si ottiene una nota in codice HTML (opzionalmente con un po' di JavaScript) che verrà visualizzata. Per farla funzionare, è necessario definire una <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relazione</a> denominata \"renderNote\" che punti alla nota HTML da visualizzare."
   },
-  "web_view": {
-    "web_view": "Visualizzazione Web",
-    "embed_websites": "La nota di tipo Web View consente di incorporare siti web in Trilium.",
-    "create_label": "Per iniziare, crea un'etichetta con l'indirizzo URL che desideri incorporare, ad esempio #webViewSrc=\"https://www.google.com\""
-  },
   "vacuum_database": {
     "title": "Pulizia del database",
     "description": "Questa operazione ricostruirà il database, generando in genere un file di dimensioni inferiori. In realtà, nessun dato verrà modificato.",
@@ -1770,7 +1813,7 @@
     "will_be_deleted_in": "Questo allegato verrà eliminato automaticamente tra {{time}}",
     "will_be_deleted_soon": "Questo allegato verrà eliminato automaticamente a breve",
     "deletion_reason": ", perché l'allegato non è collegato al contenuto della nota. Per impedirne l'eliminazione, aggiungi nuovamente il collegamento all'allegato nel contenuto o converti l'allegato in nota.",
-    "role_and_size": "Ruolo: {{role}}, Dimensione: {{size}}",
+    "role_and_size": "Ruolo: {{role}}, dimensione: {{size}}, MIME: {{- mimeType}}",
     "link_copied": "Link all'allegato copiato negli appunti.",
     "unrecognized_role": "Ruolo di allegato non riconosciuto '{{role}}'."
   },
@@ -1856,7 +1899,17 @@
     "create-child-note": "Crea nota figlio",
     "unhoist": "Sganciare",
     "toggle-sidebar": "Attiva/disattiva la barra laterale",
-    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione."
+    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione.",
+    "clone-indicator-tooltip": "Questa nota ha {{- count}} genitori: {{- parents}}",
+    "clone-indicator-tooltip-single": "Questa nota è stata clonata (1 genitore aggiuntivo: {{- parent}})",
+    "shared-indicator-tooltip": "Questa nota è condivisa pubblicamente",
+    "shared-indicator-tooltip-with-url": "Questa nota è condivisa pubblicamente all'indirizzo: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} nota secondaria nascosta dall'albero",
+    "subtree-hidden-tooltip_many": "{{count}} note secondarie nascoste dall'albero",
+    "subtree-hidden-tooltip_other": "{{count}} note secondarie nascoste dall'albero",
+    "subtree-hidden-moved-title": "Aggiunto a {{title}}",
+    "subtree-hidden-moved-description-collection": "Questa raccolta nasconde le sue note secondarie nell'albero.",
+    "subtree-hidden-moved-description-other": "Le note secondarie sono nascoste nell'albero di questa nota."
   },
   "title_bar_buttons": {
     "window-on-top": "Mantieni la finestra in primo piano"
@@ -1864,10 +1917,24 @@
   "note_detail": {
     "could_not_find_typewidget": "Impossibile trovare typeWidget per il tipo '{{type}}'",
     "printing": "Stampa in corso...",
-    "printing_pdf": "Esportazione in PDF in corso..."
+    "printing_pdf": "Esportazione in PDF in corso...",
+    "print_report_title": "Stampa rapporto",
+    "print_report_collection_content_one": "{{count}} la note nella raccolta non può essere stampata perché non è supportata o è protetta.",
+    "print_report_collection_content_many": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
+    "print_report_collection_content_other": "{{count}} le note nella raccolta non possono essere stampate perché non sono supportate o sono protette.",
+    "print_report_collection_details_button": "Vedi dettagli",
+    "print_report_collection_details_ignored_notes": "Note ignorate"
   },
   "note_title": {
-    "placeholder": "scrivi qui il titolo della nota..."
+    "placeholder": "scrivi qui il titolo della nota...",
+    "created_on": "Creato il <Value />",
+    "last_modified": "Modificato il <Value />",
+    "note_type_switcher_label": "Passa da {{type}} a:",
+    "note_type_switcher_others": "Altro tipo di nota",
+    "note_type_switcher_templates": "Modello",
+    "note_type_switcher_collection": "Collezione",
+    "edited_notes": "Note modificate in questo giorno",
+    "promoted_attributes": "Attributi promossi"
   },
   "search_result": {
     "no_notes_found": "Non sono state trovate note per i parametri di ricerca specificati.",
@@ -1877,7 +1944,11 @@
     "configure_launchbar": "Configura Launchbar"
   },
   "sql_result": {
-    "no_rows": "Nessuna riga è stata restituita per questa query"
+    "no_rows": "Nessuna riga è stata restituita per questa query",
+    "not_executed": "La query non è stata ancora eseguita.",
+    "failed": "Esecuzione query SQL non riuscita",
+    "statement_result": "Risultato della dichiarazione",
+    "execute_now": "Esegui ora"
   },
   "watched_file_update_status": {
     "file_last_modified": "Il file <code class=\"file-path\"></code> è stato modificato l'ultima volta il <span class=\"file-last-modified\"></span>.",
@@ -2003,8 +2074,9 @@
     "unknown_widget": "Widget sconosciuto per \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "Non impostato",
-    "configure-languages": "Configura le lingue..."
+    "not_set": "Nessuna lingua impostata",
+    "configure-languages": "Configura le lingue...",
+    "help-on-languages": "Aiuto sulle lingue dei contenuti..."
   },
   "content_language": {
     "title": "Lingue dei contenuti",
@@ -2022,7 +2094,8 @@
     "button_title": "Esporta diagramma come PNG"
   },
   "svg": {
-    "export_to_png": "Non è stato possibile esportare il diagramma in formato PNG."
+    "export_to_png": "Non è stato possibile esportare il diagramma in formato PNG.",
+    "export_to_svg": "Il diagramma non può essere esportato in formato SVG."
   },
   "code_theme": {
     "title": "Aspetto",
@@ -2032,7 +2105,7 @@
   "book_properties_config": {
     "hide-weekends": "Nascondi i fine settimana",
     "display-week-numbers": "Visualizza i numeri delle settimane",
-    "map-style": "Stile mappa:",
+    "map-style": "Stile mappa",
     "max-nesting-depth": "Profondità massima di nidificazione:",
     "raster": "Trama",
     "vector_light": "Vettore (Luce)",
@@ -2072,14 +2145,20 @@
     "background_effects_title": "Gli effetti di sfondo sono ora stabili",
     "background_effects_message": "Sui dispositivi Windows, gli effetti di sfondo sono ora completamente stabili. Gli effetti di sfondo aggiungono un tocco di colore all'interfaccia utente sfocando lo sfondo retrostante. Questa tecnica è utilizzata anche in altre applicazioni come Esplora risorse di Windows.",
     "background_effects_button": "Abilita gli effetti di sfondo",
-    "dismiss": "Congedare"
+    "dismiss": "Chiudi",
+    "new_layout_title": "Nuovo layout",
+    "new_layout_message": "Abbiamo introdotto un layout modernizzato per Trilium. La barra multifunzione è stata rimossa e integrata perfettamente nell'interfaccia principale, con una nuova barra di stato e sezioni espandibili (come gli attributi promossi) che assumono le funzioni chiave.\n\nIl nuovo layout è abilitato di default e può essere temporaneamente disabilitato tramite Opzioni → Aspetto.",
+    "new_layout_button": "Maggiori informazioni"
   },
   "settings": {
     "related_settings": "Impostazioni correlate"
   },
   "settings_appearance": {
     "related_code_blocks": "Schema di colori per i blocchi di codice nelle note di testo",
-    "related_code_notes": "Schema di colori per le note del codice"
+    "related_code_notes": "Schema di colori per le note del codice",
+    "ui": "Interfaccia utente",
+    "ui_old_layout": "Vecchio layout",
+    "ui_new_layout": "Nuovo layout"
   },
   "units": {
     "percentage": "%"
@@ -2106,5 +2185,120 @@
   },
   "popup-editor": {
     "maximize": "Passa all'editor completo"
+  },
+  "experimental_features": {
+    "title": "Opzioni sperimentali",
+    "disclaimer": "Queste opzioni sono sperimentali e potrebbero causare instabilità. Usare con cautela.",
+    "new_layout_name": "Nuovo layout",
+    "new_layout_description": "Prova il nuovo layout per un look più moderno e una maggiore usabilità. Soggetto a modifiche significative nelle prossime versioni."
+  },
+  "server": {
+    "unknown_http_error_title": "Errore di comunicazione con il server",
+    "unknown_http_error_content": "Codice di stato: {{statusCode}}\nURL: {{method}} {{url}}\nMessaggio: {{message}}",
+    "traefik_blocks_requests": "Se si utilizza il proxy inverso Traefik, è stata introdotta una modifica sostanziale che influisce sulla comunicazione con il server."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Torna alla nota precedente",
+    "go-forward": "Passa alla nota successiva"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Sola lettura",
+    "read_only_explicit_description": "Questa nota è stata impostata manualmente come di sola lettura.\nClicca per modificarla temporaneamente.",
+    "read_only_auto": "Solo lettura automatica",
+    "read_only_auto_description": "Questa nota è stata impostata automaticamente in modalità di sola lettura per motivi di prestazioni. Questo limite automatico è modificabile dalle impostazioni.\n\nClicca per modificarla temporaneamente.",
+    "read_only_temporarily_disabled": "Modificabile temporaneamente",
+    "read_only_temporarily_disabled_description": "Questa nota è attualmente modificabile, ma normalmente è di sola lettura. La nota tornerà ad essere di sola lettura non appena passerai a un'altra nota.\n\nClicca per riattivare la modalità di sola lettura.",
+    "shared_publicly": "Condiviso pubblicamente",
+    "shared_locally": "Condiviso localmente",
+    "clipped_note": "Clip web",
+    "clipped_note_description": "Questa nota è stata originariamente presa da {{url}}.\n\nClicca per andare alla pagina web di origine.",
+    "execute_script": "Esegui script",
+    "execute_script_description": "Questa nota è una nota di script. Clicca per eseguire lo script.",
+    "execute_sql": "Esegui SQL",
+    "execute_sql_description": "Questa nota è una nota SQL. Clicca per eseguire la query SQL.",
+    "shared_copy_to_clipboard": "Copia link negli appunti",
+    "shared_open_in_browser": "Apri il link nel browser",
+    "shared_unshare": "Rimuovi condivisione",
+    "save_status_saved": "Salvato",
+    "save_status_saving": "Salvataggio in corso...",
+    "save_status_unsaved": "Non salvato",
+    "save_status_error": "Salvataggio non riuscito",
+    "save_status_saving_tooltip": "Le modifiche sono state salvate.",
+    "save_status_unsaved_tooltip": "Ci sono modifiche non salvate. Verranno salvate automaticamente tra un attimo.",
+    "save_status_error_tooltip": "Si è verificato un errore durante il salvataggio della nota. Se possibile, prova a copiare il contenuto della nota altrove e a ricaricare l'applicazione."
+  },
+  "breadcrumb": {
+    "workspace_badge": "Area di lavoro",
+    "scroll_to_top_title": "Vai all'inizio della nota",
+    "hoisted_badge": "Sollevato",
+    "hoisted_badge_title": "Abbassato",
+    "create_new_note": "Crea nuova nota secondaria",
+    "empty_hide_archived_notes": "Nascondi note archiviate"
+  },
+  "status_bar": {
+    "language_title": "Cambia lingua dei contenuti",
+    "note_info_title": "Visualizza informazioni sulla nota (ad es. date, dimensioni della nota)",
+    "backlinks_one": "{{count}} backlink",
+    "backlinks_many": "{{count}} backlinks",
+    "backlinks_other": "{{count}} backlinks",
+    "backlinks_title_one": "Visualizza backlink",
+    "backlinks_title_many": "Visualizza backlinks",
+    "backlinks_title_other": "Visualizza backlinks",
+    "attachments_one": "{{count}} allegato",
+    "attachments_many": "{{count}} allegati",
+    "attachments_other": "{{count}} allegati",
+    "attachments_title_one": "Visualizza allegato in una nuova scheda",
+    "attachments_title_many": "Visualizza allegati in una nuova scheda",
+    "attachments_title_other": "Visualizza allegati in una nuova scheda",
+    "attributes_one": "{{count}} attributo",
+    "attributes_many": "{{count}} attributi",
+    "attributes_other": "{{count}} attributi",
+    "attributes_title": "Attributi posseduti e attributi ereditati",
+    "note_paths_one": "{{count}} percorso",
+    "note_paths_many": "{{count}} percorsi",
+    "note_paths_other": "{{count}} percorsi",
+    "note_paths_title": "Nota percorsi",
+    "code_note_switcher": "Cambia modalità lingua"
+  },
+  "attributes_panel": {
+    "title": "Attributi delle note"
+  },
+  "right_pane": {
+    "empty_message": "Nulla da segnalare per questa nota",
+    "empty_button": "Nascondi il pannello",
+    "toggle": "Attiva/disattiva pannello destro",
+    "custom_widget_go_to_source": "Vai al codice sorgente"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} allegato",
+    "attachments_many": "{{count}} allegati",
+    "attachments_other": "{{count}} allegati",
+    "layers_one": "{{count}} livello",
+    "layers_many": "{{count}} livelli",
+    "layers_other": "{{count}} livelli",
+    "pages_one": "{{count}} pagina",
+    "pages_many": "{{count}} pagine",
+    "pages_other": "{{count}} pagine",
+    "pages_alt": "Pagina {{pageNumber}}",
+    "pages_loading": "Caricamento in corso..."
+  },
+  "web_view_setup": {
+    "title": "Crea una visualizzazione live di una pagina web direttamente in Trilium",
+    "url_placeholder": "Inserisci o incolla l'indirizzo del sito web, ad esempio https://triliumnotes.org",
+    "create_button": "Crea vista Web",
+    "invalid_url_title": "Indirizzo non valido",
+    "invalid_url_message": "Inserisci un indirizzo web valido, ad esempio https://triliumnotes.org."
+  },
+  "platform_indicator": {
+    "available_on": "Disponibile su {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "Scheda {{count}}",
+    "title_many": "Schede {{count}}",
+    "title_other": "Schede {{count}}",
+    "more_options": "Altre opzioni"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "Segnalibri"
   }
 }

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

@@ -21,8 +21,17 @@
     },
     "bundle-error": {
       "title": "カスタムスクリプトの読み込みに失敗しました",
-      "message": "ノートID”{{id}}”, ノートタイトル “{{title}}” のスクリプトを実行できませんでした。理由は以下の通りです:\n\n{{message}}"
-    }
+      "message": "次の理由によりスクリプトを実行できませんでした:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "サーバーからウィジェットのリストを取得できませんでした"
+    },
+    "widget-render-error": {
+      "title": "カスタム React ウィジェットのレンダリングに失敗しました"
+    },
+    "widget-missing-parent": "カスタムウィジェットに必須の '{{property}}' プロパティが定義されていません。\n\nこのスクリプトを UI 要素なしで実行する場合は、代わりに '#run=frontendStartup' を使用してください。",
+    "open-script-note": "スクリプトノートを開く",
+    "scripting-error": "カスタムスクリプトエラー: {{title}}"
   },
   "add_link": {
     "add_link": "リンクを追加",
@@ -72,7 +81,8 @@
     "configure_launchbar": "ランチャーバーの設定",
     "show_shared_notes_subtree": "共有ノートのサブツリーを表示",
     "new-version-available": "新しいアップデートが利用可能",
-    "download-update": "{{latestVersion}} をバージョンを入手"
+    "download-update": "{{latestVersion}} をバージョンを入手",
+    "search_notes": "検索ノート"
   },
   "left_pane_toggle": {
     "show_panel": "パネルを表示",
@@ -143,16 +153,22 @@
   },
   "note_icon": {
     "change_note_icon": "ノートアイコンの変更",
-    "category": "カテゴリー:",
     "search": "検索:",
-    "reset-default": "アイコンをデフォルトに戻す"
+    "reset-default": "アイコンをデフォルトに戻す",
+    "search_placeholder_other": "{{count}} 個のパックから {{number}} 個のアイコンを検索",
+    "search_placeholder_filtered": "{{name}} で {{number}} 個のアイコンを検索",
+    "filter": "フィルター",
+    "filter-none": "すべてのアイコン",
+    "filter-default": "デフォルトアイコン",
+    "icon_tooltip": "{{name}}\nアイコンパック: {{iconPack}}",
+    "no_results": "アイコンが見つかりません。"
   },
   "basic_properties": {
     "note_type": "ノートタイプ",
     "editable": "編集可能",
     "basic_properties": "基本プロパティ",
     "language": "言語",
-    "configure_code_notes": "コードノートを設定しています..."
+    "configure_code_notes": "コードノートを設定..."
   },
   "i18n": {
     "title": "ローカライゼーション",
@@ -218,7 +234,9 @@
     "unknown_search_option": "不明な検索オプション {{searchOptionName}}",
     "search_note_saved": "検索ノートが {{- notePathTitle}} に保存されました",
     "actions_executed": "アクションが実行されました。",
-    "ancestor": "祖先:"
+    "ancestor": "祖先:",
+    "view_options": "表示オプション:",
+    "option": "オプション"
   },
   "shortcuts": {
     "multiple_shortcuts": "同じアクションに対して複数のショートカットを設定する場合、カンマで区切ることができます。",
@@ -231,7 +249,8 @@
     "reload_app": "リロードして変更を適用する",
     "set_all_to_default": "すべてのショートカットをデフォルトに戻す",
     "confirm_reset": "キーボードショートカットをすべてデフォルトにリセットしますか？",
-    "keyboard_shortcuts": "キーボードショートカット"
+    "keyboard_shortcuts": "キーボードショートカット",
+    "no_results": "'{{filter}}' に一致するショートカットが見つかりません"
   },
   "confirm": {
     "confirmation": "確認",
@@ -258,7 +277,7 @@
     "export_in_progress": "エクスポート処理中: {{progressCount}}",
     "export_finished_successfully": "エクスポートが正常に完了しました。",
     "format_pdf": "PDF - 印刷または共有目的に。",
-    "share-format": "Web 公開用の HTML - 共有ノートで使用されるのと同じテーマを使用しますが、静的 Web サイトとして公開できます。"
+    "share-format": "web 公開用の HTML - 共有ノートで使用されるのと同じテーマを使用しますが、静的 web サイトとして公開できます。"
   },
   "help": {
     "title": "チートシート",
@@ -386,12 +405,12 @@
     "show_toc": "目次を表示"
   },
   "show_highlights_list_widget_button": {
-    "show_highlights_list": "ハイライト一覧を表示"
+    "show_highlights_list": "ハイライトリストを表示"
   },
   "relation_map_buttons": {
     "zoom_out_title": "ズームアウト",
     "zoom_in_title": "ズームイン",
-    "create_child_note_title": "新しい子ノートを作成し、関連マップに追加",
+    "create_child_note_title": "子ノートを作成し、マップに追加",
     "reset_pan_zoom_title": "パンとズームを初期座標と倍率にリセット"
   },
   "tree-context-menu": {
@@ -424,10 +443,13 @@
     "convert-to-attachment-confirm": "選択したノートを親ノートの添付ファイルに変換してもよろしいですか？この操作は画像ノートにのみ適用され、その他のノートはスキップされます。",
     "open-in-popup": "クイック編集",
     "hoist-note": "ホイストノート",
-    "unhoist-note": "ノートをホイストしない",
+    "unhoist-note": "ノートのホイストを解除",
     "edit-branch-prefix": "ブランチの接頭辞を編集",
     "archive": "アーカイブ",
-    "unarchive": "アーカイブ解除"
+    "unarchive": "アーカイブ解除",
+    "open-in-a-new-window": "新しいウィンドウで開く",
+    "hide-subtree": "サブツリーを非表示",
+    "show-subtree": "サブツリーを表示"
   },
   "zen_mode": {
     "button_exit": "禅モードを退出"
@@ -458,7 +480,13 @@
     "convert_into_attachment_successful": "ノート '{{title}}' は添付ファイルに変換されました。",
     "convert_into_attachment_prompt": "本当にノート '{{title}}' を親ノートの添付ファイルに変換しますか？",
     "note_attachments": "ノートの添付ファイル",
-    "open_note_on_server": "サーバー上のノートを開く"
+    "open_note_on_server": "サーバー上のノートを開く",
+    "view_revisions": "ノートの変更履歴...",
+    "note_map": "ノートマップ",
+    "advanced": "高度",
+    "export_as_image": "画像としてエクスポート",
+    "export_as_image_png": "PNG (raster)",
+    "export_as_image_svg": "SVG (vector)"
   },
   "command_palette": {
     "export_note_title": "ノートをエクスポート",
@@ -546,7 +574,8 @@
     "expand_tooltip": "このコレクションの直下の子（1階層下）を展開します。その他のオプションについては、右側の矢印を押してください。",
     "expand_first_level": "直下の子を展開",
     "expand_nth_level": "{{depth}} 階層下まで展開",
-    "expand_all_levels": "すべての階層を展開"
+    "expand_all_levels": "すべての階層を展開",
+    "hide_child_notes": "ツリー内の子ノートを非表示"
   },
   "note_types": {
     "geo-map": "ジオマップ",
@@ -583,7 +612,7 @@
     "file_type": "ファイルタイプ",
     "file_size": "ファイルサイズ",
     "download": "ダウンロード",
-    "open": "開く",
+    "open": "外部で開く",
     "title": "ファイル",
     "upload_new_revision": "編集履歴をアップロード",
     "original_file_name": "元のファイル名",
@@ -599,7 +628,9 @@
     "calculate": "計算",
     "subtree_size": "（サブツリーサイズ: {{size}}、ノード数: {{count}}）",
     "title": "ノート情報",
-    "note_size_info": "ノートのサイズは、このノートに必要なストレージの概算を示します。これは、ノートの内容とそのノートの編集履歴の内容を考慮したものです。"
+    "note_size_info": "ノートのサイズは、このノートに必要なストレージの概算を示します。これは、ノートの内容とそのノートの編集履歴の内容を考慮したものです。",
+    "show_similar_notes": "類似のノートを表示",
+    "mime": "MIME タイプ"
   },
   "image_properties": {
     "file_type": "ファイルタイプ",
@@ -630,7 +661,6 @@
     "revision_deleted": "ノートの変更履歴は削除されました。",
     "settings": "ノートの変更履歴の設定",
     "file_size": "ファイルサイズ:",
-    "preview": "プレビュー:",
     "preview_not_available": "このノートタイプではプレビューは利用できません。",
     "diff_on": "差分を表示",
     "diff_off": "内容を表示",
@@ -797,11 +827,6 @@
     "error_no_path": "移動するパスがありません。",
     "move_success_message": "選択したノートは以下に移動されました "
   },
-  "web_view": {
-    "web_view": "Web ビュー",
-    "embed_websites": "Web ビュータイプでは、ウェブサイトをTriliumに埋め込むことができます。",
-    "create_label": "まず始めに、埋め込みたいURLアドレスのラベルを作成してください。例: #webViewSrc=\"https://www.google.com\""
-  },
   "backend_log": {
     "refresh": "リフレッシュ"
   },
@@ -910,7 +935,7 @@
     "underline": "下線",
     "color": "カラーテキスト",
     "bg_color": "背景色付きテキスト",
-    "visibility_title": "ハイライトリスト表示",
+    "visibility_title": "ハイライトリストの表示",
     "visibility_description": "#hideHighlightWidget ラベルを追加することで、ノートごとにハイライトウィジェットを非表示にできます。",
     "shortcut_info": "設定 -> ショートカット（右ペイン切り替え）で、右ペイン（ハイライトを含む）を素早く切り替えるキーボードショートカットを設定できます。"
   },
@@ -923,7 +948,8 @@
   },
   "toc": {
     "table_of_contents": "目次",
-    "options": "オプション"
+    "options": "オプション",
+    "no_headings": "見出しはありません。"
   },
   "text_auto_read_only_size": {
     "title": "自動読み取り専用のサイズ",
@@ -961,7 +987,7 @@
   "password": {
     "wiki": "wiki",
     "heading": "パスワード",
-    "alert_message": "新しいパスワードは大切に保管してください。パスワードはウェブインターフェースへのログインや、保護されたノートの暗号化に使用されます。パスワードを忘れると、保護されたノートはすべて永久に失われます。",
+    "alert_message": "新しいパスワードは大切に保管してください。パスワードは web インターフェースへのログインや、保護されたノートの暗号化に使用されます。パスワードを忘れると、保護されたノートはすべて永久に失われます。",
     "reset_link": "リセットするにはここをクリック。",
     "old_password": "旧パスワード",
     "new_password": "新パスワード",
@@ -1107,7 +1133,7 @@
     "sql_console_home": "SQLコンソールノートのデフォルトの場所",
     "bookmark_folder": "このラベルの付いたノートは、ブックマークにフォルダとして表示されます（子フォルダへのアクセスを許可します）",
     "share_hidden_from_tree": "このノートは左側のナビゲーションツリーには表示されていませんが、URL からアクセスできます",
-    "share_external_link": "ノートは共有ツリー内で外部ウェブサイトへのリンクとして機能します",
+    "share_external_link": "ノートは共有ツリー内で外部 web サイトへのリンクとして機能します",
     "share_alias": "https://your_trilium_host/share/[your_alias] でノートを利用できるようにエイリアスを定義します",
     "share_omit_default_css": "デフォルトの共有ページのCSSは省略されます。スタイルを大幅に変更する場合に使用してください。",
     "share_root": "/share root で提供されるノートをマークする。",
@@ -1192,7 +1218,11 @@
   },
   "highlights_list_2": {
     "title": "ハイライトリスト",
-    "options": "オプション"
+    "options": "オプション",
+    "title_with_count_other": "{{count}} ハイライト",
+    "modal_title": "ハイライトリストの設定",
+    "menu_configure": "ハイライトリストの設定...",
+    "no_highlights": "ハイライトが見つかりません。"
   },
   "quick-search": {
     "placeholder": "クイック検索",
@@ -1216,7 +1246,15 @@
     "saved-search-note-refreshed": "保存した検索ノートが更新されました。",
     "refresh-saved-search-results": "保存した検索結果を更新",
     "toggle-sidebar": "サイドバーを切り替え",
-    "dropping-not-allowed": "この場所にノートをドロップすることはできません。"
+    "dropping-not-allowed": "この場所にノートをドロップすることはできません。",
+    "clone-indicator-tooltip": "このノートには {{- count}} 個の親があります: {{- parents}}",
+    "clone-indicator-tooltip-single": "このノートは複製されています (親が 1 件追加: {{- parent}})",
+    "shared-indicator-tooltip": "このノートは公開されています",
+    "shared-indicator-tooltip-with-url": "このノートは以下で公開されています: {{- url}}",
+    "subtree-hidden-tooltip_other": "{{count}} 個の子ノートがツリーで非表示になっています",
+    "subtree-hidden-moved-title": "{{title}} に追加されました",
+    "subtree-hidden-moved-description-collection": "このコレクションはツリー内の子ノートを非表示にします。",
+    "subtree-hidden-moved-description-other": "このノートのツリーでは子ノートは非表示になっています。"
   },
   "bulk_actions": {
     "bulk_actions": "一括操作",
@@ -1233,14 +1271,26 @@
     "none_yet": "アクションを上のリストからクリックして追加。"
   },
   "note_title": {
-    "placeholder": "ここにノートのタイトルを入力..."
+    "placeholder": "ここにノートのタイトルを入力...",
+    "created_on": "<Value /> に作成",
+    "last_modified": "<Value /> に変更",
+    "note_type_switcher_label": "{{type}} から切り替え:",
+    "note_type_switcher_others": "その他のノートタイプ",
+    "note_type_switcher_templates": "テンプレート",
+    "note_type_switcher_collection": "コレクション",
+    "edited_notes": "この日に編集されたノート",
+    "promoted_attributes": "プロモート属性"
   },
   "search_result": {
     "no_notes_found": "指定された検索パラメータに該当するノートは見つかりませんでした。",
     "search_not_executed": "検索はまだ実行されていません。上の「検索」ボタンをクリックすると、検索結果が表示されます。"
   },
   "sql_result": {
-    "no_rows": "このクエリでは行が返されませんでした"
+    "no_rows": "このクエリでは行が返されませんでした",
+    "not_executed": "クエリはまだ実行されていません。",
+    "failed": "SQLクエリの実行に失敗しました",
+    "statement_result": "ステートメント結果",
+    "execute_now": "今すぐ実行"
   },
   "sql_table_schemas": {
     "tables": "テーブル"
@@ -1330,8 +1380,9 @@
     "minimum_input": "入力された時間値は {{minimumSeconds}} 秒以上である必要があります。"
   },
   "note_language": {
-    "not_set": "未設定",
-    "configure-languages": "言語を設定..."
+    "not_set": "言語が設定されていません",
+    "configure-languages": "言語を設定...",
+    "help-on-languages": "コンテンツの言語に関するヘルプ..."
   },
   "content_language": {
     "title": "コンテンツの言語",
@@ -1595,11 +1646,14 @@
     "error_unrecognized_command": "認識されないコマンド {{command}}",
     "insert_child_note": "子ノートを挿入",
     "error_cannot_get_branch_id": "ノートパス 「{{notePath}} のbranchIdを取得できません",
-    "note_revisions": "ノートの変更履歴"
+    "note_revisions": "ノートの変更履歴",
+    "backlinks": "バックリンク",
+    "content_language_switcher": "コンテンツの言語: {{language}}"
   },
   "inherited_attribute_list": {
     "title": "継承属性",
-    "no_inherited_attributes": "継承属性はありません。"
+    "no_inherited_attributes": "継承属性はありません。",
+    "none": "なし"
   },
   "note_map": {
     "open_full": "拡大表示",
@@ -1620,7 +1674,7 @@
     "remove_this_attribute": "この属性を削除",
     "remove_color": "このカラーラベルを削除",
     "promoted_attributes": "プロモート属性",
-    "url_placeholder": "http://ウェブサイト..."
+    "url_placeholder": "http://web サイト..."
   },
   "relation_map": {
     "open_in_new_tab": "新しいタブで開く",
@@ -1703,8 +1757,8 @@
     "desktop-application": "デスクトップアプリケーション",
     "native-title-bar": "ネイティブタイトルバー",
     "native-title-bar-description": "WindowsとmacOSでは、ネイティブタイトルバーをオフにしておくと、アプリケーションがよりコンパクトに見えます。Linuxでは、ネイティブタイトルバーを表示したままの方が、他のシステムとの統一性が高まります。",
-    "background-effects": "背景効果を有効化（Windows 11のみ）",
-    "background-effects-description": "Mica効果は、アプリのウィンドウにぼかされたスタイリッシュな背景を追加し、奥行きとモダンな外観を演出します。「ネイティブタイトルバー」を無効にする必要があります。",
+    "background-effects": "背景効果を有効化",
+    "background-effects-description": "アプリウィンドウにぼかしの効いたスタイリッシュな背景を追加し、奥行きとモダンな外観を演出します。「ネイティブタイトルバー」を無効にする必要があります。",
     "restart-app-button": "アプリケーションを再起動して変更を反映",
     "zoom-factor": "ズーム倍率"
   },
@@ -1779,7 +1833,7 @@
     "placeholder": "ここにノートの内容を入力...",
     "auto-detect-language": "自動検出",
     "keeps-crashing": "編集コンポーネントがクラッシュし続けます。Trilium を再起動してください。問題が解決しない場合は、バグレポートの作成をご検討ください。",
-    "editor_crashed_title": "テキストエディタがクラッシュしました",
+    "editor_crashed_title": "テキストエディターがクラッシュしました",
     "editor_crashed_content": "コンテンツは正常に復元されましたが、最近の変更の一部が保存されていない可能性があります。",
     "editor_crashed_details_button": "詳細を見る...",
     "editor_crashed_details_intro": "このエラーが何度も発生する場合は、以下の情報を貼り付けて GitHub に報告することを検討してください。",
@@ -1897,7 +1951,13 @@
   "note_detail": {
     "could_not_find_typewidget": "タイプ {{type}} の typeWidget が見つかりませんでした",
     "printing": "印刷中です...",
-    "printing_pdf": "PDF へのエクスポート中です..."
+    "printing_pdf": "PDF へのエクスポート中です...",
+    "print_report_title": "レポートを印刷",
+    "print_report_collection_content_other": "コレクション内の {{count}} 件のノートは、サポートされていないか保護されているため、印刷できませんでした。",
+    "print_report_collection_details_button": "詳細を見る",
+    "print_report_collection_details_ignored_notes": "無視されたノート",
+    "print_report_error_title": "印刷に失敗しました",
+    "print_report_stack_trace": "スタックトレース"
   },
   "watched_file_update_status": {
     "ignore_this_change": "この変更を無視する",
@@ -1950,7 +2010,8 @@
   "geo-map": {
     "create-child-note-title": "新しい子ノートを作成し、マップに追加する",
     "create-child-note-instruction": "地図をクリックしてその場所に新しいノートを作成するか、Esc キーを押して閉じます。",
-    "unable-to-load-map": "マップを読み込めません。"
+    "unable-to-load-map": "マップを読み込めません。",
+    "create-child-note-text": "マーカーを追加"
   },
   "geo-map-context": {
     "open-location": "現在位置を表示",
@@ -1974,7 +2035,7 @@
   "book_properties_config": {
     "hide-weekends": "週末を非表示",
     "display-week-numbers": "週番号を表示",
-    "map-style": "マップスタイル:",
+    "map-style": "マップスタイル",
     "max-nesting-depth": "最大階層の深さ:",
     "show-scale": "スケールを表示",
     "raster": "Raster",
@@ -1986,16 +2047,22 @@
     "next_theme_message": "現在、レガシーテーマを使用しています。新しいテーマを試してみませんか?",
     "next_theme_button": "新しいテーマを試す",
     "background_effects_title": "背景効果が安定しました",
-    "background_effects_message": "Windowsデバイスでは、背景効果が完全に安定しました。背景効果は、背景をぼかすことでユーザーインターフェースに彩りを添えます。この技術は、Windowsエクスプローラーなどの他のアプリケーションでも使用されています。",
+    "background_effects_message": "WindowsおよびmacOSデバイスで、背景効果が安定しました。背景効果は、背景をぼかすことでユーザーインターフェースに彩りを添えます。",
     "background_effects_button": "背景効果を有効にする",
-    "dismiss": "却下"
+    "dismiss": "却下",
+    "new_layout_title": "新しいレイアウト",
+    "new_layout_message": "Trilium のレイアウトを刷新しました。リボンは廃止され、メインインターフェースにシームレスに統合されました。主要な機能は、新しいステータスバーと展開可能なセクション（プロモート属性など）に集約されています。\n\n新しいレイアウトはデフォルトで有効になっていますが、「オプション」→「外観」から一時的に無効にすることもできます。",
+    "new_layout_button": "詳細情報"
   },
   "settings": {
     "related_settings": "関連設定"
   },
   "settings_appearance": {
     "related_code_blocks": "テキストノート内のコードブロックの配色",
-    "related_code_notes": "コードノートの配色"
+    "related_code_notes": "コードノートの配色",
+    "ui": "ユーザーインターフェース",
+    "ui_old_layout": "旧レイアウト",
+    "ui_new_layout": "新しいレイアウト"
   },
   "units": {
     "percentage": "%"
@@ -2069,7 +2136,7 @@
     "recovery_keys_used": "使用日: {{date}}",
     "recovery_keys_unused": "回復コード {{index}} は未使用です",
     "oauth_title": "OAuth/OpenID",
-    "oauth_description": "OpenIDは、Googleなどの他のサービスのアカウントを使用してウェブサイトにログインし、本人確認を行うための標準化された方法です。デフォルトの発行者はGoogleですが、他のOpenIDプロバイダに変更できます。詳しくは<a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">こちら</a>をご覧ください。Google経由でOpenIDサービスを設定するには、<a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">こちらの手順</a>に従ってください。",
+    "oauth_description": "OpenIDは、Googleなどの他のサービスのアカウントを使用して web サイトにログインし、本人確認を行うための標準化された方法です。デフォルトの発行者はGoogleですが、他のOpenIDプロバイダに変更できます。詳しくは<a href=\"#root/_hidden/_help/_help_Otzi9La2YAUX/_help_WOcw2SLH6tbX/_help_7DAiwaf8Z7Rz\">こちら</a>をご覧ください。Google経由でOpenIDサービスを設定するには、<a href=\"https://developers.google.com/identity/openid-connect/openid-connect\">こちらの手順</a>に従ってください。",
     "oauth_description_warning": "OAuth/OpenIDを有効にするには、config.iniファイルにOAuth/OpenIDのベースURL、クライアントID、クライアントシークレットを設定し、アプリケーションを再起動する必要があります。環境変数から設定する場合は、TRILIUM_OAUTH_BASE_URL, TRILIUM_OAUTH_CLIENT_ID and TRILIUM_OAUTH_CLIENT_SECRET を設定してください。",
     "oauth_missing_vars": "設定がありません: {{-variables}}",
     "oauth_user_account": "ユーザーアカウント: ",
@@ -2087,7 +2154,7 @@
     "will_be_deleted_in": "この添付ファイルは {{time}} 後に自動的に削除されます",
     "will_be_deleted_soon": "この添付ファイルはすぐに自動的に削除されます",
     "deletion_reason": "、添付ファイルがノートのコンテンツにリンクされていないためです。削除されないようにするには、添付ファイルのリンクをコンテンツに再度追加するか、添付ファイルをノートに変換してください。",
-    "role_and_size": "ロール: {{role}},サイズ: {{size}}",
+    "role_and_size": "ロール: {{role}},サイズ: {{size}}, MIME: {{- mimeType}}",
     "link_copied": "添付ファイルのリンクをクリップボードにコピーしました。",
     "unrecognized_role": "添付ファイルのロール「{{role}}」は認識されません。"
   },
@@ -2116,5 +2183,95 @@
     "unknown_http_error_title": "サーバーとの通信エラー",
     "unknown_http_error_content": "ステータスコード: {{statusCode}}\nURL: {{method}} {{url}}\nメッセージ: {{message}}",
     "traefik_blocks_requests": "Traefik リバース プロキシを使用している場合、サーバーとの通信に影響する重大な変更が導入されました。"
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "前のノートに戻る",
+    "go-forward": "次のノートに進む"
+  },
+  "experimental_features": {
+    "title": "実験オプション",
+    "disclaimer": "これらのオプションは試験的なもので、動作が不安定になる可能性があります。注意してご使用ください。",
+    "new_layout_name": "新しいレイアウト",
+    "new_layout_description": "よりモダンな外観と使いやすさが向上した新しいレイアウトをお試しください。今後のリリースで大幅な変更が加えられる可能性があります。"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "読み取り専用",
+    "read_only_auto": "自動的に読み取り専用",
+    "shared_publicly": "公開で共有",
+    "shared_locally": "ローカルで共有",
+    "read_only_explicit_description": "このノートは手動で読み取り専用に設定されています。\nクリックすると一時的に編集できます。",
+    "read_only_temporarily_disabled": "一時的に編集可能",
+    "read_only_auto_description": "このノートはパフォーマンス上の理由により、自動的に読み取り専用モードに設定されました。この自動制限は設定から調整できます。\n\n一時的に編集するにはクリックしてください。",
+    "read_only_temporarily_disabled_description": "このノートは現在編集可能ですが、通常は読み取り専用です。別のノートに移動すると読み取り専用に戻ります。\n\nクリックすると読み取り専用モードが再度有効になります。",
+    "clipped_note": "Web クリップ",
+    "clipped_note_description": "このノートは {{url}} から取得されました。\n\nクリックすると元の web ページに移動します。",
+    "execute_script": "スクリプトを実行",
+    "execute_script_description": "このノートはスクリプトノートです。クリックするとスクリプトが実行されます。",
+    "execute_sql": "SQL を実行",
+    "execute_sql_description": "このノートは SQL ノートです。クリックすると SQL クエリが実行されます。",
+    "shared_copy_to_clipboard": "リンクをクリップボードにコピー",
+    "shared_open_in_browser": "ブラウザでリンクを開く",
+    "shared_unshare": "共有を削除",
+    "save_status_saved": "保存されました",
+    "save_status_saving": "保存中...",
+    "save_status_unsaved": "未保存",
+    "save_status_error": "保存に失敗しました",
+    "save_status_saving_tooltip": "変更を保存しています。",
+    "save_status_unsaved_tooltip": "未保存の変更があります。すぐに自動的に保存されます。",
+    "save_status_error_tooltip": "ノートの保存中にエラーが発生しました。可能であれば、ノートの内容を別の場所にコピーして、アプリケーションを再読み込みしてください。"
+  },
+  "status_bar": {
+    "language_title": "コンテンツの言語を変更",
+    "note_info_title": "ノート情報を表示（例: 日付、ノートのサイズなど）",
+    "backlinks_title_other": "バックリンクを表示",
+    "attachments_title_other": "添付ファイルを新しいタブで表示",
+    "attributes_other": "{{count}} 個の属性",
+    "attributes_title": "所有属性と継承属性",
+    "note_paths_title": "ノートパス",
+    "code_note_switcher": "言語モードを変更",
+    "backlinks_other": "{{count}} バックリンク",
+    "attachments_other": "{{count}} 件の添付ファイル",
+    "note_paths_other": "{{count}} 個のパス"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "ホイスト",
+    "hoisted_badge_title": "ホイスト解除",
+    "workspace_badge": "ワークスペース",
+    "scroll_to_top_title": "ノートの先頭にジャンプ",
+    "create_new_note": "新しい子ノートを作成",
+    "empty_hide_archived_notes": "アーカイブされたノートを非表示"
+  },
+  "right_pane": {
+    "empty_message": "このノートには何も表示されません",
+    "empty_button": "パネルを非表示",
+    "toggle": "右パネルを切り替え",
+    "custom_widget_go_to_source": "ソースコードへ移動"
+  },
+  "attributes_panel": {
+    "title": "ノート属性"
+  },
+  "pdf": {
+    "attachments_other": "{{count}} 添付ファイル",
+    "layers_other": "{{count}} 層",
+    "pages_other": "{{count}} ページ",
+    "pages_alt": "ページ {{pageNumber}}",
+    "pages_loading": "読み込み中..."
+  },
+  "platform_indicator": {
+    "available_on": "{{platform}} で利用可能"
+  },
+  "mobile_tab_switcher": {
+    "title_other": "{{count}} タブ",
+    "more_options": "その他のオプション"
+  },
+  "bookmark_buttons": {
+    "bookmarks": "ブックマーク"
+  },
+  "web_view_setup": {
+    "title": "Trilium に直接 Web ページのライブビューを作成",
+    "url_placeholder": "Web サイトのアドレスを入力または貼り付けて下さい。 例: https://triliumnotes.org",
+    "create_button": "Web ビューを作成",
+    "invalid_url_title": "無効なアドレス",
+    "invalid_url_message": "有効な Web アドレスを入力してください。 例: https://triliumnotes.org"
   }
 }

apps/client/src/translations/nb-NO/translation.json

@@ -1 +1,82 @@
-{}
+{
+  "about": {
+    "title": "Om Trilium Notes",
+    "app_version": "App versjon:",
+    "db_version": "DB versjon:",
+    "sync_version": "Synk versjon:",
+    "build_date": "Byggdato:",
+    "build_revision": "Bygg versjon:",
+    "data_directory": "Datamappe:",
+    "homepage": "Hjemmeside:"
+  },
+  "experimental_features": {
+    "new_layout_description": "Prøv det nye grensesnittet for et mer moderne utseende og forbedret brukervenlighet. Det må påregnes betydelige endringer i kommende versjoner."
+  },
+  "cpu_arch_warning": {
+    "recommendation": "For den beste brukeropplevelsen, vennligst last ned den tilpassede ARM64-versjonen av TriliumNext fra siden for utgivelser."
+  },
+  "zpetne_odkazy": {
+    "backlink_one": "{{count}} Tilbakelenke",
+    "backlink_other": "{{count}} Tilbakelenker"
+  },
+  "add_link": {
+    "note": "Notat"
+  },
+  "branch_prefix": {
+    "prefix": "Prefiks : ",
+    "save": "Lagre"
+  },
+  "bulk_actions": {
+    "labels": "Etiketter",
+    "relations": "Relasjoner",
+    "notes": "Notater",
+    "other": "Andre"
+  },
+  "confirm": {
+    "confirmation": "Bekreftelse",
+    "cancel": "Avbryt",
+    "ok": "OK"
+  },
+  "delete_notes": {
+    "close": "Lukk",
+    "cancel": "Avbryt",
+    "ok": "OK"
+  },
+  "export": {
+    "close": "Lukk",
+    "export": "Eksporter"
+  },
+  "note_type_chooser": {
+    "templates": "Maler"
+  },
+  "help": {
+    "title": "Hurtigveiledning",
+    "troubleshooting": "Feilsøking",
+    "other": "Andre"
+  },
+  "import": {
+    "options": "Alternativer",
+    "import": "Importer"
+  },
+  "include_note": {
+    "label_note": "Notat"
+  },
+  "prompt": {
+    "title": "Ledetekst",
+    "ok": "OK",
+    "defaultTitle": "Ledetekst"
+  },
+  "info": {
+    "closeButton": "Lukk",
+    "okButton": "OK"
+  },
+  "markdown_import": {
+    "import_button": "Importer"
+  },
+  "protected_session_password": {
+    "close_label": "Lukk"
+  },
+  "recent_changes": {
+    "undelete_link": "gjenopprett"
+  }
+}

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

@@ -12,7 +12,7 @@
   "toast": {
     "critical-error": {
       "title": "Kritische Error",
-      "message": "Een kritieke fout heeft plaatsgevonden waardoor de cliënt zich aanmeldt vanaf het begin:\n\n84X\n\nDit is waarschijnlijk veroorzaakt door een script dat op een onverwachte manier faalt. Probeer de sollicitatie in veilige modus te starten en de kwestie aan te spreken."
+      "message": "Een kritieke fout heeft plaatsgevonden waardoor de applicatie niet kon opstarten:\n\n{{message}}\n\nDit is waarschijnlijk veroorzaakt door een onverwachte fout in een script. Probeer de applicatie op te starten in veilige modus en het probleem op te lossen."
     },
     "widget-error": {
       "title": "Starten widget mislukt",
@@ -22,7 +22,16 @@
     "bundle-error": {
       "title": "Custom script laden mislukt",
       "message": "Script van notitie met ID \"{{id}}\", getiteld \"{{title}}\" kon niet worden uitgevoerd vanwege:\n\n{{message}}"
-    }
+    },
+    "scripting-error": "Error met script: {{title}}",
+    "widget-list-error": {
+      "title": "Kon geen lijst met widgets ophalen van de server"
+    },
+    "widget-render-error": {
+      "title": "React-widget kon niet geladen worden"
+    },
+    "widget-missing-parent": "Widget heeft niet het verplichte '{{property}}'-veld gedefinieerd.\n\nAls dit script is bedoeld om zonder interface te draaien, gebruik dan in plaats daarvan '#run=frontendStartup'.",
+    "open-script-note": "Open scriptnotitie"
   },
   "add_link": {
     "add_link": "Voeg link toe",
@@ -41,7 +50,8 @@
     "help_on_tree_prefix": "Help bij boomvoorvoegsel",
     "prefix": "Voorvoegsel: ",
     "edit_branch_prefix_multiple": "Bewerk zijtakvoorvoegsel voor {{count}} zijtakken",
-    "branch_prefix_saved_multiple": "Vertakkingsvoorvoegsel opgeslagen voor {{count}} vertakkingen."
+    "branch_prefix_saved_multiple": "Vertakkingsvoorvoegsel opgeslagen voor {{count}} vertakkingen.",
+    "affected_branches": "Aangetaste takken ({{count}}):"
   },
   "bulk_actions": {
     "bulk_actions": "Bulk acties",
@@ -54,7 +64,8 @@
     "labels": "Labels",
     "relations": "Relaties",
     "notes": "Notities",
-    "other": "Andere"
+    "other": "Andere",
+    "include_descendants": "Tel afstammelingen van de geselecteerde notities mee"
   },
   "calendar": {
     "april": "April",
@@ -78,5 +89,35 @@
   },
   "show_toc_widget_button": {
     "show_toc": "Laat Inhoudsopgave zien"
+  },
+  "status_bar": {
+    "note_paths_one": "{{count}} pad",
+    "note_paths_other": "{{count}} paden",
+    "note_paths_title": "Notitiepaden",
+    "code_note_switcher": "Verander de taalmodus"
+  },
+  "attributes_panel": {
+    "title": "Notitie-attributen"
+  },
+  "right_pane": {
+    "empty_message": "Geen informatie voor deze notitie",
+    "empty_button": "Verberg dit paneel",
+    "toggle": "Schakel rechterpaneel in/uit",
+    "custom_widget_go_to_source": "Go naar de broncode"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} bijlage",
+    "attachments_other": "{{count}} bijlagen",
+    "layers_one": "{{count}} laag",
+    "layers_other": "{{count}} lagen",
+    "pages_one": "{{count}} pagina",
+    "pages_other": "{{count}} pagina's",
+    "pages_alt": "Pagina {{pageNumber}}",
+    "pages_loading": "Laden..."
+  },
+  "clone_to": {
+    "clone_notes_to": "Kloon de notities naar...",
+    "help_on_links": "Hulp op links",
+    "notes_to_clone": "Notities om te klonen"
   }
 }

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

@@ -22,7 +22,16 @@
     "bundle-error": {
       "title": "Falha para carregar o script customizado",
       "message": "O script da nota com ID \"{{id}}\", intitulada \"{{title}}\", não pôde ser executado devido a:\n\n{{message}}"
-    }
+    },
+    "widget-list-error": {
+      "title": "Falha ao obter a lista de widgets do servidor"
+    },
+    "scripting-error": "Erro do script específicado: {{title}}",
+    "open-script-note": "Abrir script da nota",
+    "widget-render-error": {
+      "title": "Falha do renderizar um widget React personalizado"
+    },
+    "widget-missing-parent": "Widget adaptado não tem a propriedade '{{property}}' mandatória definida.\n\nSe este script é para ser executado sem um element de UI, usar '#run=frontendStartup'."
   },
   "add_link": {
     "add_link": "Adicionar ligação",
@@ -39,7 +48,10 @@
     "help_on_tree_prefix": "Ajuda sobre o prefixo da árvore de notas",
     "prefix": "Prefixo: ",
     "save": "Gravar",
-    "branch_prefix_saved": "O prefixo de ramificação foi gravado."
+    "branch_prefix_saved": "O prefixo de ramificação foi gravado.",
+    "edit_branch_prefix_multiple": "Editar prefixo para {{count}} branches",
+    "branch_prefix_saved_multiple": "Prefixo dos branches foi editado para {{count}} branches.",
+    "affected_branches": "Alterados ({{count}}) branches:"
   },
   "bulk_actions": {
     "bulk_actions": "Ações em massa",
@@ -104,7 +116,8 @@
     "export_status": "Estado da exportação",
     "export_in_progress": "Exportação em andamento: {{progressCount}}",
     "export_finished_successfully": "Exportação concluída com sucesso.",
-    "format_pdf": "PDF – para impressão ou compartilhamento."
+    "format_pdf": "PDF – para impressão ou compartilhamento.",
+    "share-format": "HTML para publicação web - usa o mesmo tema que é usado para notas partilhadas, mas pode ser publicado como um site estatico."
   },
   "help": {
     "title": "Folha de Dicas",
@@ -158,7 +171,8 @@
     "showSQLConsole": "mostrar console SQL",
     "other": "Outros",
     "quickSearch": "focar no campo de pesquisa rápida",
-    "inPageSearch": "pesquisa na página"
+    "inPageSearch": "pesquisa na página",
+    "editShortcuts": "Editar atalhos do teclado"
   },
   "import": {
     "importIntoNote": "Importar para a nota",
@@ -184,7 +198,8 @@
     },
     "import-status": "Estado da importação",
     "in-progress": "Importação em andamento: {{progress}}",
-    "successful": "Importação concluída com sucesso."
+    "successful": "Importação concluída com sucesso.",
+    "importZipRecommendation": "Quando a importar ficheiro ZIP, a hierarquia de notas vai reflectir a estrutura da sub directoria dentro do ficheiro."
   },
   "include_note": {
     "dialog_title": "Incluir nota",
@@ -199,7 +214,8 @@
   "info": {
     "modalTitle": "Mensagem informativa",
     "closeButton": "Fechar",
-    "okButton": "OK"
+    "okButton": "OK",
+    "copy_to_clipboard": "Copiar para a área de transferência"
   },
   "jump_to_note": {
     "search_placeholder": "Pesquise uma nota pelo nome ou digite > para comandos...",
@@ -274,8 +290,12 @@
     "download_button": "Descarregar",
     "mime": "MIME: ",
     "file_size": "Tamanho do ficheiro:",
-    "preview": "Visualizar:",
-    "preview_not_available": "A visualização não está disponível para este tipo de nota."
+    "preview_not_available": "A visualização não está disponível para este tipo de nota.",
+    "diff_on": "Mostrar diferenças",
+    "diff_off": "Mostrar conteúdos",
+    "diff_on_hint": "Carregar para mostrar diferenças da fonte da nota",
+    "diff_off_hint": "Carregar para mostrar conteúdos da nota",
+    "diff_not_available": "Diferenças não disponível."
   },
   "sort_child_notes": {
     "sort_children_by": "Ordenar notas filhas por...",
@@ -586,7 +606,18 @@
     "september": "Setembro",
     "october": "Outubro",
     "november": "Novembro",
-    "december": "Dezembro"
+    "december": "Dezembro",
+    "week": "Semana",
+    "week_previous": "Semana anterior",
+    "week_next": "Próxima semana",
+    "month": "Mês",
+    "month_previous": "Mês anterior",
+    "month_next": "Próximo mês",
+    "year": "Ano",
+    "year_previous": "Ano anterior",
+    "year_next": "Próximo ano",
+    "list": "Lista",
+    "today": "Hoje"
   },
   "close_pane_button": {
     "close_this_pane": "Fechar este painel"
@@ -629,7 +660,9 @@
     "about": "Sobre o Trilium Notes",
     "logout": "Sair",
     "show-cheatsheet": "Exibir Cheatsheet",
-    "toggle-zen-mode": "Modo Zen"
+    "toggle-zen-mode": "Modo Zen",
+    "new-version-available": "Nova actualização disponível",
+    "download-update": "Obter versão {{latestVersion}}"
   },
   "zen_mode": {
     "button_exit": "Sair do Modo Zen"
@@ -667,7 +700,14 @@
     "convert_into_attachment_failed": "A conversão da nota '{{title}}' falhou.",
     "convert_into_attachment_successful": "A nota '{{title}}' foi convertida para anexo.",
     "convert_into_attachment_prompt": "Tem certeza que quer converter a nota '{{title}}' num anexo da nota pai?",
-    "print_pdf": "Exportar como PDF…"
+    "print_pdf": "Exportar como PDF…",
+    "open_note_on_server": "Abrir nota no servidor",
+    "export_as_image": "Exportar como imagem",
+    "note_map": "Mapa de notas",
+    "advanced": "Avançadas",
+    "view_revisions": "Revisões da nota...",
+    "export_as_image_svg": "SVG (vectorial)",
+    "export_as_image_png": "PNG (matricial)"
   },
   "onclick_button": {
     "no_click_handler": "Componente de botão '{{componentId}}' não possui manipulador de clique definido"
@@ -713,20 +753,29 @@
   "zpetne_odkazy": {
     "relation": "relação",
     "backlink_one": "{{count}} Ligação Reversa",
-    "backlink_many": "",
+    "backlink_many": "{{count}} Ligações Reversas",
     "backlink_other": "{{count}} Ligações Reversas"
   },
   "mobile_detail_menu": {
     "insert_child_note": "Inserir nota filha",
     "delete_this_note": "Apagar esta nota",
     "error_cannot_get_branch_id": "Não foi possível obter o branchId para o notePath '{{notePath}} '",
-    "error_unrecognized_command": "Comando não reconhecido {{command}}"
+    "error_unrecognized_command": "Comando não reconhecido {{command}}",
+    "note_revisions": "Revisões da nota"
   },
   "note_icon": {
     "change_note_icon": "Alterar ícone da nota",
-    "category": "Categoria:",
     "search": "Pesquisa:",
-    "reset-default": "Redefinir para o ícone padrão"
+    "reset-default": "Redefinir para o ícone padrão",
+    "filter": "Filtrar",
+    "filter-none": "Todos os icons",
+    "filter-default": "Icons default",
+    "no_results": "Não foram encontrados icons.",
+    "search_placeholder_filtered": "Procurar {{number}} icons no {{name}}",
+    "icon_tooltip": "{{name}}\nPacote de icons: {{iconPack}}",
+    "search_placeholder_one": "Procurar {{number}} icon nos {{count}} pacotes",
+    "search_placeholder_many": "Procurar {{number}} icons em {{count}} pacotes",
+    "search_placeholder_other": "Procurar {{number}} icons nos {{count}} pacotes"
   },
   "basic_properties": {
     "note_type": "Tipo da nota",
@@ -747,7 +796,14 @@
     "calendar": "Calendário",
     "table": "Tabela",
     "geo-map": "Mapa geográfico",
-    "board": "Quadro"
+    "board": "Quadro",
+    "expand_first_level": "Expandir descendentes directos",
+    "presentation": "Apresentação",
+    "expand_nth_level": "Expandir {{depth}} níveis",
+    "expand_all_levels": "Expandir todos os níveis",
+    "include_archived_notes": "Mostrar notas arquivadas",
+    "expand_tooltip": "Expande a direcção dos descendentes desta colecção (um nível). Para mais opções, carregar na seta à direita.",
+    "hide_child_notes": "Esconder notas descendentes na árvore"
   },
   "edited_notes": {
     "no_edited_notes_found": "Ainda não há nenhuma nota editada neste dia…",
@@ -780,7 +836,8 @@
   },
   "inherited_attribute_list": {
     "title": "Atributos Herdados",
-    "no_inherited_attributes": "Nenhum atributo herdado."
+    "no_inherited_attributes": "Nenhum atributo herdado.",
+    "none": "Nenhum"
   },
   "note_info_widget": {
     "note_id": "ID da Nota",
@@ -791,7 +848,9 @@
     "note_size_info": "O tamanho da nota fornece uma estimativa aproximada dos requisitos de armazenamento para esta nota. Leva em conta o conteúdo e o conteúdo das suas revisões de nota.",
     "calculate": "calcular",
     "subtree_size": "(tamanho da subárvore: {{size}} em {{count}} notas)",
-    "title": "Informações da nota"
+    "title": "Informações da nota",
+    "mime": "Tipo MIME",
+    "show_similar_notes": "Mostrar notas semelhantes"
   },
   "note_map": {
     "open_full": "Expandir completamente",
@@ -854,7 +913,8 @@
     "search_parameters": "Parâmetros de Pesquisa",
     "unknown_search_option": "Opção de pesquisa desconhecida {{searchOptionName}}",
     "search_note_saved": "Nota de pesquisa foi gravada em {{- notePathTitle}}",
-    "actions_executed": "As ações foram executadas."
+    "actions_executed": "As ações foram executadas.",
+    "view_options": "Ver opções:"
   },
   "similar_notes": {
     "title": "Notas Similares",
@@ -948,14 +1008,22 @@
     "no_attachments": "Esta nota não possuí anexos."
   },
   "book": {
-    "no_children_help": "Esta coleção não possui nenhum nota filha, então não há nada para exibir. Veja <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> para pormenores."
+    "no_children_help": "Esta coleção não possui nenhum nota filha, então não há nada para exibir. Veja <a href=\"https://triliumnext.github.io/Docs/Wiki/book-note.html\">wiki</a> para pormenores.",
+    "drag_locked_title": "Bloqueado para edição",
+    "drag_locked_message": "Arrastar não permitida pois a coleção está bloqueada para edição."
   },
   "editable_code": {
     "placeholder": "Digite o conteúdo da sua nota de código aqui…"
   },
   "editable_text": {
     "placeholder": "Digite o conteúdo da sua nota aqui…",
-    "auto-detect-language": "Detetado automaticamente"
+    "auto-detect-language": "Detetado automaticamente",
+    "editor_crashed_title": "O editor de texto quebrou",
+    "editor_crashed_details_button": "Ver mais detalhes...",
+    "editor_crashed_details_title": "Informação técnica",
+    "editor_crashed_details_intro": "Se teve este erro várias vezes, considerer reportar no GitHub disponibilizando a informação abaixo.",
+    "editor_crashed_content": "O seu conteudo foi recuperado com sucesso, mas alguns das alterações mais recentes podem não ter sido gravadas.",
+    "keeps-crashing": "Componente de edição a rebentar continuamente. Por favor tentar reiniciar Trilium. Se o problema persistir, considere abrir um bug report."
   },
   "empty": {
     "open_note_instruction": "Abra uma nota a digitar o título da nota no campo abaixo ou escolha uma nota na árvore.",
@@ -1000,11 +1068,6 @@
     "note_detail_render_help_1": "Esta nota de ajuda é mostrada porque esta nota do tipo Renderizar HTML não possui a relação necessária para funcionar corretamente.",
     "note_detail_render_help_2": "O tipo de nota Renderizar HTML é usado para <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/scripts.html\">automação</a>. Em suma, tem uma nota de código HTML (opcionalmente com algum JavaScript) e esta nota irá renderizá-la. Para fazê-lo funcionar, deve definir uma <a class=\"external\" href=\"https://triliumnext.github.io/Docs/Wiki/attributes.html\">relação</a> chamada \"renderNote\" que aponta para a nota HTML a ser renderizada."
   },
-  "web_view": {
-    "web_view": "Web View",
-    "embed_websites": "Nota do tipo Visualização Web permite que incorpore sites no Trilium.",
-    "create_label": "Para começar, crie uma etiqueta com um endereço URL que deseja incorporar, por exemplo, #webViewSrc=\"https://www.google.com\""
-  },
   "backend_log": {
     "refresh": "Recarregar"
   },
@@ -1083,7 +1146,8 @@
     "title": "Largura do Conteúdo",
     "default_description": "Por padrão, o Trilium limita a largura máxima do conteúdo para melhorar a legibilidade em janelas maximizadas em ecrãs largos.",
     "max_width_label": "Largura máxima do conteúdo",
-    "max_width_unit": "pixels"
+    "max_width_unit": "pixels",
+    "centerContent": "Manter conteúdo centrado"
   },
   "native_title_bar": {
     "title": "Barra de Título Nativa (requer recarregar a app)",
@@ -1115,7 +1179,9 @@
     "title": "Desempenho",
     "enable-motion": "Ativar transições e animações",
     "enable-shadows": "Ativar sombras",
-    "enable-backdrop-effects": "Ativar efeitos de fundo para menus, popups e painéis"
+    "enable-backdrop-effects": "Ativar efeitos de fundo para menus, popups e painéis",
+    "enable-smooth-scroll": "Activar deslocamento suave",
+    "app-restart-required": "(é necessário reiniciar a aplicação para aplicar as alterações)"
   },
   "ai_llm": {
     "not_started": "Não iniciado",
@@ -1274,7 +1340,10 @@
     "title": "Editor"
   },
   "code_mime_types": {
-    "title": "Tipos MIME disponíveis no dropdown"
+    "title": "Tipos MIME disponíveis no dropdown",
+    "tooltip_syntax_highlighting": "Destaque de sintaxe",
+    "tooltip_code_block_syntax": "Blocos de código nas notas de texto",
+    "tooltip_code_note_syntax": "Notas de código"
   },
   "vim_key_bindings": {
     "use_vim_keybindings_in_code_notes": "Atribuições de teclas do Vim",
@@ -1394,7 +1463,13 @@
     "min-days-in-first-week": "Mínimo de dias da primeira semana",
     "first-week-info": "Primeira semana que contenha a primeira Quinta-feira do ano é baseado na <a href=\"https://en.wikipedia.org/wiki/ISO_week_date#First_week\">ISO 8601</a>.",
     "first-week-warning": "Alterar as opções de primeira semana pode causar duplicidade nas Notas Semanais existentes e estas Notas não serão atualizadas de acordo.",
-    "formatting-locale": "Formato de data e número"
+    "formatting-locale": "Formato de data e número",
+    "tuesday": "Terça-feira",
+    "wednesday": "Quarta-feira",
+    "thursday": "Quinta-feira",
+    "friday": "Sexta-feira",
+    "saturday": "Sábado",
+    "formatting-locale-auto": "Baseado na linguagem da aplicação"
   },
   "backup": {
     "automatic_backup": "Backup automático",
@@ -1487,7 +1562,8 @@
     "oauth_description_warning": "Para ativar o OAuth/OpenID, precisa definir a URL base do OAuth/OpenID, o client ID e o client secret no ficheiro config.ini e reiniciar a aplicação. Se quiser configurar via variáveis de ambiente, defina TRILIUM_OAUTH_BASE_URL, TRILIUM_OAUTH_CLIENT_ID e TRILIUM_OAUTH_CLIENT_SECRET.",
     "oauth_user_account": "Conta do Utilizador: ",
     "oauth_user_email": "E-mail do Utilizador: ",
-    "oauth_user_not_logged_in": "Não está logado!"
+    "oauth_user_not_logged_in": "Não está logado!",
+    "oauth_missing_vars": "Configurações em falta: {{-variables}}"
   },
   "shortcuts": {
     "keyboard_shortcuts": "Atalhos de Teclado",
@@ -1587,7 +1663,12 @@
     "apply-bulk-actions": "Aplicar ações em massa",
     "converted-to-attachments": "{{count}} notas foram convertidas em anexos.",
     "convert-to-attachment-confirm": "Tem certeza que deseja converter as notas selecionadas em anexos das suas notas-pai?",
-    "open-in-popup": "Edição rápida"
+    "open-in-popup": "Edição rápida",
+    "open-in-a-new-window": "Abrir numa nova janela",
+    "archive": "Arquivar",
+    "unarchive": "Retirar do arquivo",
+    "hide-subtree": "Esconder sub-árvore",
+    "show-subtree": "Mostrar sub-árvore"
   },
   "shared_info": {
     "shared_publicly": "Esta nota é partilhada publicamente em {{- link}}.",
@@ -1648,7 +1729,13 @@
   },
   "highlights_list_2": {
     "title": "Lista de Destaques",
-    "options": "Opções"
+    "options": "Opções",
+    "no_highlights": "Sem destaques encontrados.",
+    "menu_configure": "Configurar lista de destaques...",
+    "modal_title": "Configurar list de destaques",
+    "title_with_count_one": "{{count}} destaque",
+    "title_with_count_many": "{{count}} destaques",
+    "title_with_count_other": "{{count}} destaques"
   },
   "quick-search": {
     "placeholder": "Pesquisa rápida",
@@ -1671,16 +1758,43 @@
     "refresh-saved-search-results": "Atualizar resultados de pesquisa gravados",
     "create-child-note": "Criar nota filha",
     "unhoist": "Desafixar",
-    "toggle-sidebar": "Alternar barra lateral"
+    "toggle-sidebar": "Alternar barra lateral",
+    "dropping-not-allowed": "Largar notas nesta localização não é permitida",
+    "clone-indicator-tooltip": "Esta nota tem {{- count}} ascendentes: {{- parents}}",
+    "shared-indicator-tooltip": "Esta nota está partilhada publicamente",
+    "shared-indicator-tooltip-with-url": "Esta nota está partilhada publicamente em: {{- url}}",
+    "subtree-hidden-moved-title": "Adicionar ao {{title}}",
+    "subtree-hidden-moved-description-collection": "Esta colecção esconde as notas descendentes na árvore.",
+    "subtree-hidden-moved-description-other": "Notas descendentes estão escondidades na árvore para esta nota.",
+    "subtree-hidden-tooltip_one": "{{count}} nota descendentes escondidas da árvore",
+    "subtree-hidden-tooltip_many": "{{count}} notas descendentes escondidas da árvore",
+    "subtree-hidden-tooltip_other": "{{count}} notas descendentes escondidas da árvore",
+    "clone-indicator-tooltip-single": "Esta nota está clonada (1 additional parent: {{- parent}})"
   },
   "title_bar_buttons": {
     "window-on-top": "Manter Janela no Topo"
   },
   "note_detail": {
-    "could_not_find_typewidget": "Não foi possível encontrar typeWidget para o tipo '{{type}}'"
+    "could_not_find_typewidget": "Não foi possível encontrar typeWidget para o tipo '{{type}}'",
+    "print_report_collection_details_button": "Ver detalhes",
+    "printing": "Impressão em progresso...",
+    "printing_pdf": "Exportação PDF em progresso...",
+    "print_report_title": "Imprimir relatório",
+    "print_report_collection_details_ignored_notes": "Ignorar notas",
+    "print_report_collection_content_one": "{{count}} nota na colecção não pode ser impressa porque não é suportado ou está protegida.",
+    "print_report_collection_content_many": "{{count}} notas na colecção não podem ser impressas porque não é suportado ou estão protegidas.",
+    "print_report_collection_content_other": "{{count}} notas na colecção não podem ser impressas porque não é suportado ou estão protegidas."
   },
   "note_title": {
-    "placeholder": "digite o título da nota aqui..."
+    "placeholder": "digite o título da nota aqui...",
+    "promoted_attributes": "Atributos destacados",
+    "created_on": "Criado em <Value />",
+    "last_modified": "Modificado em <Value />",
+    "note_type_switcher_label": "Alterar de {{type}} para:",
+    "note_type_switcher_others": "Outro tipo de nota",
+    "note_type_switcher_templates": "Template",
+    "note_type_switcher_collection": "Colecção",
+    "edited_notes": "Notas editadas neste dia"
   },
   "search_result": {
     "no_notes_found": "Nenhuma nota encontrada para os parâmetros de pesquisa digitados.",
@@ -1709,7 +1823,8 @@
   },
   "toc": {
     "table_of_contents": "Tabela de Conteúdos",
-    "options": "Opções"
+    "options": "Opções",
+    "no_headings": "Sem cabeçalhos."
   },
   "watched_file_update_status": {
     "file_last_modified": "O ficheiro <code class=\"file-path\"></code> foi modificado pela última vez em <span class=\"file-last-modified\"></span>.",
@@ -1752,7 +1867,9 @@
   "ws": {
     "sync-check-failed": "A verificação de sincronização falhou!",
     "consistency-checks-failed": "A verificação de consistência falhou! Veja os logs para pormenores.",
-    "encountered-error": "Encontrado o erro \"{{message}}\", verifique o console."
+    "encountered-error": "Encontrado o erro \"{{message}}\", verifique o console.",
+    "lost-websocket-connection-title": "Perdida conexão com o servidor",
+    "lost-websocket-connection-message": "Verifique a configuração da proxy inversa (e.g. nginx ou Apache) para assegurar conexões WebSocket estão permitidas e não bloqueadas."
   },
   "hoisted_note": {
     "confirm_unhoisting": "A nota solicitada '{{requestedNote}}' está fora da árvore da nota fixada '{{hoistedNote}}' e precisa desafixar para aceder a nota. Quer prosseguir e desafixar?"
@@ -1808,7 +1925,8 @@
     "copy-link": "Copiar ligação",
     "paste": "Colar",
     "paste-as-plain-text": "Colar como texto sem formatação",
-    "search_online": "Pesquisar por \"{{term}}\" com {{searchEngine}}"
+    "search_online": "Pesquisar por \"{{term}}\" com {{searchEngine}}",
+    "search_in_trilium": "A procurar \"{{term}}\" no Trilium"
   },
   "image_context_menu": {
     "copy_reference_to_clipboard": "Copiar referência para a área de transferência",
@@ -1818,7 +1936,8 @@
     "open_note_in_new_tab": "Abrir nota em nova guia",
     "open_note_in_new_split": "Abrir nota em nova divisão",
     "open_note_in_new_window": "Abrir nota em nova janela",
-    "open_note_in_popup": "Edição rápida"
+    "open_note_in_popup": "Edição rápida",
+    "open_note_in_other_split": "Abrir nota noutro separador"
   },
   "electron_integration": {
     "desktop-application": "Aplicação Desktop",
@@ -1826,7 +1945,8 @@
     "native-title-bar-description": "Para Windows e macOS, manter a barra de título nativa desativada faz a aplicação parecer mais compacta. No Linux, manter a barra de título nativa ativada faz a aplicação se integrar melhor com o restante do sistema.",
     "background-effects": "Ativar efeitos de fundo (apenas Windows 11)",
     "restart-app-button": "Reiniciar a aplicação para ver as alterações",
-    "zoom-factor": "Fator de Zoom"
+    "zoom-factor": "Fator de Zoom",
+    "background-effects-description": "O Mica adiciona um desfoque, fundo estiloso as janelas da aplicação, criando uma profundidade e aspecto moderno. \"Barra de titulo nativa\" deve estar inactiva."
   },
   "note_autocomplete": {
     "search-for": "Pesquisar por \"{{term}}\"",
@@ -1886,7 +2006,8 @@
   },
   "note_language": {
     "not_set": "Não atribuído",
-    "configure-languages": "Configurar idiomas..."
+    "configure-languages": "Configurar idiomas...",
+    "help-on-languages": "Ajuda nas linguagens de conteúdos..."
   },
   "content_language": {
     "title": "Idiomas do conteúdo",
@@ -1904,7 +2025,8 @@
     "button_title": "Exportar diagrama como PNG"
   },
   "svg": {
-    "export_to_png": "O diagrama não pôde ser exportado como PNG."
+    "export_to_png": "O diagrama não pôde ser exportado como PNG.",
+    "export_to_svg": "O diagrama não pode ser exportado para SVG."
   },
   "code_theme": {
     "title": "Aparência",
@@ -1923,7 +2045,11 @@
   "editorfeatures": {
     "title": "Recursos",
     "emoji_completion_enabled": "Ativar auto-completar de Emoji",
-    "note_completion_enabled": "Ativar auto-completar de notas"
+    "note_completion_enabled": "Ativar auto-completar de notas",
+    "emoji_completion_description": "Se activo, emojis podem ser facilmente inseridos em texto ao pressionar `:`, seguido do nome de um emoji.",
+    "note_completion_description": "Se activo, links para notas podem ser criadas ao escrever `@` seguido do titulo de uma nota.",
+    "slash_commands_enabled": "Activar comentários simples",
+    "slash_commands_description": "Se activo, editar comandos como inserir quebras de linha ou cabeçalhos podem ser activado/inactivado ao escrever `/`."
   },
   "table_view": {
     "new-row": "Nova linha",
@@ -1965,7 +2091,16 @@
     "delete-column": "Apagar coluna",
     "delete-column-confirmation": "Tem certeza que deseja apagar esta coluna? O atributo correspondente também será apagado de todas as notas abaixo desta coluna.",
     "new-item": "Novo elemento",
-    "add-column": "Adicionar Coluna"
+    "add-column": "Adicionar Coluna",
+    "delete-note": "Apagar nota...",
+    "remove-from-board": "Remover do quadro",
+    "archive-note": "Arquivar nota",
+    "new-item-placeholder": "Inserir titulo da nota...",
+    "add-column-placeholder": "Inserir nome da coluna...",
+    "edit-note-title": "Clicar para editar o titulo da nota",
+    "unarchive-note": "Remover nota do arquivo",
+    "edit-column-title": "Click para editar titulo da coluna",
+    "column-already-exists": "Esta coluna já existe no quadro."
   },
   "command_palette": {
     "tree-action-name": "Árvore: {{name}}",
@@ -1996,16 +2131,146 @@
     "background_effects_title": "Efeitos de fundo estão estáveis agora",
     "background_effects_message": "Em dispositivos Windows, efeitos de fundo estão estáveis agora. Os efeitos de fundo adicionam um toque de cor à interface do utilizador borrando o plano de fundo atrás dela. Esta técnica também é usada noutras aplicações como o Windows Explorer.",
     "background_effects_button": "Ativar os efeitos de fundo",
-    "dismiss": "Dispensar"
+    "dismiss": "Dispensar",
+    "new_layout_title": "Novo titulo do layout",
+    "new_layout_button": "Mais informação",
+    "new_layout_message": "Estamos a introduzir um layout modernizado para o Trilium. A faixa foi removida e está integrada na interface principal, com uma nota barra de estado e secções expansíveis (como as propriedades próprias) a tomar papéis principais.\n\nO novo layout está activo por defeito, e pode ser temporáriamente disabilidade em Opções → Aparência."
   },
   "settings": {
     "related_settings": "Configurações relacionadas"
   },
   "settings_appearance": {
     "related_code_blocks": "Esquema de cores para blocos de código em notas de texto",
-    "related_code_notes": "Esquema de cores para notas de código"
+    "related_code_notes": "Esquema de cores para notas de código",
+    "ui": "Interface do utilizador",
+    "ui_old_layout": "Layout antigo",
+    "ui_new_layout": "Nova aparência"
   },
   "units": {
     "percentage": "%"
+  },
+  "experimental_features": {
+    "title": "Opções experimentais",
+    "new_layout_name": "Novo layout",
+    "new_layout_description": "Experimente o novo layout para um aspecto moderno e melhor estabilidade. Sujeito a grandes alterações nas próximas publicações.",
+    "disclaimer": "Estas opções são experimentais e podem causar instabilidade. Usar com cuidado."
+  },
+  "read-only-info": {
+    "read-only-note": "Actualmente a ver em modo de leitura.",
+    "edit-note": "Editar nota",
+    "auto-read-only-note": "Esta nota está a ser mostrada em modo de leitura para um carregamento mais rápido."
+  },
+  "presentation_view": {
+    "edit-slide": "Editar este slide",
+    "start-presentation": "Iniciar apresentação",
+    "slide-overview": "Alternar visão geral dos slides"
+  },
+  "calendar_view": {
+    "delete_note": "Apagar nota..."
+  },
+  "pagination": {
+    "page_title": "Página {{startIndex}} - {{endIndex}}",
+    "total_notes": "{{count}} notas"
+  },
+  "collections": {
+    "rendering_error": "Sem possíbilidade de mostrar conteúdos devido a um erro."
+  },
+  "note-color": {
+    "clear-color": "Remover cor da nota",
+    "set-color": "Atribuir cor da nota",
+    "set-custom-color": "Afectar cor personalizada da nota"
+  },
+  "popup-editor": {
+    "maximize": "Alterar para editor completo"
+  },
+  "server": {
+    "unknown_http_error_title": "Erro na comunicação com servidor",
+    "unknown_http_error_content": "Código de estado: {{statusCode}}\nURL: {{method}} {{url}}\nMessagem: {{message}}",
+    "traefik_blocks_requests": "Se está a usar o Traefik, este introduz uma alteração que afecta a comunicação com o servidor."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Ir para a nota anterior",
+    "go-forward": "Ir para nota seguinte"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Içado",
+    "workspace_badge": "Área de trabalho",
+    "scroll_to_top_title": "Saltar para o início da nota",
+    "create_new_note": "Criar nova nota descendente",
+    "empty_hide_archived_notes": "Esconder notas arquivadas",
+    "hoisted_badge_title": "Retirar de içado"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Modo de leitura",
+    "read_only_auto": "Modo de leitura automático",
+    "read_only_temporarily_disabled": "Editável temporáriamente",
+    "read_only_auto_description": "Esta nota foi automaticamente colocada em modo de leitura por razões de performance. Este limite automatico é ajustável nas configurações.\n\nClicar para editar temporáriamente.",
+    "read_only_temporarily_disabled_description": "Esta nota está editável, mas normalmente está em modo de leitura. A nova vai regressar para mode de leitura assim que navegar para outra nota.\n\nClicar para reactivar o modo de leitura.",
+    "read_only_explicit_description": "Esta nota foi manualmente colocada em modo de leitura.\nClicar para editar temporáriamente.",
+    "shared_publicly": "Partilhado publicamente",
+    "shared_locally": "Partilhado localmente",
+    "shared_copy_to_clipboard": "Copiar link para a área de transferência",
+    "shared_open_in_browser": "Abrir link no browser",
+    "shared_unshare": "Remover partilha",
+    "clipped_note_description": "Esta nota foi retirar do {{url}}.\n\nClicar para navegar no código fonte da página.",
+    "clipped_note": "Web clipe",
+    "execute_script": "Correr script",
+    "execute_script_description": "Esta nota é uma nota de script. Clicar para executar o script.",
+    "execute_sql": "Correr SQL",
+    "execute_sql_description": "Esta nota é uma nota de SQL. Clicar para executar script SQL.",
+    "save_status_saved": "Guardar",
+    "save_status_saving": "A guardar...",
+    "save_status_unsaved": "Não gravado",
+    "save_status_error": "Gravar falhou",
+    "save_status_saving_tooltip": "Alterações estão a ser guardadas",
+    "save_status_unsaved_tooltip": "Existem alterações não guardadas. Serão guardadas automaticamente em breve.",
+    "save_status_error_tooltip": "Ocorreu um erro ao guardar a nota. Se possível, tente copiar os conteúdos da nota para outro local e reiniciar a aplicação."
+  },
+  "status_bar": {
+    "language_title": "Alterar lingua do conteúdo",
+    "note_info_title": "Ver informação da nota (e.g., datas, tamanho da nota)",
+    "backlinks_one": "{{count}} backlink",
+    "backlinks_many": "{{count}} backlinks",
+    "backlinks_other": "{{count}} backlinks",
+    "backlinks_title_one": "Ver backlink",
+    "backlinks_title_many": "Ver backlinks",
+    "backlinks_title_other": "Ver backlinks",
+    "attachments_one": "{{count}} anexo",
+    "attachments_many": "{{count}} anexos",
+    "attachments_other": "{{count}} anexos",
+    "attachments_title_one": "Ver anexo num novo separador",
+    "attachments_title_many": "Ver anexos num novo separador",
+    "attachments_title_other": "Ver anexos num novo separador",
+    "attributes_one": "{{count}} atributo",
+    "attributes_many": "{{count}} atributos",
+    "attributes_other": "{{count}} atributos",
+    "attributes_title": "Atributos próprios e herdados",
+    "note_paths_one": "{{count}} caminho",
+    "note_paths_many": "{{count}} caminhos",
+    "note_paths_other": "{{count}} caminhos",
+    "note_paths_title": "Caminhos da nota",
+    "code_note_switcher": "Alterar modo de linguagem"
+  },
+  "attributes_panel": {
+    "title": "Atributos da nota"
+  },
+  "right_pane": {
+    "empty_message": "Nada para mostrar nesta nota",
+    "empty_button": "Esconder painél",
+    "toggle": "Alterar painel direito",
+    "custom_widget_go_to_source": "Ir para código fonte"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} anexo pdf",
+    "attachments_many": "{{count}} anexos pdf",
+    "attachments_other": "{{count}} anexos pdf",
+    "layers_one": "{{count}} camada",
+    "layers_many": "{{count}} camadas",
+    "layers_other": "{{count}} camadas",
+    "pages_one": "{{count}} página",
+    "pages_many": "{{count}} páginas",
+    "pages_other": "{{count}} páginas",
+    "pages_alt": "Página {{pageNumber}}",
+    "pages_loading": "A carregar..."
   }
 }

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

@@ -29,7 +29,15 @@
     "bundle-error": {
       "title": "Falha para carregar o script customizado",
       "message": "O script da nota com ID \"{{id}}\", intitulada \"{{title}}\", não pôde ser executado devido a:\n\n{{message}}"
-    }
+    },
+    "widget-list-error": {
+      "title": "Falha ao obter a lista de widgets do servidor"
+    },
+    "widget-render-error": {
+      "title": "Falha ao renderizar um widget React personalizado"
+    },
+    "widget-missing-parent": "O widget personalizado não possui a propriedade obrigatória '{{property}}' definida.",
+    "open-script-note": "Abrir nota de script"
   },
   "add_link": {
     "add_link": "Adicionar link",
@@ -46,7 +54,10 @@
     "save": "Salvar",
     "edit_branch_prefix": "Editar Prefixo do Branch",
     "help_on_tree_prefix": "Ajuda sobre o prefixo da árvore de notas",
-    "branch_prefix_saved": "O prefixo de ramificação foi salvo."
+    "branch_prefix_saved": "O prefixo de ramificação foi salvo.",
+    "edit_branch_prefix_multiple": "Editar prefixo do ramo para {{count}} ramos",
+    "branch_prefix_saved_multiple": "O prefixo do ramo foi salvo para {{count}} ramos.",
+    "affected_branches": "Ramos afetados ({{count}}):"
   },
   "bulk_actions": {
     "bulk_actions": "Ações em massa",
@@ -254,7 +265,8 @@
     "export_status": "Status da exportação",
     "export_in_progress": "Exportação em andamento: {{progressCount}}",
     "export_finished_successfully": "Exportação concluída com sucesso.",
-    "format_pdf": "PDF – para impressão ou compartilhamento."
+    "format_pdf": "PDF – para impressão ou compartilhamento.",
+    "share-format": "HTML para publicação na web — usa o mesmo tema das notas compartilhadas, mas pode ser publicado como um site estático."
   },
   "help": {
     "noteNavigation": "Navegação de notas",
@@ -308,7 +320,8 @@
     "other": "Outros",
     "quickSearch": "focar no campo de pesquisa rápida",
     "inPageSearch": "pesquisa na página",
-    "title": "Folha de Dicas"
+    "title": "Folha de Dicas",
+    "editShortcuts": "Editar atalhos de teclado"
   },
   "import": {
     "importIntoNote": "Importar para a nota",
@@ -334,7 +347,8 @@
     },
     "import-status": "Status da importação",
     "in-progress": "Importação em andamento: {{progress}}",
-    "successful": "Importação concluída com sucesso."
+    "successful": "Importação concluída com sucesso.",
+    "importZipRecommendation": "Ao importar um arquivo ZIP, a hierarquia de notas refletirá a estrutura de subdiretórios dentro do arquivo."
   },
   "include_note": {
     "dialog_title": "Incluir nota",
@@ -349,7 +363,8 @@
   "info": {
     "modalTitle": "Mensagem informativa",
     "closeButton": "Fechar",
-    "okButton": "OK"
+    "okButton": "OK",
+    "copy_to_clipboard": "Copiar para a área de transferência"
   },
   "jump_to_note": {
     "search_placeholder": "Pesquise uma nota pelo nome ou digite > para comandos...",
@@ -424,7 +439,6 @@
     "download_button": "Download",
     "mime": "MIME: ",
     "file_size": "Tamanho do arquivo:",
-    "preview": "Visualizar:",
     "preview_not_available": "A visualização não está disponível para este tipo de nota.",
     "diff_on": "Exibir diferença",
     "diff_off": "Exibir conteúdo",
@@ -771,7 +785,7 @@
     "import-into-note": "Importar na nota",
     "apply-bulk-actions": "Aplicar ações em massa",
     "converted-to-attachments": "{{count}} notas foram convertidas em anexos.",
-    "convert-to-attachment-confirm": "Tem certeza de que deseja converter as notas selecionadas em anexos de suas notas-pai?",
+    "convert-to-attachment-confirm": "Tem certeza de que deseja converter as notas selecionadas em anexos de suas notas pai? Esta operação se aplica apenas a notas de imagem; outras notas serão ignoradas.",
     "open-in-popup": "Edição rápida",
     "archive": "Ficheiro",
     "unarchive": "Desarquivar"
@@ -789,7 +803,7 @@
     "show_attachments_description": "Exibir anexos da nota",
     "search_notes_title": "Buscar Notas",
     "search_notes_description": "Abrir busca avançada",
-    "configure_launch_bar_description": "Abrir a configuração da barra de lançamento, para adicionar ou remover itens."
+    "configure_launch_bar_description": "Abrir a configuração da barra de atalho, para adicionar ou remover itens."
   },
   "delete_note": {
     "delete_note": "Excluir nota",
@@ -882,7 +896,7 @@
     "zoom_out": "Reduzir",
     "reset_zoom_level": "Redefinir Zoom",
     "zoom_in": "Aumentar",
-    "configure_launchbar": "Configurar Barra de Lançamento",
+    "configure_launchbar": "Configurar Barra de Atalhos",
     "show_shared_notes_subtree": "Exibir Subárvore de Notas Compartilhadas",
     "advanced": "Avançado",
     "open_dev_tools": "Abrir Ferramentas de Desenvolvedor",
@@ -897,7 +911,9 @@
     "logout": "Sair",
     "show-cheatsheet": "Exibir Cheatsheet",
     "toggle-zen-mode": "Modo Zen",
-    "reload_hint": "Recarregar pode ajudar com alguns problemas visuais sem reiniciar toda a aplicação."
+    "reload_hint": "Recarregar pode ajudar com alguns problemas visuais sem reiniciar toda a aplicação.",
+    "new-version-available": "Nova atualização disponível",
+    "download-update": "Obter a versão {{latestVersion}}"
   },
   "zen_mode": {
     "button_exit": "Sair do Modo Zen"
@@ -935,7 +951,14 @@
     "convert_into_attachment_successful": "A nota '{{title}}' foi convertida para anexo.",
     "print_pdf": "Exportar como PDF…",
     "open_note_externally_title": "O arquivo será aberto em uma aplicação externa e monitorado por alterações. Você então poderá enviar a versão modificada de volta para o Trilium.",
-    "convert_into_attachment_prompt": "Você tem certeza que quer converter a nota '{{title}}' em um anexo da nota pai?"
+    "convert_into_attachment_prompt": "Você tem certeza que quer converter a nota '{{title}}' em um anexo da nota pai?",
+    "open_note_on_server": "Abrir nota no servidor",
+    "view_revisions": "Revisões da nota…",
+    "advanced": "Avançado",
+    "export_as_image": "Exportar como imagem",
+    "export_as_image_png": "PNG (raster)",
+    "export_as_image_svg": "SVG (vetorial)",
+    "note_map": "Mapa de notas"
   },
   "protected_session_status": {
     "inactive": "Clique para entrar na sessão protegida",
@@ -979,11 +1002,11 @@
     "insert_child_note": "Inserir nota filha",
     "delete_this_note": "Excluir essa nota",
     "error_unrecognized_command": "Comando não reconhecido {{command}}",
-    "error_cannot_get_branch_id": "Não foi possível obter o branchId para o notePath '{{notePath}} '"
+    "error_cannot_get_branch_id": "Não foi possível obter o branchId para o notePath '{{notePath}} '",
+    "note_revisions": "Revisões de notas"
   },
   "note_icon": {
     "change_note_icon": "Alterar ícone da nota",
-    "category": "Categoria:",
     "search": "Busca:",
     "reset-default": "Redefinir para o ícone padrão"
   },
@@ -1007,7 +1030,12 @@
     "table": "Tabela",
     "geo-map": "Mapa geográfico",
     "board": "Quadro",
-    "include_archived_notes": "Exibir notas arquivadas"
+    "include_archived_notes": "Exibir notas arquivadas",
+    "expand_tooltip": "Expande os filhos diretos desta coleção (um nível). Para mais opções, pressione a seta à direita.",
+    "expand_first_level": "Expandir filhos diretos",
+    "expand_nth_level": "Expandir {{depth}} níveis",
+    "expand_all_levels": "Expandir todos os níveis",
+    "presentation": "Apresentação"
   },
   "edited_notes": {
     "no_edited_notes_found": "Ainda não há nenhuma nota editada neste dia…",
@@ -1020,7 +1048,7 @@
     "file_type": "Tipo do arquivo",
     "file_size": "Tamanho do arquivo",
     "download": "Baixar",
-    "open": "Abrir",
+    "open": "Abrir externamente",
     "upload_new_revision": "Enviar nova revisão",
     "upload_success": "Uma nova revisão de arquivo foi enviada.",
     "upload_failed": "O envio de uma nova revisão de arquivo falhou.",
@@ -1040,7 +1068,8 @@
   },
   "inherited_attribute_list": {
     "title": "Atributos Herdados",
-    "no_inherited_attributes": "Nenhum atributo herdado."
+    "no_inherited_attributes": "Nenhum atributo herdado.",
+    "none": "nenhum"
   },
   "note_info_widget": {
     "note_id": "ID da Nota",
@@ -1051,7 +1080,9 @@
     "calculate": "calcular",
     "title": "Informações da nota",
     "subtree_size": "(tamanho da subárvore: {{size}} em {{count}} notas)",
-    "note_size_info": "O tamanho da nota fornece uma estimativa aproximada dos requisitos de armazenamento para esta nota. Leva em conta o conteúdo e o conteúdo de suas revisões de nota."
+    "note_size_info": "O tamanho da nota fornece uma estimativa aproximada dos requisitos de armazenamento para esta nota. Leva em conta o conteúdo e o conteúdo de suas revisões de nota.",
+    "mime": "Tipo MIME",
+    "show_similar_notes": "Mostrar notas semelhantes"
   },
   "note_map": {
     "open_full": "Expandir completamente",
@@ -1111,7 +1142,8 @@
     "search_note_saved": "Nota de pesquisa foi salva em {{- notePathTitle}}",
     "fast_search_description": "A opção de pesquisa rápida desabilita a pesquisa de texto completo do conteúdo de nota, o que pode acelerar a pesquisa em grandes bancos de dados.",
     "include_archived_notes_description": "As notas arquivadas são por padrão excluídas dos resultados da pesquisa, com esta opção elas serão incluídas.",
-    "debug_description": "A depuração irá imprimir informações adicionais no console para ajudar na depuração de consultas complexas"
+    "debug_description": "A depuração irá imprimir informações adicionais no console para ajudar na depuração de consultas complexas",
+    "view_options": "Ver opções:"
   },
   "similar_notes": {
     "title": "Notas Similares",
@@ -1192,7 +1224,13 @@
   },
   "editable_text": {
     "placeholder": "Digite o conteúdo da sua nota aqui…",
-    "auto-detect-language": "Detectado automaticamente"
+    "auto-detect-language": "Detectado automaticamente",
+    "editor_crashed_title": "O editor de texto travou",
+    "editor_crashed_content": "Seu conteúdo foi recuperado com sucesso, mas algumas das suas alterações mais recentes podem não ter sido salvas.",
+    "editor_crashed_details_button": "Veja mais detalhes...",
+    "editor_crashed_details_intro": "Se você encontrar este erro várias vezes, considere relatá-lo no GitHub colando as informações abaixo.",
+    "editor_crashed_details_title": "Informação técnica",
+    "keeps-crashing": "O componente de edição continua travando. Tente reiniciar o Trilium. Se o problema persistir, considere criar um relatório de bug."
   },
   "empty": {
     "search_placeholder": "buscar uma nota pelo nome",
@@ -1233,11 +1271,6 @@
     "start_dragging_relations": "Comece arrastando as relações daqui e solte-as em outra nota.",
     "cannot_match_transform": "Não foi possível combinar a transformação: {{transform}}"
   },
-  "web_view": {
-    "web_view": "Web View",
-    "embed_websites": "Nota do tipo Visualização Web permite que você incorpore sites dentro do Trilium.",
-    "create_label": "Para começar, crie uma etiqueta com um endereço URL que deseja incorporar, por exemplo, #webViewSrc=\"https://www.google.com\""
-  },
   "backend_log": {
     "refresh": "Recarregar"
   },
@@ -1299,7 +1332,8 @@
     "title": "Largura do Conteúdo",
     "max_width_label": "Largura máxima do conteúdo",
     "max_width_unit": "pixels",
-    "default_description": "Por padrão, o Trilium limita a largura máxima do conteúdo para melhorar a legibilidade em janelas maximizadas em telas wide."
+    "default_description": "Por padrão, o Trilium limita a largura máxima do conteúdo para melhorar a legibilidade em janelas maximizadas em telas wide.",
+    "centerContent": "Manter conteúdo centralizado"
   },
   "native_title_bar": {
     "title": "Barra de Título Nativa (requer recarregar o app)",
@@ -1319,11 +1353,11 @@
     "layout": "Layout",
     "layout-vertical-title": "Vertical",
     "layout-horizontal-title": "Horizontal",
-    "layout-vertical-description": "barra de lançamento está a esquerda (padrão)",
-    "layout-horizontal-description": "barra de lançamento está abaixo da barra de abas, a barra de abas agora tem a largura total."
+    "layout-vertical-description": "barra de atalho está a esquerda (padrão)",
+    "layout-horizontal-description": "barra de atalho está abaixo da barra de abas, a barra de abas agora tem a largura total."
   },
   "note_launcher": {
-    "this_launcher_doesnt_define_target_note": "Este lançador não define uma nota destino."
+    "this_launcher_doesnt_define_target_note": "Este atalho não define uma nota destino."
   },
   "copy_image_reference_button": {
     "button_title": "Copiar referência da imagem para a área de transferência, pode ser colado em uma nota de texto."
@@ -1378,7 +1412,10 @@
     "title": "Editor"
   },
   "code_mime_types": {
-    "title": "Tipos MIME disponíveis no dropdown"
+    "title": "Tipos MIME disponíveis no dropdown",
+    "tooltip_syntax_highlighting": "Realce de sintaxe",
+    "tooltip_code_block_syntax": "Blocos de código em notas de texto",
+    "tooltip_code_note_syntax": "Notas de código"
   },
   "vim_key_bindings": {
     "use_vim_keybindings_in_code_notes": "Atribuições de teclas do Vim",
@@ -1498,7 +1535,13 @@
     "min-days-in-first-week": "Mínimo de dias da primeira semana",
     "first-week-info": "Primeira semana que contenha a primeira Quinta-feira do ano é baseado na <a href=\"https://en.wikipedia.org/wiki/ISO_week_date#First_week\">ISO 8601</a>.",
     "first-week-warning": "Alterar as opções de primeira semana pode causar duplicidade nas Notas Semanais existentes e estas Notas não serão atualizadas de acordo.",
-    "formatting-locale": "Formato de data e número"
+    "formatting-locale": "Formato de data e número",
+    "tuesday": "Terça-feira",
+    "wednesday": "Quarta-feira",
+    "thursday": "Quinta-feira",
+    "friday": "Sexta-feira",
+    "saturday": "Sábado",
+    "formatting-locale-auto": "Com base no idioma do aplicativo"
   },
   "backup": {
     "automatic_backup": "Backup automático",
@@ -1526,7 +1569,7 @@
     "mind-map": "Mapa Mental",
     "file": "Arquivo",
     "image": "Imagem",
-    "launcher": "Lançador",
+    "launcher": "Atalho",
     "doc": "Documento",
     "widget": "Widget",
     "confirm-change": "Não é recomentado alterar o tipo da nota quando o conteúdo da nota não está vazio. Quer continuar assim mesmo?",
@@ -1569,7 +1612,13 @@
   },
   "highlights_list_2": {
     "title": "Lista de Destaques",
-    "options": "Opções"
+    "options": "Opções",
+    "title_with_count_one": "{{count}} destaque",
+    "title_with_count_many": "{{count}} destaques",
+    "title_with_count_other": "{{count}} destaques",
+    "modal_title": "Configurar lista de destaques",
+    "menu_configure": "Configurar lista de destaques…",
+    "no_highlights": "Nenhum destaque encontrado."
   },
   "quick-search": {
     "placeholder": "Busca rápida",
@@ -1592,23 +1641,33 @@
     "refresh-saved-search-results": "Atualizar resultados de pesquisa salvos",
     "create-child-note": "Criar nota filha",
     "unhoist": "Desafixar",
-    "toggle-sidebar": "Alternar barra lateral"
+    "toggle-sidebar": "Alternar barra lateral",
+    "dropping-not-allowed": "Não é permitido soltar notas neste local."
   },
   "title_bar_buttons": {
     "window-on-top": "Manter Janela no Topo"
   },
   "note_detail": {
-    "could_not_find_typewidget": "Não foi possível encontrar typeWidget para o tipo '{{type}}'"
+    "could_not_find_typewidget": "Não foi possível encontrar typeWidget para o tipo '{{type}}'",
+    "printing": "Impressão em andamento…",
+    "printing_pdf": "Exportação para PDF em andamento…"
   },
   "note_title": {
-    "placeholder": "digite o título da nota aqui..."
+    "placeholder": "digite o título da nota aqui...",
+    "created_on": "Criado em <Value />",
+    "last_modified": "Modificado em <Value />",
+    "note_type_switcher_label": "Alternar de {{type}} para:",
+    "note_type_switcher_others": "Outro tipo de nota",
+    "note_type_switcher_templates": "Modelo",
+    "note_type_switcher_collection": "Coleção",
+    "edited_notes": "Notas editadas"
   },
   "search_result": {
     "no_notes_found": "Nenhuma nota encontrada para os parâmetros de busca digitados.",
     "search_not_executed": "A busca ainda não foi executada. Clique no botão \"Buscar\" acima para ver os resultados."
   },
   "spacer": {
-    "configure_launchbar": "Configurar Barra de Lançamento"
+    "configure_launchbar": "Configurar Barra de Atalhos"
   },
   "sql_result": {
     "no_rows": "Nenhum linha foi retornada para esta consulta"
@@ -1630,7 +1689,8 @@
   },
   "toc": {
     "table_of_contents": "Tabela de Conteúdos",
-    "options": "Opções"
+    "options": "Opções",
+    "no_headings": "Nenhum título."
   },
   "watched_file_update_status": {
     "file_last_modified": "O arquivo <code class=\"file-path\"></code> foi modificado pela última vez em <span class=\"file-last-modified\"></span>.",
@@ -1673,22 +1733,24 @@
   "ws": {
     "sync-check-failed": "A verificação de sincronização falhou!",
     "consistency-checks-failed": "A verificação de consistência falhou! Veja os logs para detalhes.",
-    "encountered-error": "Encontrado o erro \"{{message}}\", verifique o console."
+    "encountered-error": "Encontrado o erro \"{{message}}\", verifique o console.",
+    "lost-websocket-connection-title": "Conexão com o servidor perdida",
+    "lost-websocket-connection-message": "Verifique a configuração do seu proxy reverso (por exemplo, nginx ou Apache) para garantir que as conexões WebSocket estejam devidamente permitidas e não estejam sendo bloqueadas."
   },
   "hoisted_note": {
     "confirm_unhoisting": "A nota solicitada '{{requestedNote}}' está fora da árvore da nota fixada '{{hoistedNote}}' e você precisa desafixar para acessar a nota. Quer prosseguir e desafixar?"
   },
   "launcher_context_menu": {
-    "reset_launcher_confirm": "Você deseja realmente reiniciar \"{{title}}\"? Todos os dados / configurações desta nota (e suas filhas) serão perdidos o lançador irá retornar para sua localização original.",
-    "add-note-launcher": "Adicionar um lançador de nota",
-    "add-script-launcher": "Adicionar um lançador de script",
+    "reset_launcher_confirm": "Você deseja realmente reiniciar \"{{title}}\"? Todos os dados / configurações desta nota (e suas filhas) serão perdidos o atalho irá retornar para sua localização original.",
+    "add-note-launcher": "Adicionar um atalho de nota",
+    "add-script-launcher": "Adicionar um atalho de script",
     "add-custom-widget": "Adicionar um componente personalizado",
     "add-spacer": "Adicionar um espaçador",
     "delete": "Excluir <kbd data-command=\"deleteNotes\"></kbd>",
     "reset": "Reiniciar",
-    "move-to-visible-launchers": "Mover para lançadores visíveis",
-    "move-to-available-launchers": "Mover para lançadores disponíveis",
-    "duplicate-launcher": "Duplicar o lançador <kbd data-command=\"duplicateSubtree\">"
+    "move-to-visible-launchers": "Mover para atalhos visíveis",
+    "move-to-available-launchers": "Mover para atalhos disponíveis",
+    "duplicate-launcher": "Duplicar o atalho <kbd data-command=\"duplicateSubtree\">"
   },
   "highlighting": {
     "title": "Blocos de Código",
@@ -1722,7 +1784,8 @@
     "copy-link": "Copiar link",
     "paste": "Colar",
     "paste-as-plain-text": "Colar como texto sem formatação",
-    "search_online": "Buscar por \"{{term}}\" usando {{searchEngine}}"
+    "search_online": "Buscar por \"{{term}}\" usando {{searchEngine}}",
+    "search_in_trilium": "Pesquisar por \"{{term}}\" no Trilium"
   },
   "image_context_menu": {
     "copy_reference_to_clipboard": "Copiar referência para a área de transferência",
@@ -1732,7 +1795,8 @@
     "open_note_in_new_tab": "Abrir nota em nova aba",
     "open_note_in_new_split": "Abrir nota em nova divisão",
     "open_note_in_new_window": "Abrir nota em nova janela",
-    "open_note_in_popup": "Edição rápida"
+    "open_note_in_popup": "Edição rápida",
+    "open_note_in_other_split": "Abrir nota no outro painel dividido"
   },
   "electron_integration": {
     "desktop-application": "Aplicação Desktop",
@@ -1800,8 +1864,9 @@
     "unknown_widget": "Componente desconhecido para \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "Não atribuído",
-    "configure-languages": "Configurar idiomas..."
+    "not_set": "Nenhum idioma definido",
+    "configure-languages": "Configurar idiomas...",
+    "help-on-languages": "Ajuda sobre idiomas de conteúdo…"
   },
   "content_language": {
     "title": "Idiomas do conteúdo",
@@ -1819,7 +1884,8 @@
     "button_title": "Exportar diagrama como PNG"
   },
   "svg": {
-    "export_to_png": "O diagrama não pôde ser exportado como PNG."
+    "export_to_png": "O diagrama não pôde ser exportado como PNG.",
+    "export_to_svg": "O diagrama não pôde ser exportado para SVG."
   },
   "code_theme": {
     "title": "Aparência",
@@ -1838,7 +1904,11 @@
   "editorfeatures": {
     "title": "Recursos",
     "emoji_completion_enabled": "Habilitar auto-completar de Emoji",
-    "note_completion_enabled": "Habilitar auto-completar de notas"
+    "note_completion_enabled": "Habilitar auto-completar de notas",
+    "emoji_completion_description": "Se ativado, emojis podem ser inseridos facilmente no texto digitando`:`, seguido do nome do emoji.",
+    "note_completion_description": "Se ativado, links para notas podem ser criados digitando `@` seguido do título de uma nota.",
+    "slash_commands_enabled": "Ativar comandos de barra",
+    "slash_commands_description": "Se ativado, comandos de edição como inserir quebras de linha ou títulos podem ser acionados digitando`/`."
   },
   "table_view": {
     "new-row": "Nova linha",
@@ -1863,7 +1933,7 @@
   "book_properties_config": {
     "hide-weekends": "Ocultar fins de semana",
     "display-week-numbers": "Exibir números de semana",
-    "map-style": "Estilo do mapa:",
+    "map-style": "Estilo do mapa",
     "max-nesting-depth": "Profundidade máxima de aninhamento:",
     "vector_light": "Vetor (Claro)",
     "vector_dark": "Vetor (Escuro)",
@@ -1888,7 +1958,8 @@
     "new-item-placeholder": "Escreva o título da nota...",
     "add-column-placeholder": "Escreva o nome da coluna...",
     "edit-note-title": "Clique para editar o título da nota",
-    "edit-column-title": "Clique para editar o título da coluna"
+    "edit-column-title": "Clique para editar o título da coluna",
+    "column-already-exists": "Esta coluna já existe no quadro."
   },
   "call_to_action": {
     "next_theme_title": "Testar no novo tema do Trilium",
@@ -1897,14 +1968,20 @@
     "background_effects_title": "Efeitos de fundo estão estáveis agora",
     "background_effects_message": "Em dispositivos Windows, efeitos de fundo estão estáveis agora. Os efeitos de fundo adicionam um toque de cor à interface do usuário borrando o plano de fundo atrás dela. Esta técnica também é usada em outras aplicações como o Windows Explorer.",
     "background_effects_button": "Habilitar os efeitos de fundo",
-    "dismiss": "Dispensar"
+    "dismiss": "Dispensar",
+    "new_layout_title": "Novo layout",
+    "new_layout_message": "Introduzimos um layout modernizado para o Trilium. A faixa de opções foi removida e integrada de forma contínua à interface principal, com uma nova barra de status e seções expansíveis (como atributos promovidos) assumindo funções importantes.\n\nO novo layout vem ativado por padrão e pode ser desativado temporariamente em Opções → Aparência.",
+    "new_layout_button": "Mais informações"
   },
   "settings": {
     "related_settings": "Configurações relacionadas"
   },
   "settings_appearance": {
     "related_code_blocks": "Esquema de cores para blocos de código em notas de texto",
-    "related_code_notes": "Esquema de cores para notas de código"
+    "related_code_notes": "Esquema de cores para notas de código",
+    "ui": "Interface do usuário",
+    "ui_old_layout": "Layout antigo",
+    "ui_new_layout": "Novo Layout"
   },
   "units": {
     "percentage": "%"
@@ -2047,5 +2124,102 @@
   },
   "collections": {
     "rendering_error": "Não foi possível exibir o conteúdo devido a um erro."
+  },
+  "experimental_features": {
+    "title": "Opções experimentais",
+    "disclaimer": "Essas opções são experimentais e podem causar instabilidade. Use com cautela.",
+    "new_layout_name": "Novo Layout",
+    "new_layout_description": "Experimente o novo layout para um visual mais moderno e melhor usabilidade. Pode sofrer alterações significativas nas próximas versões."
+  },
+  "read-only-info": {
+    "read-only-note": "Você está visualizando uma nota somente leitura.",
+    "auto-read-only-note": "Esta nota é exibida em modo somente leitura para carregamento mais rápido.",
+    "edit-note": "Editar nota"
+  },
+  "presentation_view": {
+    "edit-slide": "Editar este slide",
+    "start-presentation": "Iniciar apresentação",
+    "slide-overview": "Alternar a visualização geral dos slides"
+  },
+  "calendar_view": {
+    "delete_note": "Excluir nota…"
+  },
+  "note-color": {
+    "clear-color": "Limpar cor da nota",
+    "set-color": "Definir cor da nota",
+    "set-custom-color": "Definir cor personalizada da nota"
+  },
+  "popup-editor": {
+    "maximize": "Alternar para editor completo"
+  },
+  "server": {
+    "unknown_http_error_title": "Erro de comunicação com o servidor",
+    "unknown_http_error_content": "Código de status: {{statusCode}}\nURL: {{method}} {{url}}\nMensagem: {{message}}",
+    "traefik_blocks_requests": "Se você estiver usando o proxy reverso Traefik, ele introduziu uma alteração que afeta a comunicação com o servidor."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Voltar para a nota anterior",
+    "go-forward": "Avançar para a próxima nota"
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Destacado",
+    "hoisted_badge_title": "Remover destaque",
+    "workspace_badge": "Espaço de trabalho",
+    "scroll_to_top_title": "Ir para o início da nota",
+    "create_new_note": "Criar nova nota filha",
+    "empty_hide_archived_notes": "Ocultar notas arquivadas"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Somente leitura",
+    "read_only_explicit_description": "Esta nota foi definida manualmente como somente leitura.\nClique para editá-la temporariamente.",
+    "read_only_auto": "Auto Somente leitura",
+    "read_only_auto_description": "Esta nota foi definida automaticamente como somente leitura por motivos de desempenho. Esse limite automático pode ser ajustado nas configurações.\n\nClique para editá-la temporariamente.",
+    "read_only_temporarily_disabled": "Editável temporariamente",
+    "read_only_temporarily_disabled_description": "Esta nota está atualmente editável, mas normalmente é somente leitura. A nota voltará a ser somente leitura assim que você navegar para outra nota.\n\nClique para reativar o modo somente leitura.",
+    "shared_publicly": "Compartilhado publicamente",
+    "shared_locally": "Compartilhado localmente",
+    "shared_copy_to_clipboard": "Copiar link para a área de transferência",
+    "shared_open_in_browser": "Abrir link no navegador",
+    "shared_unshare": "Remover compartilhamento",
+    "clipped_note": "Recorte da web",
+    "clipped_note_description": "Esta nota foi originalmente obtida de {{url}}.\n\nClique para navegar até a página de origem.",
+    "execute_script": "Executar script",
+    "execute_script_description": "Esta nota é uma nota de script. Clique para executar o script.",
+    "execute_sql": "Executar SQL",
+    "execute_sql_description": "Esta nota é uma nota SQL. Clique para executar a consulta SQL."
+  },
+  "status_bar": {
+    "language_title": "Alterar idioma do conteúdo",
+    "note_info_title": "Ver informações da nota (por exemplo, datas, tamanho da nota)",
+    "backlinks_one": "{{count}} referência inversa",
+    "backlinks_many": "{{count}} referências inversas",
+    "backlinks_other": "{{count}} referências inversas",
+    "backlinks_title_one": "Ver referência inversa",
+    "backlinks_title_many": "Ver referências inversas",
+    "backlinks_title_other": "Ver referências inversas",
+    "attachments_one": "{{count}} anexo",
+    "attachments_many": "{{count}} anexos",
+    "attachments_other": "{{count}} anexos",
+    "attachments_title_one": "Visualizar anexo em uma nova aba",
+    "attachments_title_many": "Visualizar anexos em uma nova aba",
+    "attachments_title_other": "Visualizar anexos em uma nova aba",
+    "attributes_one": "{{count}} atributo",
+    "attributes_many": "{{count}} atributos",
+    "attributes_other": "{{count}} atributos",
+    "attributes_title": "Atributos próprios e atributos herdados",
+    "note_paths_one": "{{count}} caminho",
+    "note_paths_many": "{{count}} caminhos",
+    "note_paths_other": "{{count}} caminhos",
+    "note_paths_title": "Caminhos da nota",
+    "code_note_switcher": "Alterar modo de idioma"
+  },
+  "attributes_panel": {
+    "title": "Atributos da nota"
+  },
+  "right_pane": {
+    "empty_message": "Nada para exibir nesta nota",
+    "empty_button": "Ocultar o painel",
+    "toggle": "Alternar painel direito",
+    "custom_widget_go_to_source": "Ir para o código-fonte"
   }
 }

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

@@ -68,7 +68,7 @@
   "attachment_detail_2": {
     "deletion_reason": ", deoarece nu există o legătură către atașament în conținutul notiței. Pentru a preveni ștergerea, trebuie adăugată înapoi o legătură către atașament în conținut sau atașamentul trebuie convertit în notiță.",
     "link_copied": "O legătură către atașament a fost copiată în clipboard.",
-    "role_and_size": "Rol: {{role}}, dimensiune: {{size}}",
+    "role_and_size": "Rol: {{role}}, dimensiune: {{size}}, MIME: {{- mimeType}}",
     "unrecognized_role": "Rol atașament necunoscut: „{{role}}”.",
     "will_be_deleted_in": "Acest atașament va fi șters automat în {{time}}",
     "will_be_deleted_soon": "Acest atașament va fi șters automat în curând"
@@ -293,7 +293,8 @@
     "expand_tooltip": "Expandează subnotițele directe ale acestei colecții (un singur nivel de adâncime). Pentru mai multe opțiuni, apăsați săgeata din dreapta.",
     "expand_first_level": "Expandează subnotițele directe",
     "expand_nth_level": "Expandează pe {{depth}} nivele",
-    "expand_all_levels": "Expandează pe toate nivelele"
+    "expand_all_levels": "Expandează pe toate nivelele",
+    "hide_child_notes": "Ascunde subnotițele din arbore"
   },
   "bookmark_switch": {
     "bookmark": "Semn de carte",
@@ -493,7 +494,12 @@
   "editable_text": {
     "placeholder": "Scrieți conținutul notiței aici...",
     "auto-detect-language": "Automat",
-    "keeps-crashing": "Componenta de editare se blochează în continuu. Încercați să reporniți Trilium. Dacă problema persistă, luați în considerare să raportați această problemă."
+    "keeps-crashing": "Componenta de editare se blochează în continuu. Încercați să reporniți Trilium. Dacă problema persistă, luați în considerare să raportați această problemă.",
+    "editor_crashed_title": "Editorul text a avut o eroare",
+    "editor_crashed_content": "Conținutul a fost recuperat cu succes, dar este posibil ca o parte din cele mai recente modificări ale dvs. să nu se fi salvat.",
+    "editor_crashed_details_button": "Mai multe detalii...",
+    "editor_crashed_details_intro": "Dacă întâmpinați frecvent această eroare, considerați să o raportați pe GitHub copiând informația de mai jos.",
+    "editor_crashed_details_title": "Informații tehnice"
   },
   "edited_notes": {
     "deleted": "(șters)",
@@ -564,7 +570,7 @@
     "file_size": "Dimensiunea fișierului",
     "file_type": "Tipul fișierului",
     "note_id": "ID-ul notiței",
-    "open": "Deschide",
+    "open": "Deschide în exterior",
     "original_file_name": "Denumirea originală a fișierului",
     "title": "Fișier",
     "upload_failed": "Încărcarea a unei noi revizii ale fișierului a eșuat.",
@@ -785,11 +791,13 @@
   "info": {
     "closeButton": "Închide",
     "modalTitle": "Mesaj informativ",
-    "okButton": "OK"
+    "okButton": "OK",
+    "copy_to_clipboard": "Copiază în clipboard"
   },
   "inherited_attribute_list": {
     "no_inherited_attributes": "Niciun atribut moștenit.",
-    "title": "Atribute moștenite"
+    "title": "Atribute moștenite",
+    "none": "niciunul"
   },
   "jump_to_note": {
     "search_button": "Caută în întregul conținut",
@@ -867,12 +875,18 @@
     "print_note": "Imprimare notiță",
     "re_render_note": "Reinterpretare notiță",
     "save_revision": "Salvează o nouă revizie",
+    "advanced": "Advansat",
     "search_in_note": "Caută în notiță",
     "convert_into_attachment_failed": "Nu s-a putut converti notița „{{title}}”.",
     "convert_into_attachment_successful": "Notița „{{title}}” a fost convertită în atașament.",
     "convert_into_attachment_prompt": "Doriți convertirea notiței „{{title}}” într-un atașament al notiței părinte?",
     "print_pdf": "Exportare ca PDF...",
-    "open_note_on_server": "Deschide notița pe server"
+    "open_note_on_server": "Deschide notița pe server",
+    "view_revisions": "Revizii ale notițelor...",
+    "export_as_image": "Exportează ca imagine",
+    "export_as_image_png": "PNG (bitmap)",
+    "export_as_image_svg": "SVG (vectorial)",
+    "note_map": "Harta notițelor"
   },
   "note_erasure_timeout": {
     "deleted_notes_erased": "Notițele șterse au fost eliminate permanent.",
@@ -891,7 +905,9 @@
     "note_size_info": "Dimensiunea notiței reprezintă o aproximare a cerințelor de stocare ale acestei notițe. Ia în considerare conținutul notiței dar și ale reviziilor sale.",
     "subtree_size": "(dimensiunea sub-arborelui: {{size}} în {{count}} notițe)",
     "title": "Informații despre notiță",
-    "type": "Tip"
+    "type": "Tip",
+    "mime": "Tip MIME",
+    "show_similar_notes": "Afișează notițe similare"
   },
   "note_launcher": {
     "this_launcher_doesnt_define_target_note": "Acesată scurtătură nu definește o notiță-destinație."
@@ -1095,7 +1111,6 @@
     "mime": "MIME: ",
     "no_revisions": "Nu există încă nicio revizie pentru această notiță...",
     "note_revisions": "Revizii ale notiței",
-    "preview": "Previzualizare:",
     "preview_not_available": "Nu este disponibilă o previzualizare pentru acest tip de notiță.",
     "restore_button": "Restaurează",
     "revision_deleted": "Revizia notiței a fost ștearsă.",
@@ -1150,7 +1165,8 @@
     "search_parameters": "Parametrii de căutare",
     "search_script": "script de căutare",
     "search_string": "șir de căutat",
-    "unknown_search_option": "Opțiune de căutare necunoscută „{{searchOptionName}}”"
+    "unknown_search_option": "Opțiune de căutare necunoscută „{{searchOptionName}}”",
+    "view_options": "Opțiuni de afișare:"
   },
   "search_engine": {
     "baidu": "Baidu",
@@ -1302,8 +1318,17 @@
     },
     "bundle-error": {
       "title": "Eroare la încărcarea unui script personalizat",
-      "message": "Scriptul din notița cu ID-ul „{{id}}”, întitulată „{{title}}” nu a putut fi executată din cauza:\n\n{{message}}"
-    }
+      "message": "Scriptul nu a putut fi executat din cauza:\n\n{{message}}"
+    },
+    "widget-list-error": {
+      "title": "Nu s-a putut obține lista de widget-uri de la server"
+    },
+    "widget-render-error": {
+      "title": "Nu s-a putut randa un widget React"
+    },
+    "widget-missing-parent": "Widget-ul personalizat nu are definită proprietatea necesară „{{property}}“.\n\nDacă acest script este menit să ruleze fără interfață grafică, folosiți '#run=frontendStartup'.",
+    "open-script-note": "Deschide notița scriptului",
+    "scripting-error": "Eroare script personalizat: {{title}}"
   },
   "tray": {
     "enable_tray": "Activează system tray-ul (este necesară repornirea aplicației pentru a avea efect)",
@@ -1351,11 +1376,6 @@
     "enable_vim_keybindings": "Permite utilizarea combinațiilor de taste în stil Vim pentru notițele de tip cod (fără modul ex)",
     "use_vim_keybindings_in_code_notes": "Combinații de taste Vim"
   },
-  "web_view": {
-    "create_label": "Pentru a începe, creați o etichetă cu adresa URL de încorporat, e.g. #webViewSrc=\"https://www.google.com\"",
-    "embed_websites": "Notițele de tip „Vizualizare web” permit încorporarea site-urilor web în Trilium.",
-    "web_view": "Vizualizare web"
-  },
   "wrap_lines": {
     "enable_line_wrap": "Activează trecerea automată pe rândul următor (poate necesita o reîncărcare a interfeței pentru a avea efect)",
     "wrap_lines_in_code_notes": "Trecerea automată pe rândul următor în notițe de cod"
@@ -1407,10 +1427,13 @@
     "hoist-note": "Focalizează notița",
     "unhoist-note": "Defocalizează notița",
     "converted-to-attachments": "{{count}} notițe au fost convertite în atașamente.",
-    "convert-to-attachment-confirm": "Doriți convertirea notițelor selectate în atașamente ale notiței părinte?",
+    "convert-to-attachment-confirm": "Doriți convertirea notițelor selectate în atașamente ale notiței părinte? Această operațiune se aplică doar notițelor de tip imagine, celelalte vor fi ignorate.",
     "open-in-popup": "Editare rapidă",
     "archive": "Arhivează",
-    "unarchive": "Dezarhivează"
+    "unarchive": "Dezarhivează",
+    "open-in-a-new-window": "Deschide în fereastră nouă",
+    "hide-subtree": "Ascunde subnotițele",
+    "show-subtree": "Afișează subnotițele"
   },
   "shared_info": {
     "help_link": "Pentru informații vizitați <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki-ul</a>.",
@@ -1471,13 +1494,27 @@
   },
   "highlights_list_2": {
     "options": "Setări",
-    "title": "Listă de evidențieri"
+    "title": "Listă de evidențieri",
+    "title_with_count_one": "{{count}} evidențiere",
+    "title_with_count_few": "{{count}} evidențieri",
+    "title_with_count_other": "{{count}} de evidențieri",
+    "modal_title": "Configurează lista de evidențieri",
+    "menu_configure": "Configurează lista de evidențieri...",
+    "no_highlights": "Nu există nicio evidențiere."
   },
   "note_icon": {
     "change_note_icon": "Schimbă iconița notiței",
-    "category": "Categorie:",
     "reset-default": "Resetează la iconița implicită",
-    "search": "Căutare:"
+    "search": "Căutare:",
+    "search_placeholder_one": "Caută printre {{number}} iconițe dintr-un pachet",
+    "search_placeholder_few": "Caută printre {{number}} iconițe din {{count}} pachete",
+    "search_placeholder_other": "Caută printre {{number}} iconițe din {{count}} de pachete",
+    "search_placeholder_filtered": "Căutați printre {{number}} iconițe în {{name}}",
+    "filter": "Filtrează",
+    "filter-none": "Toate iconițele",
+    "filter-default": "Iconițele implicite",
+    "icon_tooltip": "{{name}}\nPachet iconițe: {{iconPack}}",
+    "no_results": "Nu s-a găsit nicio iconiță."
   },
   "show_highlights_list_widget_button": {
     "show_highlights_list": "Afișează lista de evidențieri"
@@ -1515,7 +1552,17 @@
     "refresh-saved-search-results": "Reîmprospătează căutarea salvată",
     "unhoist": "Defocalizează notița",
     "toggle-sidebar": "Comută bara laterală",
-    "dropping-not-allowed": "Aici nu este permisă plasarea notițelor."
+    "dropping-not-allowed": "Aici nu este permisă plasarea notițelor.",
+    "clone-indicator-tooltip": "Această notiță are {{- count}} părinți: {{- parents}}",
+    "clone-indicator-tooltip-single": "Această notiță este clonată (un singur părinte: {{- parent}})",
+    "shared-indicator-tooltip": "Această notiță este partajată public",
+    "shared-indicator-tooltip-with-url": "Această notiță este partajată public la: {{- url}}",
+    "subtree-hidden-tooltip_one": "{{count}} subnotiță ascunsă din arbore",
+    "subtree-hidden-tooltip_few": "{{count}} subnotițe ascunse din arbore",
+    "subtree-hidden-tooltip_other": "{{count}} de subnotițe ascunse din arbore",
+    "subtree-hidden-moved-title": "Adăugat în {{title}}",
+    "subtree-hidden-moved-description-collection": "Subnotițele din această colecție sunt ascunse din arbore.",
+    "subtree-hidden-moved-description-other": "Subnotițele din această notiță sunt ascunse."
   },
   "title_bar_buttons": {
     "window-on-top": "Menține fereastra mereu vizibilă"
@@ -1523,10 +1570,24 @@
   "note_detail": {
     "could_not_find_typewidget": "Nu s-a putut găsi widget-ul corespunzător tipului „{{type}}”",
     "printing": "Imprimare în curs...",
-    "printing_pdf": "Exportare ca PDF în curs..."
+    "printing_pdf": "Exportare ca PDF în curs...",
+    "print_report_title": "Raport de imprimare",
+    "print_report_collection_content_one": "{{count}} notiță din colecție nu a putut fi imprimată deoarece nu este suportată sau este protejată.",
+    "print_report_collection_content_few": "{{count}} notițe din colecție nu au putut fi imprimate deoarece nu sunt suportate sau sunt protejate.",
+    "print_report_collection_content_other": "{{count}} de notițe din colecție nu au putut fi imprimate deoarece nu sunt suportate sau sunt protejate.",
+    "print_report_collection_details_button": "Afișează detalii",
+    "print_report_collection_details_ignored_notes": "Notițe ignorate"
   },
   "note_title": {
-    "placeholder": "introduceți titlul notiței aici..."
+    "placeholder": "introduceți titlul notiței aici...",
+    "created_on": "Creată la <Value />",
+    "last_modified": "Modificată la <Value />",
+    "note_type_switcher_label": "Schimbă din {{type}} la:",
+    "note_type_switcher_others": "Mai multe tipuri de notițe",
+    "note_type_switcher_templates": "Șablon",
+    "note_type_switcher_collection": "Colecție",
+    "edited_notes": "Notițe editate în această zi",
+    "promoted_attributes": "Atribute promovate"
   },
   "revisions_snapshot_limit": {
     "erase_excess_revision_snapshots": "Șterge acum reviziile excesive",
@@ -1547,7 +1608,11 @@
     "configure_launchbar": "Configurează bara de lansare"
   },
   "sql_result": {
-    "no_rows": "Nu s-a găsit niciun rând pentru această interogare"
+    "no_rows": "Nu s-a găsit niciun rând pentru această interogare",
+    "not_executed": "Această interogare nu a fost executată încă.",
+    "failed": "Interogarea SQL a eșuat",
+    "statement_result": "Rezultatul comenzii SQL",
+    "execute_now": "Execută acum"
   },
   "sql_table_schemas": {
     "tables": "Tabele"
@@ -1569,7 +1634,8 @@
   },
   "toc": {
     "options": "Setări",
-    "table_of_contents": "Cuprins"
+    "table_of_contents": "Cuprins",
+    "no_headings": "Niciun titlu."
   },
   "watched_file_update_status": {
     "file_last_modified": "Fișierul <code class=\"file-path\"></code> a fost ultima oară modificat la data de <span class=\"file-last-modified\"></span>.",
@@ -1690,8 +1756,8 @@
     "show-recent-notes": "Afișează notițele recente"
   },
   "electron_integration": {
-    "background-effects": "Activează efectele de fundal (doar pentru Windows 11)",
-    "background-effects-description": "Efectul Mica adaugă un fundal estompat și elegant ferestrelor aplicațiilor, creând profunzime și un aspect modern. Opțiunea „Bară de titlu nativă” trebuie să fie dezactivată.",
+    "background-effects": "Activează efectele de fundal",
+    "background-effects-description": "Adaugă un fundal estompat și elegant ferestrelor aplicațiilor, creând profunzime și un aspect modern. Opțiunea „Bară de titlu nativă” trebuie să fie dezactivată.",
     "desktop-application": "Aplicația desktop",
     "native-title-bar": "Bară de titlu nativă",
     "native-title-bar-description": "Pentru Windows și macOS, dezactivarea bării de titlu native face aplicația să pară mai compactă. Pe Linux, păstrarea bării integrează mai bine aplicația cu restul sistemului de operare.",
@@ -1710,7 +1776,8 @@
   "geo-map": {
     "create-child-note-title": "Crează o notiță nouă și adaug-o pe hartă",
     "unable-to-load-map": "Nu s-a putut încărca harta.",
-    "create-child-note-instruction": "Click pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a anula."
+    "create-child-note-instruction": "Click pe hartă pentru a crea o nouă notiță la acea poziție sau apăsați Escape pentru a anula.",
+    "create-child-note-text": "Adaugă marcaj"
   },
   "duration": {
     "days": "zile",
@@ -1758,7 +1825,8 @@
   },
   "note_language": {
     "configure-languages": "Configurează limbile...",
-    "not_set": "Nedefinită"
+    "not_set": "Nicio limbă setată",
+    "help-on-languages": "Informații despre limba conținutului..."
   },
   "png_export_button": {
     "button_title": "Exportă diagrama ca PNG"
@@ -1954,7 +2022,8 @@
     "oauth_user_not_logged_in": "Neautentificat!"
   },
   "svg": {
-    "export_to_png": "Diagrama nu a putut fi exportată în PNG."
+    "export_to_png": "Diagrama nu a putut fi exportată în PNG.",
+    "export_to_svg": "Diagrama nu a putut fi exportată în SVG."
   },
   "code_theme": {
     "title": "Afișare",
@@ -2002,7 +2071,7 @@
   "book_properties_config": {
     "hide-weekends": "Ascunde weekend-urile",
     "display-week-numbers": "Afișează numărul săptămânii",
-    "map-style": "Stil hartă:",
+    "map-style": "Stil hartă",
     "max-nesting-depth": "Nivel maxim de imbricare:",
     "raster": "Raster",
     "vector_light": "Vectorial (culoare deschisă)",
@@ -2054,12 +2123,15 @@
   },
   "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_message": "Pe dispozitive cu Windows și macOS, efectele de fundal sunt stabile. Acestea adaugă un strop de culoare interfeței grafice prin estomparea fundalului din spatele ferestrei.",
     "background_effects_button": "Activează efectele de fundal",
     "next_theme_title": "Încercați noua temă Trilium",
     "next_theme_message": "Utilizați tema clasică, doriți să încercați noua temă?",
     "next_theme_button": "Testează noua temă",
-    "dismiss": "Treci peste"
+    "dismiss": "Treci peste",
+    "new_layout_title": "Aspect nou",
+    "new_layout_message": "Am introdus un aspect modernizat pentru Trilium. Panglică a fost integrată în restul interfeței, cu o bară de stare nouă și secțiuni expandabile (precum atributele promovate) ce preiau funcționalitatea de bază.\n\nNoul aspect este activat în mod implicit, și se poate dezactiva momentan din Opțiuni → Aspect.",
+    "new_layout_button": "Mai multe informații"
   },
   "ui-performance": {
     "title": "Setări de performanță",
@@ -2074,7 +2146,10 @@
   },
   "settings_appearance": {
     "related_code_blocks": "Tema de culori pentru blocuri de cod în notițe de tip text",
-    "related_code_notes": "Tema de culori pentru notițele de tip cod"
+    "related_code_notes": "Tema de culori pentru notițele de tip cod",
+    "ui": "Interfață grafică",
+    "ui_old_layout": "Aspect vechi",
+    "ui_new_layout": "Aspect nou"
   },
   "units": {
     "percentage": "%"
@@ -2106,5 +2181,110 @@
   },
   "popup-editor": {
     "maximize": "Comută la editorul principal"
+  },
+  "experimental_features": {
+    "title": "Opțiuni experimentale",
+    "disclaimer": "Aceste opțiuni sunt experimentale și pot cauza instabilitate. Folosiți cu prudență.",
+    "new_layout_name": "Aspect nou",
+    "new_layout_description": "Încercați noul aspect pentru un design mai modern și mai ușor de utilizat. Poate surveni modificări semnificative în următoarele release-uri."
+  },
+  "server": {
+    "unknown_http_error_title": "Eroare de comunicare cu server-ul",
+    "unknown_http_error_content": "Cod: {{statusCode}}\nURL: {{method}} {{url}}\nMesaj: {{message}}",
+    "traefik_blocks_requests": "Dacă utilizați reverse proxy-ul Traefik, acesta a introdus o schimbare majoră ce afectează comunicarea cu server-ul."
+  },
+  "tab_history_navigation_buttons": {
+    "go-back": "Înapoi la notița anterioară",
+    "go-forward": "Înainte către notița următoare"
+  },
+  "breadcrumb_badges": {
+    "read_only_explicit": "Mod citire",
+    "read_only_explicit_description": "Această notiță a fost setată explicit să fie doar în citire.\nClick pentru a o edita temporar.",
+    "read_only_auto": "Mod citire auto",
+    "read_only_auto_description": "Această notița a fost setată automată să fie în mod doar de citire din motive de performanță. Această limită automată este ajustabilă din setări.\n\nClick pentru a o edita temporar.",
+    "read_only_temporarily_disabled": "Editabilă temporar",
+    "read_only_temporarily_disabled_description": "Această notiță se poate modifica, deși în mod normal ea este doar în citire. Notița va reveni la modul doar în citire imediat ce navigați către altă notiță.\n\nClick pentru a re-activa modul doar în citire.",
+    "shared_publicly": "Partajată public",
+    "shared_locally": "Partajată local",
+    "shared_copy_to_clipboard": "Copiază legătură în clipboard",
+    "shared_open_in_browser": "Deschide legătura în browser",
+    "shared_unshare": "Înlătură partajarea",
+    "clipped_note": "Decupare web",
+    "clipped_note_description": "Această notiță a fost preluată de la {{url}}.\n\nClic pentru a naviga la pagina web sursă.",
+    "execute_script": "Rulează script",
+    "execute_script_description": "Această notiță este un script. Clic pentru a executa scriptul.",
+    "execute_sql": "Rulează SQL",
+    "execute_sql_description": "Această notiță este de tip SQL. Clic pentru a executa interogarea SQL.",
+    "save_status_saved": "Salvat",
+    "save_status_saving": "Se salvează...",
+    "save_status_unsaved": "Nesalvat",
+    "save_status_error": "Salvarea a eșuat",
+    "save_status_saving_tooltip": "Modificările sunt în curs de salvare.",
+    "save_status_unsaved_tooltip": "Există schimbări ce nu au fost încă salvate. Acestea vor fi salvate automat într-un moment.",
+    "save_status_error_tooltip": "A intervenit o eroare la salvarea notiței. Dacă este posibil, încercați să copiați conținutul notiței într-un alt loc și să reîmprospătați aplicația."
+  },
+  "breadcrumb": {
+    "hoisted_badge": "Focalizat",
+    "hoisted_badge_title": "Defocalizează",
+    "workspace_badge": "Spațiu de lucru",
+    "scroll_to_top_title": "Sari la începutul notiței",
+    "create_new_note": "Crează subnotiță",
+    "empty_hide_archived_notes": "Ascunde notițele arhivate"
+  },
+  "status_bar": {
+    "language_title": "Schimbă limba conținutului",
+    "note_info_title": "Afișează informații despre notiță precum data modificării și dimensiunea",
+    "backlinks_one": "{{count}} legătură de retur",
+    "backlinks_few": "{{count}} legături de retur",
+    "backlinks_other": "{{count}} de legături de retur",
+    "backlinks_title_one": "Afișează legătura de retur",
+    "backlinks_title_few": "Afișează legăturile de retur",
+    "backlinks_title_other": "Afișează legăturile de retur",
+    "attachments_one": "{{count}} atașament",
+    "attachments_few": "{{count}} atașamente",
+    "attachments_other": "{{count}} de atașamente",
+    "attachments_title_one": "Deschide atașamentul într-un tab nou",
+    "attachments_title_few": "Deschide atașamentele într-un tab nou",
+    "attachments_title_other": "Deschide atașamentele într-un tab nou",
+    "attributes_one": "{{count}} atribut",
+    "attributes_few": "{{count}} atribute",
+    "attributes_other": "{{count}} de atribute",
+    "attributes_title": "Atribute proprii și moștenite",
+    "note_paths_one": "O cale",
+    "note_paths_few": "{{count}} căi",
+    "note_paths_other": "{{count}} de căi",
+    "note_paths_title": "Căi ale notiței",
+    "code_note_switcher": "Schimbă limbajul"
+  },
+  "attributes_panel": {
+    "title": "Atributele notiței"
+  },
+  "right_pane": {
+    "empty_message": "Nimic de afișat pentru această notiță",
+    "empty_button": "Ascunde panoul",
+    "toggle": "Comută panoul din dreapta",
+    "custom_widget_go_to_source": "Mergi la codul sursă"
+  },
+  "pdf": {
+    "attachments_one": "{{count}} atașament",
+    "attachments_few": "{{count}} atașamente",
+    "attachments_other": "{{count}} de atașamente",
+    "layers_one": "{{count}} strat",
+    "layers_few": "{{count}} straturi",
+    "layers_other": "{{count}} de straturi",
+    "pages_one": "{{count}} pagină",
+    "pages_few": "{{count}} pagini",
+    "pages_other": "{{count}} de pagini",
+    "pages_alt": "Pagina {{pageNumber}}",
+    "pages_loading": "Încărcare..."
+  },
+  "platform_indicator": {
+    "available_on": "Disponibil pe {{platform}}"
+  },
+  "mobile_tab_switcher": {
+    "title_one": "{{count}} tab",
+    "title_few": "{{count}} taburi",
+    "title_other": "{{count}} de taburi",
+    "more_options": "Mai multe opțiuni"
   }
 }