feat(dev): merge main into feature branch

Resolved conflicts by:
- Combining imports from both branches in search.ts (added
hoistedNoteService and beccaService alongside existing ftsSearchService
and log imports)
- Integrating FTS5 search optimization from feature branch with flatText
attribute search logic from main in note_content_fulltext.ts
- Maintained backward compatibility by keeping fallback search
implementation for cases where FTS5 is not available or not suitable

.github/workflows/i18n.yml

@@ -1,30 +0,0 @@
-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/release.yml

@@ -11,14 +11,6 @@ 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:

.github/workflows/website.yml

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

.gitignore

@@ -51,4 +51,3 @@ upload
 # docs
 site/
 apps/*/coverage
-scripts/translation/.language*.json

.nvmrc

@@ -1 +1 @@
-24.13.0
+24.12.0

README.md

@@ -165,17 +165,6 @@ 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.28.1",
+  "packageManager": "pnpm@10.26.2",
   "devDependencies": {
-    "@redocly/cli": "2.14.7",
+    "@redocly/cli": "2.14.1",
     "archiver": "7.0.1",
     "fs-extra": "11.3.3",
     "react": "19.2.3",
     "react-dom": "19.2.3",
-    "typedoc": "0.28.16",
+    "typedoc": "0.28.15",
     "typedoc-plugin-missing-exports": "4.1.2"
   }
 }

apps/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triliumnext/client",
-  "version": "0.101.3",
+  "version": "0.101.1",
   "description": "JQuery-based client for TriliumNext, used for both web and desktop (via Electron)",
   "private": true,
   "license": "AGPL-3.0-only",
@@ -27,14 +27,14 @@
     "@mermaid-js/layout-elk": "0.2.0",
     "@mind-elixir/node-menu": "5.0.1",
     "@popperjs/core": "2.11.8",
-    "@preact/signals": "2.6.1",
+    "@preact/signals": "2.5.1",
     "@triliumnext/ckeditor5": "workspace:*",
     "@triliumnext/codemirror": "workspace:*",
     "@triliumnext/commons": "workspace:*",
     "@triliumnext/highlightjs": "workspace:*",
     "@triliumnext/share-theme": "workspace:*",
     "@triliumnext/split.js": "workspace:*",
-    "@zumer/snapdom": "2.0.2",
+    "@zumer/snapdom": "2.0.1",
     "autocomplete.js": "0.38.1",
     "bootstrap": "5.3.8",
     "boxicons": "2.1.4",
@@ -43,10 +43,10 @@
     "debounce": "3.0.0",
     "draggabilly": "3.0.0",
     "force-graph": "1.51.0",
-    "globals": "17.0.0",
-    "i18next": "25.8.0",
+    "globals": "16.5.0",
+    "i18next": "25.7.3",
     "i18next-http-backend": "3.0.2",
-    "jquery": "4.0.0",
+    "jquery": "3.7.1",
     "jquery.fancytree": "2.38.5",
     "jsplumb": "2.15.6",
     "katex": "0.16.27",
@@ -56,12 +56,11 @@
     "mark.js": "8.11.1",
     "marked": "17.0.1",
     "mermaid": "11.12.2",
-    "mind-elixir": "5.6.1",
+    "mind-elixir": "5.3.8",
     "normalize.css": "8.0.1",
     "panzoom": "9.4.3",
-    "preact": "10.28.2",
-    "react-i18next": "16.5.3",
-    "react-window": "2.2.5",
+    "preact": "10.28.1",
+    "react-i18next": "16.5.0",
     "reveal.js": "5.2.1",
     "svg-pan-zoom": "3.6.2",
     "tabulator-tables": "6.3.1",
@@ -69,7 +68,7 @@
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-inspector": "5.0.0",
-    "@prefresh/vite": "2.4.11",
+    "@preact/preset-vite": "2.10.2",
     "@types/bootstrap": "5.2.10",
     "@types/jquery": "3.5.33",
     "@types/leaflet": "1.9.21",
@@ -78,9 +77,8 @@
     "@types/reveal.js": "5.2.2",
     "@types/tabulator-tables": "6.3.1",
     "copy-webpack-plugin": "13.0.1",
-    "happy-dom": "20.3.7",
-    "lightningcss": "1.31.1",
+    "happy-dom": "20.0.11",
     "script-loader": "0.7.2",
-    "vite-plugin-static-copy": "3.1.5"
+    "vite-plugin-static-copy": "3.1.4"
   }
 }

apps/client/src/components/app_context.ts

@@ -1,12 +1,12 @@
 import type { CKTextEditor } from "@triliumnext/ckeditor5";
 import type CodeMirror from "@triliumnext/codemirror";
-import { SqlExecuteResponse } from "@triliumnext/commons";
+import { SqlExecuteResults } from "@triliumnext/commons";
 import type { NativeImage, TouchBar } from "electron";
 import { ColumnComponent } from "tabulator-tables";
 
 import type { Attribute } from "../services/attribute_parser.js";
 import froca from "../services/froca.js";
-import { initLocale, t } from "../services/i18n.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";
@@ -154,7 +154,6 @@ export type CommandMappings = {
     };
     openInTab: ContextMenuCommandData;
     openNoteInSplit: ContextMenuCommandData;
-    openNoteInWindow: ContextMenuCommandData;
     openNoteInPopup: ContextMenuCommandData;
     toggleNoteHoisting: ContextMenuCommandData;
     insertNoteAfter: ContextMenuCommandData;
@@ -383,8 +382,7 @@ export type CommandMappings = {
     reloadTextEditor: CommandData;
     chooseNoteType: CommandData & {
         callback: ChooseNoteTypeCallback
-    };
-    customDownload: CommandData;
+    }
 };
 
 type EventMappings = {
@@ -410,7 +408,7 @@ type EventMappings = {
     addNewLabel: CommandData;
     addNewRelation: CommandData;
     sqlQueryResults: CommandData & {
-        response: SqlExecuteResponse;
+        results: SqlExecuteResults;
     };
     readOnlyTemporarilyDisabled: {
         noteContext: NoteContext;
@@ -475,11 +473,6 @@ type EventMappings = {
     noteContextRemoved: {
         ntxIds: string[];
     };
-    contextDataChanged: {
-        noteContext: NoteContext;
-        key: string;
-        value: unknown;
-    };
     exportSvg: { ntxId: string | null | undefined; };
     exportPng: { ntxId: string | null | undefined; };
     geoMapCreateChildNote: {

apps/client/src/components/component.ts

@@ -57,18 +57,6 @@ 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);

apps/client/src/components/entrypoints.ts

@@ -1,17 +1,16 @@
-import { CreateChildrenResponse, SqlExecuteResponse } from "@triliumnext/commons";
-
-import bundleService from "../services/bundle.js";
+import utils from "../services/utils.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() {
@@ -188,8 +187,13 @@ 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 response = await server.post<SqlExecuteResponse>(`sql/execute/${note.noteId}`);
-            await appContext.triggerEvent("sqlQueryResults", { ntxId, response });
+            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 });
         }
 
         toastService.showMessage(t("entrypoints.note-executed"));

apps/client/src/components/note_context.ts

@@ -12,7 +12,6 @@ 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";
 
@@ -23,31 +22,6 @@ 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;
@@ -58,13 +32,6 @@ 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();
 
@@ -124,22 +91,6 @@ 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);
@@ -492,52 +443,6 @@ 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/desktop.ts

@@ -1,18 +1,17 @@
-import "autocomplete.js/index_jquery.js";
-
-import type ElectronRemote from "@electron/remote";
-import type Electron from "electron";
-
 import appContext from "./components/app_context.js";
-import electronContextMenu from "./menus/electron_context_menu.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 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";
+import type ElectronRemote from "@electron/remote";
+import type Electron from "electron";
+import "boxicons/css/boxicons.min.css";
+import "autocomplete.js/index_jquery.js";
 
 await appContext.earlyInit();
 

apps/client/src/entities/fnote.ts

@@ -1,4 +1,4 @@
-import { getNoteIcon } from "@triliumnext/commons";
+import { MIME_TYPES_DICT } from "@triliumnext/commons";
 
 import cssClassManager from "../services/css_class_manager.js";
 import type { Froca } from "../services/froca-interface.js";
@@ -8,11 +8,30 @@ 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";
+import type { AttributeType,default as FAttribute } from "./fattribute.js";
 
 const LABEL = "label";
 const RELATION = "relation";
 
+export 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
@@ -566,15 +585,25 @@ export default class FNote {
         const iconClassLabels = this.getLabels("iconClass");
         const workspaceIconClass = this.getWorkspaceIconClass();
 
-        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}`;
+        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";
+            }
+            return "bx bx-note";
+        } else if (this.type === "code") {
+            const correspondingMimeType = MIME_TYPES_DICT.find(m => m.mime === this.mime);
+            return correspondingMimeType?.icon ?? NOTE_TYPE_ICONS.code;
+        }
+        return NOTE_TYPE_ICONS[this.type];
     }
 
     getColorClass() {
@@ -583,9 +612,7 @@ export default class FNote {
     }
 
     isFolder() {
-        if (this.isLabelTruthy("subtreeHidden")) return false;
-        if (this.type === "search") return true;
-        return this.getFilteredChildBranches().length > 0;
+        return this.type === "search" || this.getFilteredChildBranches().length > 0;
     }
 
     getFilteredChildBranches() {

apps/client/src/index.html

@@ -1,29 +0,0 @@
-<!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 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="./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/src/index.ts

@@ -1,131 +0,0 @@
-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

@@ -46,6 +46,8 @@ import ScrollPadding from "../widgets/scroll_padding.js";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
 import RightPanelContainer from "../widgets/sidebar/RightPanelContainer.jsx";
+import SqlResults from "../widgets/sql_result.js";
+import SqlTableSchemas from "../widgets/sql_table_schemas.js";
 import TabRowWidget from "../widgets/tab_row.js";
 import TabHistoryNavigationButtons from "../widgets/TabHistoryNavigationButtons.jsx";
 import TitleBarButtons from "../widgets/title_bar_buttons.jsx";
@@ -161,9 +163,11 @@ export default class DesktopLayout {
                                                                     .child(<SharedInfo />)
                                                                 )
                                                                 .optChild(!isNewLayout, <PromotedAttributes />)
+                                                                .child(<SqlTableSchemas />)
                                                                 .child(<NoteDetail />)
                                                                 .child(<NoteList media="screen" />)
                                                                 .child(<SearchResult />)
+                                                                .child(<SqlResults />)
                                                                 .child(<ScrollPadding />)
                                                         )
                                                         .child(<ApiLog />)

apps/client/src/layouts/mobile_layout.tsx

@@ -1,35 +1,35 @@
-import type AppContext from "../components/app_context.js";
-import GlobalMenuWidget from "../widgets/buttons/global_menu.js";
-import CloseZenModeButton from "../widgets/close_zen_button.js";
-import NoteList from "../widgets/collections/NoteList.jsx";
-import ContentHeader from "../widgets/containers/content_header.js";
-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 FloatingButtons from "../widgets/FloatingButtons.jsx";
+import { applyModals } from "./layout_commons.js";
 import { MOBILE_FLOATING_BUTTONS } from "../widgets/FloatingButtonsDefinitions.jsx";
-import LauncherContainer from "../widgets/launch_bar/LauncherContainer.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 GlobalMenuWidget from "../widgets/buttons/global_menu.js";
 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 NoteList from "../widgets/collections/NoteList.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 NoteDetail from "../widgets/NoteDetail.jsx";
-import PromotedAttributes from "../widgets/PromotedAttributes.jsx";
 import QuickSearchWidget from "../widgets/quick_search.js";
-import { useNoteContext } from "../widgets/react/hooks.jsx";
 import ReadOnlyNoteInfoBar from "../widgets/ReadOnlyNoteInfoBar.jsx";
-import StandaloneRibbonAdapter from "../widgets/ribbon/components/StandaloneRibbonAdapter.jsx";
-import FilePropertiesTab from "../widgets/ribbon/FilePropertiesTab.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 MobileEditorToolbar from "../widgets/type_widgets/text/mobile_editor_toolbar.jsx";
-import { applyModals } from "./layout_commons.js";
+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>
@@ -194,11 +194,11 @@ export default class MobileLayout {
 }
 
 function FilePropertiesWrapper() {
-    const { note, ntxId } = useNoteContext();
+    const { note } = useNoteContext();
 
     return (
         <div>
-            {note?.type === "file" && <FilePropertiesTab note={note} ntxId={ntxId} />}
+            {note?.type === "file" && <FilePropertiesTab note={note} />}
         </div>
     );
 }

apps/client/src/menus/tree_context_menu.ts

@@ -1,21 +1,21 @@
-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 NoteColorPicker from "./custom-items/NoteColorPicker.jsx";
+import treeService from "../services/tree.js";
 import froca from "../services/froca.js";
-import { t } from "../services/i18n.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 noteTypesService from "../services/note_types.js";
 import server from "../services/server.js";
 import toastService from "../services/toast.js";
-import treeService from "../services/tree.js";
-import utils from "../services/utils.js";
+import dialogService from "../services/dialog.js";
+import { t } from "../services/i18n.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";
+import type FAttachment from "../entities/fattachment.js";
+import type { SelectMenuItemEventListener } from "../components/events.js";
+import utils from "../services/utils.js";
+import attributes from "../services/attributes.js";
+import { executeBulkActions } from "../services/bulk_action.js";
 
 // TODO: Deduplicate once client/server is well split.
 interface ConvertToAttachmentResponse {
@@ -72,8 +72,6 @@ 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;
@@ -81,18 +79,17 @@ 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" },
@@ -115,7 +112,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 && !hasSubtreeHidden && !isSpotlighted,
+                enabled: notSearch && noSelectedNotes && notOptionsOrHelp,
                 columns: 2
             },
 
@@ -153,17 +150,8 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
 
                     { kind: "separator" },
 
-                    !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.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 },
                     {
                         title: t("tree-context-menu.sort-by"),
                         command: "sortChildNotes",
@@ -176,7 +164,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" },
@@ -304,30 +292,25 @@ export default class TreeContextMenu implements SelectMenuItemEventListener<Tree
             noteCreateService.createNote(parentNotePath, {
                 target: "after",
                 targetBranchId: this.node.data.branchId,
-                type,
-                isProtected,
-                templateNoteId
+                type: type,
+                isProtected: isProtected,
+                templateNoteId: 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;
@@ -349,11 +332,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,8 +1,8 @@
-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";
+import glob from "./services/glob.js";
+import "boxicons/css/boxicons.min.css";
+import "autocomplete.js/index_jquery.js";
 
 glob.setupGlobs();
 

apps/client/src/print.tsx

@@ -29,9 +29,7 @@ async function main() {
     const froca = (await import("./services/froca")).default;
     const note = await froca.getNote(noteId);
 
-    const bodyWrapper = document.createElement("div");
-    render(<App note={note} noteId={noteId} />, bodyWrapper);
-    document.body.appendChild(bodyWrapper);
+    render(<App note={note} noteId={noteId} />, document.body);
 }
 
 function App({ note, noteId }: { note: FNote | null | undefined, noteId: string }) {

apps/client/src/runtime.ts

@@ -8,17 +8,6 @@ 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

@@ -1,139 +0,0 @@
-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,67 +1,36 @@
-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";
+import froca from "./froca.js";
+import type FNote from "../entities/fnote.js";
+import type { AttributeRow } from "./load_results.js";
+import { AttributeType } from "@triliumnext/commons";
 
 async function addLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/attribute`, {
         type: "label",
-        name,
-        value,
+        name: name,
+        value: value,
         isInheritable
     });
 }
 
-export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false, componentId?: string) {
+export async function setLabel(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "label",
-        name,
-        value,
-        isInheritable,
-    }, componentId);
+        name: name,
+        value: value,
+        isInheritable
+    });
 }
 
 export async function setRelation(noteId: string, name: string, value: string = "", isInheritable = false) {
     await server.put(`notes/${noteId}/set-attribute`, {
         type: "relation",
-        name,
-        value,
+        name: name,
+        value: 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}`);
 }
@@ -117,15 +86,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, componentId?: string) {
+export async function setAttribute(note: FNote, type: "label" | "relation", name: string, value: string | null | undefined) {
     if (value !== null && value !== undefined) {
         // Create or update the attribute.
-        await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value }, componentId);
+        await server.put(`notes/${note.noteId}/set-attribute`, { type, name, value });
     } 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}`, componentId);
+            await server.remove(`notes/${note.noteId}/attributes/${attributeId}`);
         }
     }
 }
@@ -173,7 +142,6 @@ export default {
     setLabel,
     setRelation,
     setAttribute,
-    setBooleanWithInheritance,
     removeAttributeById,
     removeOwnedLabelByName,
     removeOwnedRelationByName,

apps/client/src/services/branches.ts

@@ -1,12 +1,12 @@
-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 { t } from "./i18n.js";
+import utils from "./utils.js";
 import server from "./server.js";
 import toastService, { type ToastOptionsWithRequiredId } from "./toast.js";
-import utils from "./utils.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";
 
 // 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, componentId?: string) {
+async function moveToParentNote(branchIdsToMove: string[], newParentBranchId: 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}`, undefined, componentId);
+        const resp = await server.put<Response>(`branches/${branchIdToMove}/move-to/${newParentBranchId}`);
 
         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, componentId?: string) {
+async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = false, moveToParent = true) {
     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}`, componentId);
+            await server.remove(`notes/${branch.noteId}${query}`);
         } else {
-            await server.remove(`branches/${branchIdToDelete}${query}`, componentId);
+            await server.remove(`branches/${branchIdToDelete}${query}`);
         }
     }
 

apps/client/src/services/content_renderer.ts

@@ -1,19 +1,18 @@
-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 renderService from "./render.js";
 import protectedSessionService from "./protected_session.js";
 import protectedSessionHolder from "./protected_session_holder.js";
-import renderService from "./render.js";
-import { applySingleBlockSyntaxHighlight } from "./syntax_highlight.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 { 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";
 
 let idCounter = 1;
 
@@ -23,12 +22,6 @@ 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"]);
@@ -159,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);
@@ -200,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(`pdfjs/web/viewer.html?file=../../api/${entityType}/${entityId}/open`));
+        $pdfPreview.attr("src", openService.getUrlForDownload(`api/${entityType}/${entityId}/open`));
 
         $content.append($pdfPreview);
     } else if (type === "audio") {
@@ -224,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="tn-icon bx bx-download"></span>
+                <span class="bx bx-download"></span>
                 ${t("file_properties.download")}
             </button>
         `);
 
         const $openButton = $(`
             <button class="file-open btn btn-primary" type="button">
-                <span class="tn-icon bx bx-link-external"></span>
+                <span class="bx bx-link-external"></span>
                 ${t("file_properties.open")}
             </button>
         `);
 
         $downloadButton.on("click", (e) => {
             e.stopPropagation();
-            openService.downloadFileNote(entity, null, null);
+            openService.downloadFileNote(entity.noteId)
         });
         $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");
         });
@@ -273,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) {

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

@@ -1,132 +0,0 @@
-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

@@ -15,14 +15,7 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
 
     if (blob && !isHtmlEmpty(blob.content)) {
         $renderedContent.append($('<div class="ck-content">').html(blob.content));
-
-        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();
-        }
+        await renderIncludedNotes($renderedContent[0]);
 
         if ($renderedContent.find("span.math-tex").length > 0) {
             renderMathInElement($renderedContent[0], { trust: true });
@@ -42,11 +35,11 @@ export default async function renderText(note: FNote | FAttachment, $renderedCon
         await rewriteMermaidDiagramsInContainer($renderedContent[0] as HTMLDivElement);
         await formatCodeBlocks($renderedContent);
     } else if (note instanceof FNote && !options.noChildrenList) {
-        await renderChildrenList($renderedContent, note, options.includeArchivedNotes ?? false);
+        await renderChildrenList($renderedContent, note);
     }
 }
 
-async function renderIncludedNotes(contentEl: HTMLElement, seenNoteIds: Set<string>) {
+async function renderIncludedNotes(contentEl: HTMLElement) {
     // TODO: Consider duplicating with server's share/content_renderer.ts.
     const includeNoteEls = contentEl.querySelectorAll("section.include-note");
 
@@ -73,15 +66,7 @@ async function renderIncludedNotes(contentEl: HTMLElement, seenNoteIds: Set<stri
             continue;
         }
 
-        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;
+        const renderedContent = (await content_renderer.getRenderedContent(note)).$renderedContent;
         includeNoteEl.replaceChildren(...renderedContent);
     }
 }
@@ -113,7 +98,7 @@ export async function applyInlineMermaid(container: HTMLDivElement) {
     }
 }
 
-async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote, includeArchivedNotes: boolean) {
+async function renderChildrenList($renderedContent: JQuery<HTMLElement>, note: FNote) {
     let childNoteIds = note.getChildNoteIds();
 
     if (!childNoteIds.length) {
@@ -123,16 +108,14 @@ 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

@@ -1,14 +0,0 @@
-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,7 +1,6 @@
 import clsx from "clsx";
-import Color, { ColorInstance } from "color";
-
 import {readCssVar} from "../utils/css-var";
+import Color, { ColorInstance } from "color";
 
 const registeredClasses = new Set<string>();
 const colorsWithHue = new Set<string>();
@@ -9,14 +8,14 @@ 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 "";
@@ -28,7 +27,7 @@ function createClassForColor(colorString: string | null) {
 
     if (!registeredClasses.has(className)) {
         const adjustedColor = adjustColorLightness(color, lightThemeColorMaxLightness!,
-            darkThemeColorMinLightness!);
+                                                   darkThemeColorMinLightness!);
         const hue = getHue(color);
 
         $("head").append(`<style>
@@ -51,7 +50,7 @@ function createClassForColor(colorString: string | null) {
 
 function parseColor(color: string) {
     try {
-        return Color(color.toLowerCase());
+        return Color(color);
     } catch (ex) {
         console.error(ex);
     }
@@ -85,8 +84,8 @@ function getHue(color: ColorInstance) {
 }
 
 export function getReadableTextColor(bgColor: string) {
-    const colorInstance = parseColor(bgColor);
-    return !colorInstance || colorInstance?.isLight() ? "#000" : "#fff";
+    const colorInstance = Color(bgColor);
+    return colorInstance.isLight() ? "#000" : "#fff";
 }
 
 export default {

apps/client/src/services/load_results.ts

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

apps/client/src/services/open.ts

@@ -1,8 +1,6 @@
-import Component from "../components/component.js";
-import FNote from "../entities/fnote.js";
+import utils from "./utils.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;
 
@@ -38,14 +36,9 @@ function download(url: string) {
     }
 }
 
-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;
-    }
+export function downloadFileNote(noteId: string) {
+    const url = `${getFileUrl("notes", noteId)}?${Date.now()}`; // don't use cache
 
-    const url = `${getFileUrl("notes", note.noteId)}?${Date.now()}`; // don't use cache
     download(url);
 }
 
@@ -104,7 +97,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);
@@ -138,10 +131,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/server.ts

@@ -85,15 +85,13 @@ async function remove<T>(url: string, componentId?: string) {
     return await call<T>("DELETE", url, componentId);
 }
 
-async function upload(url: string, fileToUpload: File, componentId?: string) {
+async function upload(url: string, fileToUpload: File) {
     const formData = new FormData();
     formData.append("upload", fileToUpload);
 
     return await $.ajax({
         url: window.glob.baseApiUrl + url,
-        headers: await getHeaders(componentId ? {
-            "trilium-component-id": componentId
-        } : undefined),
+        headers: await getHeaders(),
         data: formData,
         type: "PUT",
         timeout: 60 * 60 * 1000,

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

@@ -1,6 +1,5 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import shortcuts, { isIMEComposing, keyMatches, matchesShortcut } from "./shortcuts.js";
+import { describe, expect, it, vi, beforeEach, afterEach } from "vitest";
+import shortcuts, { keyMatches, matchesShortcut, isIMEComposing } from "./shortcuts.js";
 
 // Mock utils module
 vi.mock("./utils.js", () => ({
@@ -62,10 +61,9 @@ describe("shortcuts", () => {
     });
 
     describe("keyMatches", () => {
-        const createKeyboardEvent = (key: string, code?: string, extraProps: Partial<KeyboardEvent> = {}) => ({
+        const createKeyboardEvent = (key: string, code?: string) => ({
             key,
-            code: code || `Key${key.toUpperCase()}`,
-            ...extraProps
+            code: code || `Key${key.toUpperCase()}`
         } as KeyboardEvent);
 
         it("should match regular letter keys using key code", () => {
@@ -102,26 +100,6 @@ 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", () => {
@@ -222,42 +200,6 @@ 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,13 +213,7 @@ 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,30 +1,22 @@
-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, stateCallback?: StateCallback) {
+    constructor(updater: Callback, updateInterval = 1000) {
         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());
         }
     }
@@ -34,13 +26,10 @@ 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;
             }
         }
@@ -70,22 +59,15 @@ export default class SpacedUpdate {
         this.updateInterval = interval;
     }
 
-    async triggerUpdate() {
+    triggerUpdate() {
         if (!this.changed) {
             return;
         }
 
         if (Date.now() - this.lastUpdated > this.updateInterval) {
-            this.stateCallback?.("saving");
-            try {
-                await this.updater();
-                this.stateCallback?.("saved");
-                this.changed = false;
-            } catch (e) {
-                this.stateCallback?.("error");
-                logError(getErrorMessage(e));
-            }
+            this.updater();
             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,11 +1,10 @@
-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 { ensureMimeTypes, highlight, highlightAuto, loadTheme, Themes, type AutoHighlightResult, type HighlightResult, type Theme } from "@triliumnext/highlightjs";
 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;
 
@@ -77,15 +76,13 @@ export async function applySingleBlockSyntaxHighlight($codeBlock: JQuery<HTMLEle
 }
 
 export async function ensureMimeTypesForHighlighting(mimeTypeHint?: string) {
-    if (!mimeTypeHint && highlightingLoaded) {
+    if (highlightingLoaded) {
         return;
     }
 
     // Load theme.
-    if (!highlightingLoaded) {
-        const currentThemeName = String(options.get("codeBlockTheme"));
-        await loadHighlightingTheme(currentThemeName);
-    }
+    const currentThemeName = String(options.get("codeBlockTheme"));
+    await loadHighlightingTheme(currentThemeName);
 
     // Load mime types.
     let mimeTypes: MimeType[];
@@ -97,7 +94,7 @@ export async function ensureMimeTypesForHighlighting(mimeTypeHint?: string) {
                 enabled: true,
                 mime: mimeTypeHint.replace("-", "/")
             }
-        ];
+        ]
     } else {
         mimeTypes = mime_types.getMimeTypes();
     }
@@ -127,9 +124,9 @@ export function isSyntaxHighlightEnabled() {
     if (!isShare) {
         const theme = options.get("codeBlockTheme");
         return !!theme && theme !== "none";
+    } else {
+        return true;
     }
-    return true;
-
 }
 
 /**

apps/client/src/services/utils.ts

@@ -187,15 +187,13 @@ export function formatSize(size: number | null | undefined) {
         return "";
     }
 
-    if (size === 0) {
-        return "0 B";
+    size = Math.max(Math.round(size / 1024), 1);
+
+    if (size < 1024) {
+        return `${size} KiB`;
     }
+    return `${Math.round(size / 102.4) / 10} MiB`;
 
-    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]) {

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

@@ -1,498 +0,0 @@
-.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,5 +1,3 @@
-@import "./boxicons-compat.css";
-
 @font-face {
     font-family: Montserrat;
     src: url(../fonts/Montserrat-Light.ttf);
@@ -1130,6 +1128,11 @@ 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 */
 }
@@ -1796,7 +1799,7 @@ button.close:hover {
     display: none;
 }
 
-.reference-link .tn-icon {
+.reference-link .bx {
     position: relative;
     top: 1px;
     margin-inline-end: 3px;
@@ -2415,7 +2418,7 @@ footer.webview-footer button {
     gap: 5px;
 }
 
-.right-pane-tab .tab-title .tn-icon {
+.right-pane-tab .tab-title .bx {
     font-size: 1.1em;
 }
 
@@ -2543,11 +2546,18 @@ footer.webview-footer button {
     inset-inline-end: 10px;
 }
 
-.content-floating-buttons button.tn-icon {
+.content-floating-buttons button.bx {
     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 */

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,42 +40,10 @@
     border-bottom: var(--col-header-bottom-border);
     background: var(--col-header-background-color);
     color: var(--col-header-text-color);
-    font-weight: normal;
+}
 
-    .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;
-            }
-        }
-    }
+.tabulator .tabulator-col-content {
+    padding: 8px 4px !important;
 }
 
 @media (hover: hover) and (pointer: fine) {
@@ -112,6 +80,7 @@
 
 .tabulator-tableholder {
     padding-top: 10px;
+    height: unset !important; /* Don't extend on the full height */
 }
 
 /* Rows */
@@ -130,14 +99,6 @@
     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 {
@@ -159,14 +120,11 @@
     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);
 }
@@ -216,6 +174,10 @@
     margin: 0;
 }
 
+.tabulator .tabulator-footer {
+    color: var(--main-text-color);
+}
+
 /* Context menus */
 
 .tabulator-popup-container {
@@ -230,27 +192,8 @@
 }
 
 /* Footer */
+
 :root .tabulator .tabulator-footer {
-    background: transparent;
-    color: var(--main-text-color);
-    border-top: 1px solid var(--main-border-color);
+    border-top: unset;
     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-next/base.css

@@ -17,8 +17,6 @@
  */
 
 :root {
-    color-scheme: var(--theme-style);
-
     --main-font-family: "Inter", sans-serif;
 
     --main-font-size: normal;
@@ -136,7 +134,7 @@ body.backdrop-effects-disabled {
     white-space-collapse: discard;
 }
 
-.dropdown-menu.tn-dropdown-menu .dropdown-item .tn-icon {
+.dropdown-menu.tn-dropdown-menu .bx {
     margin-inline-end: 6px;
 }
 
@@ -251,7 +249,7 @@ html body .dropdown-item[disabled] {
 }
 
 /* Menu item icon */
-.dropdown-item .tn-icon {
+.dropdown-item .bx {
     translate: 0 var(--menu-item-icon-vert-offset);
     color: var(--menu-item-icon-color) !important;
     font-size: 1.1em;
@@ -498,7 +496,7 @@ li.dropdown-item a.dropdown-item-button {
     border: unset;
 }
 
-li.dropdown-item a.dropdown-item-button.tn-icon {
+li.dropdown-item a.dropdown-item-button.bx {
     color: var(--menu-text-color) !important;
 }
 
@@ -559,13 +557,13 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     padding-top: 0;
 }
 
-#toast-container .toast:not(.no-title) .tn-icon {
+#toast-container .toast:not(.no-title) .bx {
     margin-inline-end: 0.5em;
     font-size: 1.1em;
     opacity: 0.85;
 }
 
-#toast-container .toast.no-title .tn-icon {
+#toast-container .toast.no-title .bx {
     margin-inline-end: 0;
     font-size: 1.3em;
 }
@@ -756,7 +754,7 @@ li.dropdown-item a.dropdown-item-button:focus-visible {
     margin-bottom: 0;
 }
 
-.note-list-wrapper .note-book-card .tn-icon {
+.note-list-wrapper .note-book-card .bx {
     color: var(--left-pane-icon-color) !important;
 }
 

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.tn-icon {
+.note-type-chooser-dialog div.note-type-dropdown .dropdown-item span.bx {
     margin-inline-end: .25em;
-}
+}

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

@@ -62,10 +62,10 @@ button.ck.ck-button:is(.ck-button-action, .ck-button-save, .ck-button-cancel, .c
 }
 
 /* Button's icon */
-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 {
+button.btn.btn-primary span.bx,
+button.btn.btn-secondary span.bx,
+button.btn.btn-sm span.bx,
+button.btn.btn-success span.bx {
     color: var(--cmd-button-icon-color);
     padding-inline-end: 0.35em;
     font-size: 1.2em;

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

@@ -151,11 +151,6 @@
     --options-title-font-size: .75rem;
     --options-title-offset: 13px;
 }
-
-.note-split.options {
-    --preferred-max-content-width: var(--options-card-max-width);
-}
-
 /* 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);
@@ -190,6 +185,10 @@ body.experimental-feature-new-layout .note-detail-content-widget-content.options
     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);

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

@@ -497,7 +497,7 @@ div.bookmark-folder-widget .note-link:hover a {
 }
 
 /* The item's icon */
-div.bookmark-folder-widget .note-link .tn-icon {
+div.bookmark-folder-widget .note-link .bx {
     color: var(--menu-item-icon-color);
     font-size: 1.2em;
 }
@@ -767,7 +767,7 @@ body.mobile .fancytree-node > span {
     background: var(--left-pane-item-hover-background);
 }
 
-#left-pane .note-indicator-icon.shared-indicator {
+#left-pane span.fancytree-node.shared .fancytree-title::after {
     opacity: 0.5;
 }
 
@@ -1259,16 +1259,8 @@ body.layout-horizontal #rest-pane > .classic-toolbar-widget {
 #center-pane .note-split {
     padding-top: 2px;
     background-color: var(--note-split-background-color, var(--main-background-color));
-    transition: border-color 250ms ease-in;
-    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;
 }

apps/client/src/stylesheets/tree.css

@@ -148,28 +148,29 @@ span.fancytree-node.protected > span.fancytree-custom-icon {
     filter: drop-shadow(2px 2px 2px var(--main-text-color));
 }
 
-/* Note indicator icons (clone, shared) - real DOM elements for tooltip support */
-.note-indicator-icon {
+span.fancytree-node.multiple-parents.shared .fancytree-title::after {
     font-family: "boxicons" !important;
     font-size: smaller;
-    margin-inline-start: 4px;
-    opacity: 0.8;
-    cursor: help;
+    content: " \eb3d \ec03";
 }
 
-.note-indicator-icon.clone-indicator::before {
-    content: "\eb3d"; /* bx-link-alt */
+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.shared-indicator::before {
-    content: "\ec03"; /* bx-share-alt */
-}
-
-body.experimental-feature-new-layout .note-indicator-icon.clone-indicator::before {
-    content: "\ed82";
+body.experimental-feature-new-layout span.fancytree-node.multiple-parents .fancytree-title::after {
+    content: " \ed82";
     opacity: 0.5;
 }
 
+span.fancytree-node.shared .fancytree-title::after {
+    font-family: "boxicons" !important;
+    font-size: smaller;
+    content: " \ec03"; /* lookup code for "share-alt" in boxicons.css */
+}
+
 span.fancytree-node.fancytree-active-clone:not(.fancytree-active) .fancytree-title {
     font-weight: bold;
 }
@@ -228,11 +229,11 @@ span.fancytree-node.archived {
     opacity: 0.6;
 }
 
-.fancytree-node:hover .tn-icon.tree-item-button {
+.fancytree-node:hover .bx.tree-item-button {
     display: inline-block;
 }
 
-.tn-icon.tree-item-button {
+.bx.tree-item-button {
     display: none;
     font-size: 120%;
     cursor: pointer;
@@ -242,7 +243,7 @@ span.fancytree-node.archived {
     border-radius: 5px;
 }
 
-.unhoist-button.tn-icon.tree-item-button {
+.unhoist-button.bx.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

@@ -69,6 +69,24 @@ 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);
@@ -118,25 +136,5 @@ 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

@@ -223,6 +223,7 @@
     "backlink_other": ""
   },
   "note_icon": {
+    "category": "الفئة:",
     "search": "بحث:",
     "change_note_icon": "تغيير ايقونة الملاحظة",
     "reset-default": "اعادة تعيين الى الايقونة الافتراضية"
@@ -484,6 +485,7 @@
     "delete_button": "حذف",
     "download_button": "تنزيل",
     "restore_button": "أستعادة",
+    "preview": "معاينة:",
     "note_revisions": "مراجعات الملاحظة",
     "diff_on": "عرض الفروقات",
     "diff_off": "عرض المحتوى",

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

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

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

@@ -290,6 +290,7 @@
     "download_button": "下载",
     "mime": "MIME 类型： ",
     "file_size": "文件大小：",
+    "preview": "预览：",
     "preview_not_available": "无法预览此类型的笔记。",
     "diff_on": "显示差异",
     "diff_off": "显示内容",
@@ -763,15 +764,9 @@
   },
   "note_icon": {
     "change_note_icon": "更改笔记图标",
+    "category": "类别:",
     "search": "搜索:",
-    "reset-default": "重置为默认图标",
-    "search_placeholder_other": "在 {{count}} 个图标包中搜索 {{number}} 个图标",
-    "search_placeholder_filtered": "在 {{name}} 中搜索 {{number}} 个图标",
-    "filter": "筛选",
-    "filter-none": "所有图标",
-    "filter-default": "默认图标",
-    "icon_tooltip": "{{name}}\n图标包：{{iconPack}}",
-    "no_results": "没有找到图标。"
+    "reset-default": "重置为默认图标"
   },
   "basic_properties": {
     "note_type": "笔记类型",
@@ -798,8 +793,7 @@
     "expand_tooltip": "展开此集合的直接子代（单层深度）。点击右方箭头以查看更多选项。",
     "expand_first_level": "展开直接子代",
     "expand_nth_level": "展开 {{depth}} 层",
-    "expand_all_levels": "展开所有层级",
-    "hide_child_notes": "隐藏树中的子笔记"
+    "expand_all_levels": "展开所有层级"
   },
   "edited_notes": {
     "no_edited_notes_found": "今天还没有编辑过的笔记...",
@@ -1452,7 +1446,7 @@
     "will_be_deleted_in": "此附件将在 {{time}} 后自动删除",
     "will_be_deleted_soon": "该附件在不久后将被自动删除",
     "deletion_reason": "，因为该附件未链接在笔记的内容中。为防止被删除，请将附件链接重新添加到内容中或将附件转换为笔记。",
-    "role_and_size": "角色：{{role}}，大小：{{size}}，文件类型：{{- mimeType}}",
+    "role_and_size": "角色：{{role}}，大小：{{size}}",
     "link_copied": "附件链接已复制到剪贴板。",
     "unrecognized_role": "无法识别的附件角色 '{{role}}'。"
   },
@@ -1506,10 +1500,7 @@
     "duplicate": "复制",
     "open-in-popup": "快速编辑",
     "archive": "归档",
-    "unarchive": "解压",
-    "open-in-a-new-window": "在新窗口中打开",
-    "hide-subtree": "隐藏子树",
-    "show-subtree": "显示子树"
+    "unarchive": "解压"
   },
   "shared_info": {
     "help_link": "访问 <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a> 获取帮助。",
@@ -1598,15 +1589,7 @@
     "create-child-note": "创建子笔记",
     "unhoist": "取消聚焦",
     "toggle-sidebar": "切换侧边栏",
-    "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": "子笔记隐藏于此笔记的树中。"
+    "dropping-not-allowed": "不允许移动笔记到此处。"
   },
   "title_bar_buttons": {
     "window-on-top": "保持此窗口置顶"
@@ -2204,14 +2187,7 @@
     "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": "更改正在保存。"
+    "shared_unshare": "取消共享"
   },
   "status_bar": {
     "language_title": "更改内容语言",
@@ -2242,12 +2218,5 @@
   },
   "attributes_panel": {
     "title": "笔记属性"
-  },
-  "pdf": {
-    "attachments_other": "{{count}} 个附件",
-    "pages_other": "共{{count}}页",
-    "pages_alt": "第{{pageNumber}}页",
-    "pages_loading": "加载中...",
-    "layers_other": "{{count}} 层"
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "about": {
-    "title": "Über Trilium Notizen",
+    "title": "Über Trilium Notes",
     "homepage": "Startseite:",
     "app_version": "App-Version:",
     "db_version": "DB-Version:",
@@ -21,17 +21,8 @@
     },
     "bundle-error": {
       "title": "Benutzerdefiniertes Skript konnte nicht geladen werden",
-      "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": "Eine externe React Integration konnte nicht dargestellt werden"
-    },
-    "widget-missing-parent": "Der externen Integration fehlt die erforderliche Eigenschaft '{{property}}'\n\nFalls dieses Skript ohne UI-Element ausgeführt werden soll, benutze stattdessen '#run=frontendStartup'.",
-    "scripting-error": "Benutzerdefinierter Skriptfehler: {{title}}"
+      "message": "Skript aus der Notiz \"{{title}}\" mit der ID \"{{id}}\", konnte nicht ausgeführt werden wegen:\n\n{{message}}"
+    }
   },
   "add_link": {
     "add_link": "Link hinzufügen",
@@ -214,8 +205,7 @@
   "info": {
     "modalTitle": "Infonachricht",
     "closeButton": "Schließen",
-    "okButton": "OK",
-    "copy_to_clipboard": "In Zwischenablage kopieren"
+    "okButton": "OK"
   },
   "jump_to_note": {
     "search_button": "Suche im Volltext",
@@ -288,6 +278,7 @@
     "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",
@@ -698,13 +689,7 @@
     "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",
-    "export_as_image": "Als Bild exportieren",
-    "export_as_image_png": "PNG (Raster)",
-    "export_as_image_svg": "SVG (Vektor)",
-    "note_map": "Notizen Karte",
-    "view_revisions": "Änderungshistorie...",
-    "advanced": "Fortgeschritten"
+    "open_note_on_server": "Öffne Notiz auf dem Server"
   },
   "onclick_button": {
     "no_click_handler": "Das Schaltflächen-Widget „{{componentId}}“ hat keinen definierten Klick-Handler"
@@ -761,16 +746,9 @@
   },
   "note_icon": {
     "change_note_icon": "Notiz-Icon ändern",
+    "category": "Kategorie:",
     "search": "Suche:",
-    "reset-default": "Standard wiederherstellen",
-    "search_placeholder_one": "Suche {{number}} Icons über {{count}} Pakete",
-    "search_placeholder_other": "Suche {{number}} Icons ü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."
+    "reset-default": "Standard wiederherstellen"
   },
   "basic_properties": {
     "note_type": "Notiztyp",
@@ -797,8 +775,7 @@
     "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",
-    "hide_child_notes": "Unterknoten im Baum ausblenden"
+    "expand_nth_level": "{{depth}} Ebenen erweitern"
   },
   "edited_notes": {
     "no_edited_notes_found": "An diesem Tag wurden noch keine Notizen bearbeitet...",
@@ -811,7 +788,7 @@
     "file_type": "Dateityp",
     "file_size": "Dateigröße",
     "download": "Herunterladen",
-    "open": "Extern öffnen",
+    "open": "Offen",
     "upload_new_revision": "Neue Revision hochladen",
     "upload_success": "Neue Dateirevision wurde hochgeladen.",
     "upload_failed": "Das Hochladen einer neuen Dateirevision ist fehlgeschlagen.",
@@ -831,8 +808,7 @@
   },
   "inherited_attribute_list": {
     "title": "Geerbte Attribute",
-    "no_inherited_attributes": "Keine geerbten Attribute.",
-    "none": "Keine"
+    "no_inherited_attributes": "Keine geerbten Attribute."
   },
   "note_info_widget": {
     "note_id": "Notiz-ID",
@@ -843,9 +819,7 @@
     "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",
-    "mime": "MIME Typ",
-    "show_similar_notes": "Zeige ähnliche Notizen"
+    "title": "Notizinfo"
   },
   "note_map": {
     "open_full": "Vollständig erweitern",
@@ -908,8 +882,7 @@
     "search_parameters": "Suchparameter",
     "unknown_search_option": "Unbekannte Suchoption {{searchOptionName}}",
     "search_note_saved": "Suchnotiz wurde in {{-notePathTitle}} gespeichert",
-    "actions_executed": "Aktionen wurden ausgeführt.",
-    "view_options": "Optionen anzeigen:"
+    "actions_executed": "Aktionen wurden ausgeführt."
   },
   "similar_notes": {
     "title": "Ähnliche Notizen",
@@ -1013,12 +986,7 @@
   "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.",
-    "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"
+    "keeps-crashing": "Die Bearbeitungskomponente stürzt immer wieder ab. Bitte starten Sie Trilium neu. Wenn das Problem weiterhin besteht, erstellen Sie einen Fehlerbericht."
   },
   "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.",
@@ -1418,7 +1386,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}}, MIME: {{- mimeType}}",
+    "role_and_size": "Rolle: {{role}}, Größe: {{size}}",
     "link_copied": "Anhangslink in die Zwischenablage kopiert.",
     "unrecognized_role": "Unbekannte Anhangsrolle „{{role}}“."
   },
@@ -1469,13 +1437,10 @@
     "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? Diese Operation wird nur auf Bildnotizes angewandt. Andere Notizen werden übersprungen.",
+    "convert-to-attachment-confirm": "Bist du sicher, dass du die ausgewählten Notizen in Anhänge ihrer übergeordneten Notizen umwandeln möchtest?",
     "open-in-popup": "Schnellbearbeitung",
     "archive": "Archiviere",
-    "unarchive": "Entarchivieren",
-    "open-in-a-new-window": "In neuem Fenster öffnen",
-    "hide-subtree": "Teilbaum ausblenden",
-    "show-subtree": "Teilbaum anzeigen"
+    "unarchive": "Entarchivieren"
   },
   "shared_info": {
     "shared_publicly": "Diese Notiz ist öffentlich geteilt auf {{- link}}.",
@@ -1536,12 +1501,7 @@
   },
   "highlights_list_2": {
     "title": "Hervorhebungs-Liste",
-    "options": "Optionen",
-    "title_with_count_one": "{{count}} Highlight",
-    "title_with_count_other": "{{count}} Highlights",
-    "modal_title": "Highlight Liste konfigurieren",
-    "menu_configure": "Highlight Liste konfigurieren…",
-    "no_highlights": "Keine Highlights gefunden."
+    "options": "Optionen"
   },
   "quick-search": {
     "placeholder": "Schnellsuche",
@@ -1565,16 +1525,7 @@
     "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.",
-    "clone-indicator-tooltip": "Diese Notiz hat {{- count}} Elterknoten: {{- parents}}",
-    "clone-indicator-tooltip-single": "Diese Notiz ist geklont (1 weiterer Elternknoten: {{- parent}})",
-    "shared-indicator-tooltip": "Diese Notiz ist öffentlich einsehbar",
-    "shared-indicator-tooltip-with-url": "Diese Notiz ist unter {{- url}} öffentlich einsehbar",
-    "subtree-hidden-tooltip_one": "{{count}} Unterknoten, der im Baum ausgeblendet ist",
-    "subtree-hidden-tooltip_other": "{{count}} Unterknoten, die im Baum ausgeblendet sind",
-    "subtree-hidden-moved-title": "Zu {{title}} hinzugefügt",
-    "subtree-hidden-moved-description-collection": "Diese Sammlung blendet ihre Unternotizem im Baum aus.",
-    "subtree-hidden-moved-description-other": "Diese Sammlung blendet ihre Unterknoten im Baum aus."
+    "dropping-not-allowed": "Ablegen von Notizen an dieser Stelle ist nicht zulässig."
   },
   "title_bar_buttons": {
     "window-on-top": "Dieses Fenster immer oben halten"
@@ -1582,23 +1533,10 @@
   "note_detail": {
     "could_not_find_typewidget": "Konnte typeWidget für Typ ‚{{type}}‘ nicht finden",
     "printing": "Druckvorgang 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 ist oder geschützt ist.",
-    "print_report_collection_content_other": "{{count}} Notizen in der Sammlung konnten nicht gedruckt werden, weil sie nicht unterstützt sind oder geschützt sind."
+    "printing_pdf": "PDF-Export läuft…"
   },
   "note_title": {
-    "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": "Template",
-    "note_type_switcher_collection": "Sammlung",
-    "edited_notes": "Notizen, bearbeitet an diesem Tag",
-    "promoted_attributes": "Hervorgehobene Attribute"
+    "placeholder": "Titel der Notiz hier eingeben…"
   },
   "search_result": {
     "no_notes_found": "Es wurden keine Notizen mit den angegebenen Suchparametern gefunden.",
@@ -1627,8 +1565,7 @@
   },
   "toc": {
     "table_of_contents": "Inhaltsverzeichnis",
-    "options": "Optionen",
-    "no_headings": "Keine Überschriften."
+    "options": "Optionen"
   },
   "watched_file_update_status": {
     "file_last_modified": "Datei <code class=\"file-path\"></code> wurde zuletzt geändert am <span class=\"file-last-modified\"></span>.",
@@ -1740,8 +1677,7 @@
     "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_other_split": "Notiz in neuer Spalte öffnen"
+    "open_note_in_popup": "Schnellbearbeitung"
   },
   "electron_integration": {
     "desktop-application": "Desktop Anwendung",
@@ -2009,9 +1945,8 @@
     "unknown_widget": "Unbekanntes Widget für '{{id}}'."
   },
   "note_language": {
-    "not_set": "Keine Sprache ausgewählt",
-    "configure-languages": "Konfiguriere Sprachen...",
-    "help-on-languages": "Zu Übersetzungen beitragen..."
+    "not_set": "Nicht gesetzt",
+    "configure-languages": "Konfiguriere Sprachen..."
   },
   "content_language": {
     "title": "Inhaltssprachen",
@@ -2029,8 +1964,7 @@
     "button_title": "Exportiere Diagramm als PNG"
   },
   "svg": {
-    "export_to_png": "Das Diagramm konnte als PNG nicht exportiert werden.",
-    "export_to_svg": "Das Diagramm konnte nicht als SVG exportiert werden."
+    "export_to_png": "Das Diagramm konnte als PNG nicht exportiert werden."
   },
   "code_theme": {
     "title": "Aussehen",
@@ -2078,7 +2012,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)",
@@ -2131,20 +2065,14 @@
     "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_button": "Aktiviere Hintergrundeffekte",
-    "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"
+    "dismiss": "Ablehnen"
   },
   "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",
-    "ui": "Benutzeroberfläche",
-    "ui_old_layout": "Altes Layout",
-    "ui_new_layout": "Neues Layout"
+    "related_code_notes": "Farbschema für Code-Notizen"
   },
   "units": {
     "percentage": "%"
@@ -2176,92 +2104,5 @@
   },
   "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": "Bei der Kommunikation mit dem Server ist ein Fehler aufgetreten",
-    "unknown_http_error_content": "Statuscode: {{statusCode}}\nURL: {{method}} {{url}}\nNachricht: {{message}}",
-    "traefik_blocks_requests": "Der Traefik Reverse-Proxy hat ein fatales Update bekommen, welche die Kommunikation mit dem Server stört."
-  },
-  "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": "Nicht Änderbar",
-    "read_only_explicit_description": "Diese Notiz wurde händisch als nicht änderbar markiert.\nKlicke hier um sie temporär zu bearbeiten.",
-    "read_only_auto": "Automatisch nicht änderbar",
-    "read_only_auto_description": "Diese Notiz wurde automatisch aus Leistungsgründen als nicht änderbar 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 nicht änderbar. Sobald du zu einer anderen Notiz navigierst, kehrt diese Notiz in ihren Normalzustand zurück.\n\nKlicke hier, um die Notiz wieder nicht änderbar zu machen.",
-    "shared_publicly": "Öffentlich geteilt",
-    "shared_locally": "Lokal geteilt",
-    "shared_copy_to_clipboard": "Link in die Zwischenablage kopieren",
-    "shared_open_in_browser": "Link öffnen",
-    "shared_unshare": "Teilen aufheben",
-    "clipped_note": "Internetschnellverweis",
-    "clipped_note_description": "Diese Notiz wurde von {{url}} übernommen.\n\nKlicke hier, um zum Ursprung 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": "Speichern...",
-    "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 Applikation 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}} Eigenschaft",
-    "attributes_other": "{{count}} Eigenschaften",
-    "attributes_title": "Eigene und gererbte Eigenschaften",
-    "note_paths_one": "{{count}} Pfad",
-    "note_paths_other": "{{count}} Pfade",
-    "note_paths_title": "Notizpfade",
-    "code_note_switcher": "Sprachmodus ändern"
-  },
-  "attributes_panel": {
-    "title": "Notizeigenschaften"
-  },
-  "right_pane": {
-    "empty_message": "Für diese Notiz gibt es nichts anzuzeigen",
-    "empty_button": "Anzeige ausblenden",
-    "toggle": "Rechte Anzeige umschalten",
-    "custom_widget_go_to_source": "Zum Ursprungscode"
-  },
-  "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": "Laden..."
   }
 }

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

@@ -69,8 +69,5 @@
     "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

@@ -295,6 +295,7 @@
     "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": {
@@ -764,16 +765,9 @@
   },
   "note_icon": {
     "change_note_icon": "Change note icon",
+    "category": "Category:",
     "search": "Search:",
-    "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."
+    "reset-default": "Reset to default icon"
   },
   "basic_properties": {
     "note_type": "Note type",
@@ -800,8 +794,7 @@
     "geo-map": "Geo Map",
     "board": "Board",
     "presentation": "Presentation",
-    "include_archived_notes": "Show archived notes",
-    "hide_child_notes": "Hide child notes in tree"
+    "include_archived_notes": "Show archived notes"
   },
   "edited_notes": {
     "no_edited_notes_found": "No edited notes on this day yet...",
@@ -1620,7 +1613,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}}, MIME: {{- mimeType}}",
+    "role_and_size": "Role: {{role}}, Size: {{size}}",
     "link_copied": "Attachment link copied to clipboard.",
     "unrecognized_role": "Unrecognized attachment role '{{role}}'."
   },
@@ -1644,7 +1637,6 @@
   "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",
@@ -1657,8 +1649,6 @@
     "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",
@@ -1772,16 +1762,7 @@
     "create-child-note": "Create child note",
     "unhoist": "Unhoist",
     "toggle-sidebar": "Toggle sidebar",
-    "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."
+    "dropping-not-allowed": "Dropping notes into this location is not allowed."
   },
   "title_bar_buttons": {
     "window-on-top": "Keep Window on Top"
@@ -1815,11 +1796,7 @@
     "configure_launchbar": "Configure Launchbar"
   },
   "sql_result": {
-    "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"
+    "no_rows": "No rows have been returned for this query"
   },
   "sql_table_schemas": {
     "tables": "Tables"
@@ -2221,14 +2198,7 @@
     "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."
+    "execute_sql_description": "This note is a SQL note. Click to execute the SQL query."
   },
   "status_bar": {
     "language_title": "Change content language",
@@ -2257,15 +2227,5 @@
     "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..."
   }
 }

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

@@ -21,13 +21,7 @@
     },
     "bundle-error": {
       "title": "Hubo un fallo al cargar un script personalizado",
-      "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"
+      "message": "El script de la nota con ID \"{{id}}\", titulado \"{{title}}\" no pudo ser ejecutado debido a:\n\n{{message}}"
     }
   },
   "add_link": {
@@ -168,8 +162,7 @@
     "other": "Otro",
     "quickSearch": "centrarse en la entrada de búsqueda rápida",
     "inPageSearch": "búsqueda en la página",
-    "title": "Hoja de ayuda",
-    "editShortcuts": "Editar atajos de teclado"
+    "title": "Hoja de ayuda"
   },
   "import": {
     "importIntoNote": "Importar a nota",
@@ -286,6 +279,7 @@
     "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",
@@ -697,7 +691,7 @@
     "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 servidor"
+    "open_note_on_server": "Abrir nota en el servidor"
   },
   "onclick_button": {
     "no_click_handler": "El widget de botón '{{componentId}}' no tiene un controlador de clics definido"
@@ -743,7 +737,7 @@
   "zpetne_odkazy": {
     "relation": "relación",
     "backlink_one": "{{count}} Vínculo de retroceso",
-    "backlink_many": "{{count}} Vínculos de retroceso",
+    "backlink_many": "",
     "backlink_other": "{{count}} vínculos de retroceso"
   },
   "mobile_detail_menu": {
@@ -755,11 +749,9 @@
   },
   "note_icon": {
     "change_note_icon": "Cambiar icono de nota",
+    "category": "Categoría:",
     "search": "Búsqueda:",
-    "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"
+    "reset-default": "Restablecer a icono por defecto"
   },
   "basic_properties": {
     "note_type": "Tipo de nota",
@@ -799,7 +791,7 @@
     "file_type": "Tipo de archivo",
     "file_size": "Tamaño del archivo",
     "download": "Descargar",
-    "open": "Abrir externamente",
+    "open": "Abrir",
     "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.",
@@ -1312,11 +1304,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_note_syntax": "Notas de Código"
+    "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": "Combinaciones de teclas Vim",
+    "use_vim_keybindings_in_code_notes": "Atajos de teclas de Vim",
     "enable_vim_keybindings": "Habilitar los atajos de teclas de Vim en la notas de código (no es modo ex)"
   },
   "wrap_lines": {
@@ -1581,7 +1573,7 @@
     "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}}, MIME: {{- mimeType}}",
+    "role_and_size": "Rol: {{role}}, Tamaño: {{size}}",
     "link_copied": "Enlace del archivo adjunto copiado al portapapeles.",
     "unrecognized_role": "Rol de archivo adjunto no reconocido '{{role}}'."
   },
@@ -1632,7 +1624,7 @@
     "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? Esta operación solo aplica a notas de Imagen, otras notas serán omitidas.",
+    "convert-to-attachment-confirm": "¿Está seguro que desea convertir las notas seleccionadas en archivos adjuntos de sus notas padres?",
     "open-in-popup": "Edición rápida",
     "archive": "Archivar",
     "unarchive": "Desarchivar"
@@ -1727,10 +1719,7 @@
   "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..",
-    "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."
+    "printing_pdf": "Exportando a PDF en curso.."
   },
   "note_title": {
     "placeholder": "escriba el título de la nota aquí..."
@@ -1942,7 +1931,7 @@
     "unknown_widget": "Widget desconocido para \"{{id}}\"."
   },
   "note_language": {
-    "not_set": "Idioma no establecido",
+    "not_set": "No establecido",
     "configure-languages": "Configurar idiomas..."
   },
   "content_language": {
@@ -1981,7 +1970,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)",
@@ -2110,36 +2099,5 @@
     "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"
-  },
-  "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"
   }
 }

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

@@ -21,13 +21,7 @@
     },
     "bundle-error": {
       "title": "Echec du chargement d'un script personnalisé",
-      "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"
+      "message": "Le script de la note avec l'ID \"{{id}}\", intitulé \"{{title}}\" n'a pas pu être exécuté à cause de\n\n{{message}}"
     }
   },
   "add_link": {
@@ -285,6 +279,7 @@
     "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",
@@ -761,12 +756,9 @@
   },
   "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",
-    "filter": "Filtre",
-    "filter-none": "Toutes les icônes",
-    "filter-default": "Icônes par défaut",
-    "icon_tooltip": "{{name}}\nPack d'icônes : {{iconPack}}"
+    "reset-default": "Réinitialiser l'icône par défaut"
   },
   "basic_properties": {
     "note_type": "Type de note",
@@ -1550,8 +1542,7 @@
     "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",
-    "dropping-not-allowed": "Lâcher des notes à cet endroit n'est pas autorisé"
+    "toggle-sidebar": "Basculer la barre latérale"
   },
   "title_bar_buttons": {
     "window-on-top": "Épingler cette fenêtre au premier plan"
@@ -1559,19 +1550,10 @@
   "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...",
-    "print_report_title": "Imprimer le rapport",
-    "print_report_collection_details_button": "Consulter les détails",
-    "print_report_collection_details_ignored_notes": "Notes ignorées"
+    "printing_pdf": "Export au format PDF en cours..."
   },
   "note_title": {
-    "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"
+    "placeholder": "saisir le titre de la note ici..."
   },
   "search_result": {
     "no_notes_found": "Aucune note n'a été trouvée pour les paramètres de recherche donnés.",
@@ -1600,8 +1582,7 @@
   },
   "toc": {
     "table_of_contents": "Table des matières",
-    "options": "Options",
-    "no_headings": "Pas d'en-tête."
+    "options": "Options"
   },
   "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>.",
@@ -1702,8 +1683,7 @@
     "copy-link": "Copier le lien",
     "paste": "Coller",
     "paste-as-plain-text": "Coller comme texte brut",
-    "search_online": "Rechercher «{{term}}» avec {{searchEngine}}",
-    "search_in_trilium": "Rechercher \"{{term}}\" dans Trilium"
+    "search_online": "Rechercher «{{term}}» avec {{searchEngine}}"
   },
   "image_context_menu": {
     "copy_reference_to_clipboard": "Copier la référence dans le presse-papiers",
@@ -2012,8 +1992,7 @@
     "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",
-    "column-already-exists": "Cette colonne existe déjà dans le tableau."
+    "edit-column-title": "Cliquez pour modifier le titre de la colonne"
   },
   "presentation_view": {
     "edit-slide": "Modifier cette diapositive",
@@ -2097,8 +2076,7 @@
     "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_svg": "Le diagramme n'a pas pu être exporté en SVG."
+    "export_to_png": "Le diagramme n'a pas pu être exporté au format PNG."
   },
   "code_theme": {
     "title": "Apparence",
@@ -2131,10 +2109,6 @@
   },
   "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..."
+    "auto-read-only-note": "Cette note s'affiche en mode lecture seule pour un chargement plus rapide."
   }
 }

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

@@ -1,50 +1,5 @@
 {
   "about": {
-    "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": "नोट्स प्रिव्यू डिलीट करें"
+    "title": "ट्रिलियम नोट्स के बारें में"
   }
 }

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

@@ -21,13 +21,7 @@
     },
     "bundle-error": {
       "title": "Nem sikerült betölteni az egyéni szkriptet",
-      "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"
+      "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}}"
     }
   },
   "add_link": {

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

@@ -16,22 +16,13 @@
     },
     "bundle-error": {
       "title": "Non si è riusciti a caricare uno script personalizzato",
-      "message": "Impossibile eseguire lo script a causa di:\n\n{{message}}"
+      "message": "Lo script della nota con ID \"{{id}}\", dal titolo \"{{title}}\" non è stato inizializzato 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",
@@ -902,6 +893,7 @@
     "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": {
@@ -1341,17 +1333,9 @@
   },
   "note_icon": {
     "change_note_icon": "Cambia icona nota",
+    "category": "Categoria:",
     "search": "Ricerca:",
-    "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."
+    "reset-default": "Ripristina l'icona predefinita"
   },
   "basic_properties": {
     "note_type": "Tipo di nota",
@@ -1809,7 +1793,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}}, MIME: {{- mimeType}}",
+    "role_and_size": "Ruolo: {{role}}, Dimensione: {{size}}",
     "link_copied": "Link all'allegato copiato negli appunti.",
     "unrecognized_role": "Ruolo di allegato non riconosciuto '{{role}}'."
   },
@@ -1895,11 +1879,7 @@
     "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.",
-    "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}}"
+    "dropping-not-allowed": "Non è consentito lasciare appunti in questa posizione."
   },
   "title_bar_buttons": {
     "window-on-top": "Mantieni la finestra in primo piano"
@@ -1907,13 +1887,7 @@
   "note_detail": {
     "could_not_find_typewidget": "Impossibile trovare typeWidget per il tipo '{{type}}'",
     "printing": "Stampa 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"
+    "printing_pdf": "Esportazione in PDF in corso..."
   },
   "note_title": {
     "placeholder": "scrivi qui il titolo della nota...",
@@ -1923,8 +1897,7 @@
     "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"
+    "edited_notes": "Note modificate"
   },
   "search_result": {
     "no_notes_found": "Non sono state trovate note per i parametri di ricerca specificati.",
@@ -2204,14 +2177,7 @@
     "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."
+    "shared_unshare": "Rimuovi condivisione"
   },
   "breadcrumb": {
     "workspace_badge": "Area di lavoro",
@@ -2254,18 +2220,5 @@
     "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..."
   }
 }

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

@@ -152,22 +152,16 @@
   },
   "note_icon": {
     "change_note_icon": "ノートアイコンの変更",
+    "category": "カテゴリー:",
     "search": "検索:",
-    "reset-default": "アイコンをデフォルトに戻す",
-    "search_placeholder_other": "{{count}} 個のパックから {{number}} 個のアイコンを検索",
-    "search_placeholder_filtered": "{{name}} で {{number}} 個のアイコンを検索",
-    "filter": "フィルター",
-    "filter-none": "すべてのアイコン",
-    "filter-default": "デフォルトアイコン",
-    "icon_tooltip": "{{name}}\nアイコンパック: {{iconPack}}",
-    "no_results": "アイコンが見つかりません。"
+    "reset-default": "アイコンをデフォルトに戻す"
   },
   "basic_properties": {
     "note_type": "ノートタイプ",
     "editable": "編集可能",
     "basic_properties": "基本プロパティ",
     "language": "言語",
-    "configure_code_notes": "コードノートを設定..."
+    "configure_code_notes": "コードノートを設定しています..."
   },
   "i18n": {
     "title": "ローカライゼーション",
@@ -443,10 +437,7 @@
     "unhoist-note": "ノートのホイストを解除",
     "edit-branch-prefix": "ブランチの接頭辞を編集",
     "archive": "アーカイブ",
-    "unarchive": "アーカイブ解除",
-    "open-in-a-new-window": "新しいウィンドウで開く",
-    "hide-subtree": "サブツリーを非表示",
-    "show-subtree": "サブツリーを表示"
+    "unarchive": "アーカイブ解除"
   },
   "zen_mode": {
     "button_exit": "禅モードを退出"
@@ -571,8 +562,7 @@
     "expand_tooltip": "このコレクションの直下の子（1階層下）を展開します。その他のオプションについては、右側の矢印を押してください。",
     "expand_first_level": "直下の子を展開",
     "expand_nth_level": "{{depth}} 階層下まで展開",
-    "expand_all_levels": "すべての階層を展開",
-    "hide_child_notes": "ツリー内の子ノートを非表示"
+    "expand_all_levels": "すべての階層を展開"
   },
   "note_types": {
     "geo-map": "ジオマップ",
@@ -658,6 +648,7 @@
     "revision_deleted": "ノートの変更履歴は削除されました。",
     "settings": "ノートの変更履歴の設定",
     "file_size": "ファイルサイズ:",
+    "preview": "プレビュー:",
     "preview_not_available": "このノートタイプではプレビューは利用できません。",
     "diff_on": "差分を表示",
     "diff_off": "内容を表示",
@@ -1248,15 +1239,7 @@
     "saved-search-note-refreshed": "保存した検索ノートが更新されました。",
     "refresh-saved-search-results": "保存した検索結果を更新",
     "toggle-sidebar": "サイドバーを切り替え",
-    "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": "このノートのツリーでは子ノートは非表示になっています。"
+    "dropping-not-allowed": "この場所にノートをドロップすることはできません。"
   },
   "bulk_actions": {
     "bulk_actions": "一括操作",
@@ -2147,7 +2130,7 @@
     "will_be_deleted_in": "この添付ファイルは {{time}} 後に自動的に削除されます",
     "will_be_deleted_soon": "この添付ファイルはすぐに自動的に削除されます",
     "deletion_reason": "、添付ファイルがノートのコンテンツにリンクされていないためです。削除されないようにするには、添付ファイルのリンクをコンテンツに再度追加するか、添付ファイルをノートに変換してください。",
-    "role_and_size": "ロール: {{role}},サイズ: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "ロール: {{role}},サイズ: {{size}}",
     "link_copied": "添付ファイルのリンクをクリップボードにコピーしました。",
     "unrecognized_role": "添付ファイルのロール「{{role}}」は認識されません。"
   },
@@ -2204,14 +2187,7 @@
     "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": "ノートの保存中にエラーが発生しました。可能であれば、ノートの内容を別の場所にコピーして、アプリケーションを再読み込みしてください。"
+    "shared_unshare": "共有を削除"
   },
   "status_bar": {
     "language_title": "コンテンツの言語を変更",
@@ -2242,12 +2218,5 @@
   },
   "attributes_panel": {
     "title": "ノート属性"
-  },
-  "pdf": {
-    "attachments_other": "{{count}} 添付ファイル",
-    "layers_other": "{{count}} 層",
-    "pages_other": "{{count}} ページ",
-    "pages_alt": "ページ {{pageNumber}}",
-    "pages_loading": "読み込み中..."
   }
 }

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

@@ -1,82 +1 @@
-{
-  "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 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."
+      "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."
     },
     "widget-error": {
       "title": "Starten widget mislukt",
@@ -22,16 +22,7 @@
     "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",
@@ -50,8 +41,7 @@
     "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.",
-    "affected_branches": "Aangetaste takken ({{count}}):"
+    "branch_prefix_saved_multiple": "Vertakkingsvoorvoegsel opgeslagen voor {{count}} vertakkingen."
   },
   "bulk_actions": {
     "bulk_actions": "Bulk acties",
@@ -64,8 +54,7 @@
     "labels": "Labels",
     "relations": "Relaties",
     "notes": "Notities",
-    "other": "Andere",
-    "include_descendants": "Tel afstammelingen van de geselecteerde notities mee"
+    "other": "Andere"
   },
   "calendar": {
     "april": "April",
@@ -89,35 +78,5 @@
   },
   "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/pl/translation.json

@@ -959,6 +959,7 @@
     "download_button": "Pobierz",
     "mime": "MIME: ",
     "file_size": "Rozmiar pliku:",
+    "preview": "Podgląd:",
     "preview_not_available": "Podgląd nie jest dostępny dla tego typu notatki."
   },
   "sort_child_notes": {
@@ -1285,6 +1286,7 @@
   },
   "note_icon": {
     "change_note_icon": "Zmień ikonę notatki",
+    "category": "Kategoria:",
     "search": "Szukaj:",
     "reset-default": "Przywróć domyślną ikonę"
   },

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

@@ -22,16 +22,7 @@
     "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",
@@ -48,10 +39,7 @@
     "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.",
-    "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:"
+    "branch_prefix_saved": "O prefixo de ramificação foi gravado."
   },
   "bulk_actions": {
     "bulk_actions": "Ações em massa",
@@ -116,8 +104,7 @@
     "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.",
-    "share-format": "HTML para publicação web - usa o mesmo tema que é usado para notas partilhadas, mas pode ser publicado como um site estatico."
+    "format_pdf": "PDF – para impressão ou compartilhamento."
   },
   "help": {
     "title": "Folha de Dicas",
@@ -171,8 +158,7 @@
     "showSQLConsole": "mostrar console SQL",
     "other": "Outros",
     "quickSearch": "focar no campo de pesquisa rápida",
-    "inPageSearch": "pesquisa na página",
-    "editShortcuts": "Editar atalhos do teclado"
+    "inPageSearch": "pesquisa na página"
   },
   "import": {
     "importIntoNote": "Importar para a nota",
@@ -198,8 +184,7 @@
     },
     "import-status": "Estado da importação",
     "in-progress": "Importação em andamento: {{progress}}",
-    "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."
+    "successful": "Importação concluída com sucesso."
   },
   "include_note": {
     "dialog_title": "Incluir nota",
@@ -214,8 +199,7 @@
   "info": {
     "modalTitle": "Mensagem informativa",
     "closeButton": "Fechar",
-    "okButton": "OK",
-    "copy_to_clipboard": "Copiar para a área de transferência"
+    "okButton": "OK"
   },
   "jump_to_note": {
     "search_placeholder": "Pesquise uma nota pelo nome ou digite > para comandos...",
@@ -290,12 +274,8 @@
     "download_button": "Descarregar",
     "mime": "MIME: ",
     "file_size": "Tamanho do ficheiro:",
-    "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."
+    "preview": "Visualizar:",
+    "preview_not_available": "A visualização não está disponível para este tipo de nota."
   },
   "sort_child_notes": {
     "sort_children_by": "Ordenar notas filhas por...",
@@ -606,18 +586,7 @@
     "september": "Setembro",
     "october": "Outubro",
     "november": "Novembro",
-    "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"
+    "december": "Dezembro"
   },
   "close_pane_button": {
     "close_this_pane": "Fechar este painel"
@@ -660,9 +629,7 @@
     "about": "Sobre o Trilium Notes",
     "logout": "Sair",
     "show-cheatsheet": "Exibir Cheatsheet",
-    "toggle-zen-mode": "Modo Zen",
-    "new-version-available": "Nova actualização disponível",
-    "download-update": "Obter versão {{latestVersion}}"
+    "toggle-zen-mode": "Modo Zen"
   },
   "zen_mode": {
     "button_exit": "Sair do Modo Zen"
@@ -700,14 +667,7 @@
     "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…",
-    "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)"
+    "print_pdf": "Exportar como PDF…"
   },
   "onclick_button": {
     "no_click_handler": "Componente de botão '{{componentId}}' não possui manipulador de clique definido"
@@ -753,29 +713,20 @@
   "zpetne_odkazy": {
     "relation": "relação",
     "backlink_one": "{{count}} Ligação Reversa",
-    "backlink_many": "{{count}} Ligações Reversas",
+    "backlink_many": "",
     "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}}",
-    "note_revisions": "Revisões da nota"
+    "error_unrecognized_command": "Comando não reconhecido {{command}}"
   },
   "note_icon": {
     "change_note_icon": "Alterar ícone da nota",
+    "category": "Categoria:",
     "search": "Pesquisa:",
-    "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"
+    "reset-default": "Redefinir para o ícone padrão"
   },
   "basic_properties": {
     "note_type": "Tipo da nota",
@@ -796,14 +747,7 @@
     "calendar": "Calendário",
     "table": "Tabela",
     "geo-map": "Mapa geográfico",
-    "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"
+    "board": "Quadro"
   },
   "edited_notes": {
     "no_edited_notes_found": "Ainda não há nenhuma nota editada neste dia…",
@@ -836,8 +780,7 @@
   },
   "inherited_attribute_list": {
     "title": "Atributos Herdados",
-    "no_inherited_attributes": "Nenhum atributo herdado.",
-    "none": "Nenhum"
+    "no_inherited_attributes": "Nenhum atributo herdado."
   },
   "note_info_widget": {
     "note_id": "ID da Nota",
@@ -848,9 +791,7 @@
     "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",
-    "mime": "Tipo MIME",
-    "show_similar_notes": "Mostrar notas semelhantes"
+    "title": "Informações da nota"
   },
   "note_map": {
     "open_full": "Expandir completamente",
@@ -913,8 +854,7 @@
     "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.",
-    "view_options": "Ver opções:"
+    "actions_executed": "As ações foram executadas."
   },
   "similar_notes": {
     "title": "Notas Similares",
@@ -1008,22 +948,14 @@
     "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.",
-    "drag_locked_title": "Bloqueado para edição",
-    "drag_locked_message": "Arrastar não permitida pois a coleção está bloqueada para edição."
+    "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."
   },
   "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",
-    "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."
+    "auto-detect-language": "Detetado automaticamente"
   },
   "empty": {
     "open_note_instruction": "Abra uma nota a digitar o título da nota no campo abaixo ou escolha uma nota na árvore.",
@@ -1151,8 +1083,7 @@
     "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",
-    "centerContent": "Manter conteúdo centrado"
+    "max_width_unit": "pixels"
   },
   "native_title_bar": {
     "title": "Barra de Título Nativa (requer recarregar a app)",
@@ -1184,9 +1115,7 @@
     "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-smooth-scroll": "Activar deslocamento suave",
-    "app-restart-required": "(é necessário reiniciar a aplicação para aplicar as alterações)"
+    "enable-backdrop-effects": "Ativar efeitos de fundo para menus, popups e painéis"
   },
   "ai_llm": {
     "not_started": "Não iniciado",
@@ -1345,10 +1274,7 @@
     "title": "Editor"
   },
   "code_mime_types": {
-    "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"
+    "title": "Tipos MIME disponíveis no dropdown"
   },
   "vim_key_bindings": {
     "use_vim_keybindings_in_code_notes": "Atribuições de teclas do Vim",
@@ -1468,13 +1394,7 @@
     "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",
-    "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"
+    "formatting-locale": "Formato de data e número"
   },
   "backup": {
     "automatic_backup": "Backup automático",
@@ -1567,8 +1487,7 @@
     "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_missing_vars": "Configurações em falta: {{-variables}}"
+    "oauth_user_not_logged_in": "Não está logado!"
   },
   "shortcuts": {
     "keyboard_shortcuts": "Atalhos de Teclado",
@@ -1668,12 +1587,7 @@
     "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-a-new-window": "Abrir numa nova janela",
-    "archive": "Arquivar",
-    "unarchive": "Retirar do arquivo",
-    "hide-subtree": "Esconder sub-árvore",
-    "show-subtree": "Mostrar sub-árvore"
+    "open-in-popup": "Edição rápida"
   },
   "shared_info": {
     "shared_publicly": "Esta nota é partilhada publicamente em {{- link}}.",
@@ -1734,13 +1648,7 @@
   },
   "highlights_list_2": {
     "title": "Lista de Destaques",
-    "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"
+    "options": "Opções"
   },
   "quick-search": {
     "placeholder": "Pesquisa rápida",
@@ -1763,43 +1671,16 @@
     "refresh-saved-search-results": "Atualizar resultados de pesquisa gravados",
     "create-child-note": "Criar nota filha",
     "unhoist": "Desafixar",
-    "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}})"
+    "toggle-sidebar": "Alternar barra lateral"
   },
   "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}}'",
-    "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."
+    "could_not_find_typewidget": "Não foi possível encontrar typeWidget para o tipo '{{type}}'"
   },
   "note_title": {
-    "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"
+    "placeholder": "digite o título da nota aqui..."
   },
   "search_result": {
     "no_notes_found": "Nenhuma nota encontrada para os parâmetros de pesquisa digitados.",
@@ -1828,8 +1709,7 @@
   },
   "toc": {
     "table_of_contents": "Tabela de Conteúdos",
-    "options": "Opções",
-    "no_headings": "Sem cabeçalhos."
+    "options": "Opções"
   },
   "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>.",
@@ -1872,9 +1752,7 @@
   "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.",
-    "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."
+    "encountered-error": "Encontrado o erro \"{{message}}\", verifique o console."
   },
   "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?"
@@ -1930,8 +1808,7 @@
     "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_in_trilium": "A procurar \"{{term}}\" no Trilium"
+    "search_online": "Pesquisar por \"{{term}}\" com {{searchEngine}}"
   },
   "image_context_menu": {
     "copy_reference_to_clipboard": "Copiar referência para a área de transferência",
@@ -1941,8 +1818,7 @@
     "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_other_split": "Abrir nota noutro separador"
+    "open_note_in_popup": "Edição rápida"
   },
   "electron_integration": {
     "desktop-application": "Aplicação Desktop",
@@ -1950,8 +1826,7 @@
     "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",
-    "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."
+    "zoom-factor": "Fator de Zoom"
   },
   "note_autocomplete": {
     "search-for": "Pesquisar por \"{{term}}\"",
@@ -2011,8 +1886,7 @@
   },
   "note_language": {
     "not_set": "Não atribuído",
-    "configure-languages": "Configurar idiomas...",
-    "help-on-languages": "Ajuda nas linguagens de conteúdos..."
+    "configure-languages": "Configurar idiomas..."
   },
   "content_language": {
     "title": "Idiomas do conteúdo",
@@ -2030,8 +1904,7 @@
     "button_title": "Exportar diagrama como PNG"
   },
   "svg": {
-    "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."
+    "export_to_png": "O diagrama não pôde ser exportado como PNG."
   },
   "code_theme": {
     "title": "Aparência",
@@ -2050,11 +1923,7 @@
   "editorfeatures": {
     "title": "Recursos",
     "emoji_completion_enabled": "Ativar auto-completar de Emoji",
-    "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 `/`."
+    "note_completion_enabled": "Ativar auto-completar de notas"
   },
   "table_view": {
     "new-row": "Nova linha",
@@ -2096,16 +1965,7 @@
     "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",
-    "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."
+    "add-column": "Adicionar Coluna"
   },
   "command_palette": {
     "tree-action-name": "Árvore: {{name}}",
@@ -2136,146 +1996,16 @@
     "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",
-    "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."
+    "dismiss": "Dispensar"
   },
   "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",
-    "ui": "Interface do utilizador",
-    "ui_old_layout": "Layout antigo",
-    "ui_new_layout": "Nova aparência"
+    "related_code_notes": "Esquema de cores para notas de código"
   },
   "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

@@ -439,6 +439,7 @@
     "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",
@@ -1007,6 +1008,7 @@
   },
   "note_icon": {
     "change_note_icon": "Alterar ícone da nota",
+    "category": "Categoria:",
     "search": "Busca:",
     "reset-default": "Redefinir para o ícone padrão"
   },

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

@@ -1103,6 +1103,7 @@
     "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ă.",
@@ -1482,6 +1483,7 @@
   },
   "note_icon": {
     "change_note_icon": "Schimbă iconița notiței",
+    "category": "Categorie:",
     "reset-default": "Resetează la iconița implicită",
     "search": "Căutare:"
   },

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

@@ -387,6 +387,7 @@
     "revision_deleted": "Версия заметки была удалена.",
     "download_button": "Скачать",
     "file_size": "Размер файла:",
+    "preview": "Предпросмотр:",
     "preview_not_available": "Предпосмотр недоступен для заметки этого типа.",
     "mime": "MIME: ",
     "settings": "Настройка версионирования заметок",
@@ -1009,18 +1010,10 @@
     "backlink_many": "{{count}} обратных ссылок"
   },
   "note_icon": {
+    "category": "Категория:",
     "search": "Поиск:",
     "change_note_icon": "Изменить иконку заметки",
-    "reset-default": "Сбросить к значку по умолчанию",
-    "no_results": "Иконки не найдены.",
-    "icon_tooltip": "{{name}}\nНабор иконок: {{iconPack}}",
-    "filter-default": "Иконки по-умолчанию",
-    "filter-none": "Все иконки",
-    "filter": "Фильтр",
-    "search_placeholder_filtered": "Поиск {{number}} иконок в {{name}}",
-    "search_placeholder_one": "Поиск {{number}} иконки среди {{count}} наборов",
-    "search_placeholder_few": "Поиск {{number}} иконок среди {{count}} наборов",
-    "search_placeholder_many": "Поиск {{number}} иконок среди {{count}} наборов"
+    "reset-default": "Сбросить к значку по умолчанию"
   },
   "basic_properties": {
     "editable": "Изменяемое",
@@ -2033,7 +2026,7 @@
     "lost-websocket-connection-message": "Проверьте конфигурацию обратного прокси (например, nginx или Apache), чтобы убедиться, что соединения WebSocket должным образом разрешены и не заблокированы."
   },
   "attachment_detail_2": {
-    "role_and_size": "Роль: {{role}}, размер: {{size}}, MIME: {{- mimeType}}",
+    "role_and_size": "Роль: {{role}}, Размер: {{size}}",
     "unrecognized_role": "Нераспознанная роль вложения '{{role}}'.",
     "link_copied": "Ссылка на вложение скопирована в буфер обмена.",
     "will_be_deleted_soon": "Это вложение скоро будет автоматически удалено",

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

@@ -271,6 +271,7 @@
     "download_button": "Preuzmi",
     "mime": "MIME: ",
     "file_size": "Veličina datoteke:",
+    "preview": "Pregled:",
     "preview_not_available": "Pregled nije dostupan za ovaj tip beleške."
   },
   "sort_child_notes": {

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

@@ -21,7 +21,7 @@
     },
     "bundle-error": {
       "title": "載入自訂腳本失敗",
-      "message": "腳本因以下原因無法執行：\n\n{{message}}"
+      "message": "來自 ID 為 \"{{id}}\"、標題為 \"{{title}}\" 的筆記的腳本因以下原因無法執行：\n\n{{message}}"
     },
     "widget-list-error": {
       "title": "無法從伺服器取得元件清單"
@@ -29,9 +29,8 @@
     "widget-render-error": {
       "title": "無法渲染自訂 React 元件"
     },
-    "widget-missing-parent": "自訂元件未定義強制性的 \"{{property}}\" 屬性。\n\n若此腳本需在無 UI 的情況下執行，請改用 \"#run=frontendStartup\"。",
-    "open-script-note": "打開腳本筆記",
-    "scripting-error": "自訂腳本錯誤：{{title}}"
+    "widget-missing-parent": "自訂元件未定義強制性的 \"{{property}}\" 屬性。",
+    "open-script-note": "打開腳本筆記"
   },
   "add_link": {
     "add_link": "新增連結",
@@ -288,6 +287,7 @@
     "download_button": "下載",
     "mime": "MIME類型： ",
     "file_size": "檔案大小：",
+    "preview": "預覽：",
     "preview_not_available": "無法預覽此類型的筆記。",
     "restore_button": "還原",
     "delete_button": "刪除",
@@ -761,16 +761,9 @@
   },
   "note_icon": {
     "change_note_icon": "更改筆記圖標",
+    "category": "類別：",
     "search": "搜尋：",
-    "reset-default": "重置為預設圖標",
-    "search_placeholder_one": "在 {{count}} 個圖示包中搜尋 {{number}} 個圖示",
-    "search_placeholder_other": "",
-    "search_placeholder_filtered": "在 {{name}} 中搜尋 {{number}} 個圖示",
-    "filter": "篩選",
-    "filter-none": "所有圖示",
-    "filter-default": "預設圖示",
-    "icon_tooltip": "{{name}}\n圖示包：{{iconPack}}",
-    "no_results": "找不到圖示。"
+    "reset-default": "重置為預設圖標"
   },
   "basic_properties": {
     "note_type": "筆記類型",
@@ -797,8 +790,7 @@
     "expand_tooltip": "展開此集合的直接子級（單層深度）。按下右側箭頭以查看更多選項。",
     "expand_first_level": "展開直接子級",
     "expand_nth_level": "展開 {{depth}} 層",
-    "expand_all_levels": "展開所有層級",
-    "hide_child_notes": "隱藏樹中的子筆記"
+    "expand_all_levels": "展開所有層級"
   },
   "edited_notes": {
     "no_edited_notes_found": "今天還沒有編輯過的筆記...",
@@ -1413,7 +1405,7 @@
     "will_be_deleted_in": "此附件將在 {{time}} 後自動刪除",
     "will_be_deleted_soon": "該附件即將被自動刪除",
     "deletion_reason": "，因為該附件未連結在筆記的內容中。為防止被刪除，請將附件連結重新新增至內容中或將附件轉換為筆記。",
-    "role_and_size": "角色：{{role}}，大小：{{size}}，MIME：{{- mimeType}}",
+    "role_and_size": "角色：{{role}}，大小：{{size}}",
     "link_copied": "已複製附件連結到剪貼簿。",
     "unrecognized_role": "無法識別的附件角色 '{{role}}'。"
   },
@@ -1467,10 +1459,7 @@
     "duplicate": "複製副本",
     "open-in-popup": "快速編輯",
     "archive": "封存",
-    "unarchive": "解除封存",
-    "open-in-a-new-window": "在新視窗打開",
-    "hide-subtree": "隱藏子階層",
-    "show-subtree": "顯示子階層"
+    "unarchive": "解除封存"
   },
   "shared_info": {
     "help_link": "如需幫助，請訪問 <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a>。",
@@ -1560,15 +1549,7 @@
     "create-child-note": "建立子筆記",
     "unhoist": "取消聚焦",
     "toggle-sidebar": "切換側邊欄",
-    "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_one": "從樹中隱藏的 {{count}} 篇子筆記",
-    "subtree-hidden-moved-title": "已新增至 {{title}}",
-    "subtree-hidden-moved-description-collection": "此集合隱藏其樹中的子筆記。",
-    "subtree-hidden-moved-description-other": "子筆記隱藏於此筆記的樹中。"
+    "dropping-not-allowed": "不允許移動筆記至此處。"
   },
   "title_bar_buttons": {
     "window-on-top": "保持此視窗置頂"
@@ -1576,12 +1557,7 @@
   "note_detail": {
     "could_not_find_typewidget": "找不到類型為 '{{type}}' 的 typeWidget",
     "printing": "正在列印…",
-    "printing_pdf": "正在匯出為 PDF…",
-    "print_report_title": "列印報告",
-    "print_report_collection_content_one": "集合中的 {{count}} 篇筆記無法列印，因為它們不被支援或受到保護。",
-    "print_report_collection_content_other": "",
-    "print_report_collection_details_button": "查看詳情",
-    "print_report_collection_details_ignored_notes": "忽略的筆記"
+    "printing_pdf": "正在匯出為 PDF…"
   },
   "note_title": {
     "placeholder": "請輸入筆記標題...",
@@ -1591,8 +1567,7 @@
     "note_type_switcher_others": "其他筆記類型",
     "note_type_switcher_templates": "模板",
     "note_type_switcher_collection": "集合",
-    "edited_notes": "今天編輯過的筆記",
-    "promoted_attributes": "升級屬性"
+    "edited_notes": "編輯過的筆記"
   },
   "search_result": {
     "no_notes_found": "沒有找到符合搜尋條件的筆記。",
@@ -2208,14 +2183,7 @@
     "read_only_temporarily_disabled_description": "此筆記目前可編輯，但通常為唯讀狀態。當您切換至其他筆記時，本筆記將立即恢復為唯讀模式。\n\n點擊此處重新啟用唯讀模式。",
     "clipped_note_description": "本筆記原始來源為 {{url}}。\n\n點擊此處前往原網頁。",
     "execute_script_description": "此筆記為腳本筆記。點擊以執行腳本。",
-    "execute_sql_description": "此筆記為 SQL 筆記。點擊以執行 SQL 查詢。",
-    "save_status_saved": "已儲存",
-    "save_status_saving": "正在儲存…",
-    "save_status_unsaved": "未儲存",
-    "save_status_error": "儲存失敗",
-    "save_status_saving_tooltip": "正在儲存更動。",
-    "save_status_unsaved_tooltip": "仍有更動尚未儲存。它們將在稍後自動儲存。",
-    "save_status_error_tooltip": "在儲存筆記時發生錯誤。如果可以，請嘗試將筆記內容複製至他處並重新載入應用程式。"
+    "execute_sql_description": "此筆記為 SQL 筆記。點擊以執行 SQL 查詢。"
   },
   "breadcrumb": {
     "hoisted_badge": "聚焦",
@@ -2252,15 +2220,5 @@
   },
   "attributes_panel": {
     "title": "筆記屬性"
-  },
-  "pdf": {
-    "attachments_one": "{{count}} 個附件",
-    "attachments_other": "",
-    "layers_one": "{{count}} 層",
-    "layers_other": "",
-    "pages_one": "共 {{count}} 頁",
-    "pages_other": "",
-    "pages_alt": "第 {{pageNumber}} 頁",
-    "pages_loading": "正在載入…"
   }
 }

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

@@ -321,6 +321,7 @@
     "download_button": "Завантажити",
     "mime": "МІМЕ: ",
     "file_size": "Розмір файлу:",
+    "preview": "Попередній перегляд:",
     "preview_not_available": "Попередній перегляд недоступний для цього типу нотатки.",
     "diff_on": "Показати різницю",
     "diff_off": "Показати вміст",
@@ -848,6 +849,7 @@
   },
   "note_icon": {
     "change_note_icon": "Змінити значок нотатки",
+    "category": "Категорія:",
     "search": "Пошук:",
     "reset-default": "Скинути значок до стандартного значення"
   },

apps/client/src/types-assets.d.ts

@@ -17,3 +17,5 @@ declare module "*?raw" {
     var content: string;
     export default content;
 }
+
+declare module "boxicons/css/boxicons.min.css" { }

apps/client/src/types-fancytree.d.ts

@@ -69,7 +69,7 @@ declare namespace Fancytree {
         debug(msg: any): void;
 
         /** Expand (or collapse) all parent nodes. */
-        expandAll(flag?: boolean, options?: object): void;
+        expandAll(flag?: boolean, options?: Object): void;
 
         /** [ext-filter] Dimm or hide whole branches.
          * @returns {integer} count
@@ -221,7 +221,6 @@ declare namespace Fancytree {
         branchId: string;
         isProtected: boolean;
         noteType: NoteType;
-        subtreeHidden: boolean;
     }
 
     interface FancytreeNewNode extends FancytreeNodeData {
@@ -370,7 +369,7 @@ declare namespace Fancytree {
          * @param mode 'before', 'after', or 'child' (default='child')
          * @param init NodeData (or simple title string)
          */
-        editCreateNode(mode?: string, init?: object): void;
+        editCreateNode(mode?: string, init?: Object): void;
 
         /** [ext-edit] Stop inline editing.
          *
@@ -527,7 +526,7 @@ declare namespace Fancytree {
          *
          * @param opts passed to `setExpanded()`. Defaults to {noAnimation: false, noEvents: false, scrollIntoView: true}
          */
-        makeVisible(opts?: object): JQueryPromise<any>;
+        makeVisible(opts?: Object): JQueryPromise<any>;
 
         /** Move this node to targetNode.
          *
@@ -590,25 +589,25 @@ declare namespace Fancytree {
          * @param effects animation options.
          * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
          */
-        scrollIntoView(effects?: boolean, options?: object): JQueryPromise<any>;
+        scrollIntoView(effects?: boolean, options?: Object): JQueryPromise<any>;
 
         /**
          * @param effects animation options.
          * @param options {topNode: null, effects: ..., parent: ...} this node will remain visible in any case, even if `this` is outside the scroll pane.
          */
-        scrollIntoView(effects?: object, options?: object): JQueryPromise<any>;
+        scrollIntoView(effects?: Object, options?: Object): JQueryPromise<any>;
 
         /**
          * @param flag pass false to deactivate
          * @param opts additional options. Defaults to {noEvents: false}
          */
-        setActive(flag?: boolean, opts?: object): JQueryPromise<any>;
+        setActive(flag?: boolean, opts?: Object): JQueryPromise<any>;
 
         /**
          * @param flag pass false to collapse.
          * @param opts additional options. Defaults to {noAnimation:false, noEvents:false}
          */
-        setExpanded(flag?: boolean, opts?: object): JQueryPromise<any>;
+        setExpanded(flag?: boolean, opts?: Object): JQueryPromise<any>;
 
         /**
          * Set keyboard focus to this node.
@@ -1110,7 +1109,7 @@ declare namespace Fancytree {
         /** class names added to the node markup (separate with space) */
         extraClasses?: string | undefined;
         /** all properties from will be copied to `node.data` */
-        data?: object | undefined;
+        data?: Object | undefined;
 
         /** Will be added as title attribute of the node's icon span,thus enabling a tooltip. */
         iconTooltip?: string | undefined;
@@ -1161,7 +1160,7 @@ declare namespace Fancytree {
 
         escapeHtml(s: string): string;
 
-        getEventTarget(event: Event): object;
+        getEventTarget(event: Event): Object;
 
         getEventTargetType(event: Event): string;
 
@@ -1180,7 +1179,7 @@ declare namespace Fancytree {
         parseHtml($ul: JQuery): NodeData[];
 
         /** Add Fancytree extension definition to the list of globally available extensions. */
-        registerExtension(definition: object): void;
+        registerExtension(definition: Object): void;
 
         unescapeHtml(s: string): string;
 

apps/client/src/types-pdfjs.d.ts

@@ -1,121 +0,0 @@
-type HistoryData = {
-    files: {
-        fingerprint: string;
-        page: number;
-        zoom: string;
-        scrollLeft: number;
-        scrollTop: number;
-        rotation: number;
-        sidebarView: number;
-    }[];
-};
-
-interface Window {
-    /**
-     * By default, pdf.js will try to store information about the opened PDFs such as zoom and scroll position in local storage.
-     * The Trilium alternative is to use attachments stored at note level.
-     * This variable represents the direct content used by the pdf.js viewer in its local storage key, but in plain JS object format.
-     * The variable must be set early at startup, before pdf.js fully initializes.
-     */
-    TRILIUM_VIEW_HISTORY_STORE?: HistoryData;
-
-    /**
-     * If set to true, hides the pdf.js viewer default sidebar containing the outline, page navigation, etc.
-     * This needs to be set early in the main method.
-     */
-    TRILIUM_HIDE_SIDEBAR?: boolean;
-
-    TRILIUM_NOTE_ID: string;
-
-    TRILIUM_NTX_ID: string | null | undefined;
-}
-
-interface PdfOutlineItem {
-    title: string;
-    level: number;
-    dest: unknown;
-    id: string;
-    items: PdfOutlineItem[];
-}
-
-interface WithContext {
-    ntxId: string;
-    noteId: string | null | undefined;
-}
-
-interface PdfDocumentModifiedMessage extends WithContext {
-    type: "pdfjs-viewer-document-modified";
-}
-
-interface PdfDocumentBlobResultMessage extends WithContext {
-    type: "pdfjs-viewer-blob";
-    data: Uint8Array<ArrayBufferLike>;
-}
-
-interface PdfSaveViewHistoryMessage extends WithContext {
-    type: "pdfjs-viewer-save-view-history";
-    data: string;
-}
-
-interface PdfViewerTocMessage {
-    type: "pdfjs-viewer-toc";
-    data: PdfOutlineItem[];
-}
-
-interface PdfViewerActiveHeadingMessage {
-    type: "pdfjs-viewer-active-heading";
-    headingId: string;
-}
-
-interface PdfViewerPageInfoMessage {
-    type: "pdfjs-viewer-page-info";
-    totalPages: number;
-    currentPage: number;
-}
-
-interface PdfViewerCurrentPageMessage {
-    type: "pdfjs-viewer-current-page";
-    currentPage: number;
-}
-
-interface PdfViewerThumbnailMessage {
-    type: "pdfjs-viewer-thumbnail";
-    pageNumber: number;
-    dataUrl: string;
-}
-
-interface PdfAttachment {
-    filename: string;
-    size: number;
-}
-
-interface PdfViewerAttachmentsMessage {
-    type: "pdfjs-viewer-attachments";
-    attachments: PdfAttachment[];
-    downloadAttachment?: (fileName: string) => void;
-}
-
-interface PdfLayer {
-    id: string;
-    name: string;
-    visible: boolean;
-}
-
-interface PdfViewerLayersMessage {
-    type: "pdfjs-viewer-layers";
-    layers: PdfLayer[];
-    toggleLayer?: (layerId: string, visible: boolean) => void;
-}
-
-type PdfMessageEvent = MessageEvent<
-    PdfDocumentModifiedMessage
-    | PdfSaveViewHistoryMessage
-    | PdfViewerTocMessage
-    | PdfViewerActiveHeadingMessage
-    | PdfViewerPageInfoMessage
-    | PdfViewerCurrentPageMessage
-    | PdfViewerThumbnailMessage
-    | PdfViewerAttachmentsMessage
-    | PdfViewerLayersMessage
-    | PdfDocumentBlobResultMessage
->;

apps/client/src/types.d.ts

@@ -1,5 +1,3 @@
-import { IconRegistry, Locale } from "@triliumnext/commons";
-
 import appContext, { AppContext } from "./components/app_context";
 import type FNote from "./entities/fnote";
 import type { PrintReport } from "./print";
@@ -47,25 +45,13 @@ interface CustomGlobals {
     platform?: typeof process.platform;
     linter: typeof lint;
     hasNativeTitleBar: boolean;
-    hasBackgroundEffects: boolean;
-    isElectron: boolean;
     isRtl: boolean;
-    iconRegistry: IconRegistry;
-    themeCssUrl: string;
-    themeUseNextAsBase?: "next" | "next-light" | "next-dark";
-    iconPackCss: string;
-    headingStyle: "plain" | "underline" | "markdown";
-    layoutOrientation: "vertical" | "horizontal";
-    currentLocale: Locale;
 }
 
 type RequireMethod = (moduleName: string) => any;
 
 declare global {
     interface Window {
-        $: JQueryStatic;
-        jQuery: JQueryStatic;
-
         logError(message: string);
         logInfo(message: string);
 

apps/client/src/widgets/FloatingButtonsDefinitions.tsx

@@ -7,6 +7,7 @@ import Component from "../components/component";
 import NoteContext from "../components/note_context";
 import FNote from "../entities/fnote";
 import attributes from "../services/attributes";
+import { isExperimentalFeatureEnabled } from "../services/experimental_features";
 import froca from "../services/froca";
 import { t } from "../services/i18n";
 import { copyImageReferenceToClipboard } from "../services/image";
@@ -100,8 +101,7 @@ function SwitchSplitOrientationButton({ note, isReadOnly, isDefaultViewMode }: F
 
 function ToggleReadOnlyButton({ note, viewType, isDefaultViewMode }: FloatingButtonContext) {
     const [ isReadOnly, setReadOnly ] = useNoteLabelBoolean(note, "readOnly");
-    const isSavedSqlite = note.isTriliumSqlite() && !note.isHiddenCompletely();
-    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || viewType === "geoMap" || isSavedSqlite)
+    const isEnabled = ([ "mermaid", "mindMap", "canvas" ].includes(note.type) || viewType === "geoMap")
             && note.isContentAvailable() && isDefaultViewMode;
 
     return isEnabled && <FloatingButton
@@ -142,7 +142,7 @@ function ShowTocWidgetButton({ note, noteContext, isDefaultViewMode }: FloatingB
 
     return isEnabled && <FloatingButton
         text={t("show_toc_widget_button.show_toc")}
-        icon="bx bx-spreadsheet bx-rotate-180"
+        icon="bx bx-tn-toc"
         onClick={() => {
             if (noteContext?.viewScope && noteContext.noteId) {
                 noteContext.viewScope.tocTemporarilyHidden = false;

apps/client/src/widgets/NoteDetail.tsx

@@ -215,7 +215,7 @@ export default function NoteDetail() {
     return (
         <div
             ref={containerRef}
-            class={`component note-detail ${isFullHeight ? "full-height" : ""}`}
+            class={`note-detail ${isFullHeight ? "full-height" : ""}`}
         >
             {Object.entries(noteTypesToRender).map(([ itemType, Element ]) => {
                 return <NoteDetailWrapper
@@ -265,13 +265,9 @@ function useNoteInfo() {
     const [ note, setNote ] = useState<FNote | null | undefined>();
     const [ type, setType ] = useState<ExtendedNoteType>();
     const [ mime, setMime ] = useState<string>();
-    const refreshIdRef = useRef(0);
 
     function refresh() {
-        const refreshId = ++refreshIdRef.current;
-
         getExtendedWidgetType(actualNote, noteContext).then(type => {
-            if (refreshId !== refreshIdRef.current) return;
             setNote(actualNote);
             setType(type);
             setMime(actualNote?.mime);
@@ -322,8 +318,6 @@ export async function getExtendedWidgetType(note: FNote | null | undefined, note
         resultingType = "noteMap";
     } else if (type === "text" && (await noteContext?.isReadOnly())) {
         resultingType = "readOnlyText";
-    } else if (note.isTriliumSqlite()) {
-        resultingType = "sqlConsole";
     } else if ((type === "code" || type === "mermaid") && (await noteContext?.isReadOnly())) {
         resultingType = "readOnlyCode";
     } else if (type === "text") {
@@ -348,8 +342,9 @@ export function checkFullHeight(noteContext: NoteContext | undefined, type: Exte
 
     // https://github.com/zadam/trilium/issues/2522
     const isBackendNote = noteContext?.noteId === "_backendLog";
+    const isSqlNote = noteContext.note?.mime === "text/x-sqlite;schema=trilium";
     const isFullHeightNoteType = type && TYPE_MAPPINGS[type].isFullHeight;
-    return (!noteContext?.hasNoteList() && isFullHeightNoteType)
+    return (!noteContext?.hasNoteList() && isFullHeightNoteType && !isSqlNote)
         || noteContext?.viewScope?.viewMode === "attachments"
         || isBackendNote;
 }
@@ -363,8 +358,8 @@ function showToast(type: "printing" | "exporting_pdf", progress: number = 0) {
     });
 }
 
-function handlePrintReport(printReport?: PrintReport) {
-    if (printReport?.type === "collection" && printReport.ignoredNoteIds.length > 0) {
+function handlePrintReport(printReport: PrintReport) {
+    if (printReport.type === "collection" && printReport.ignoredNoteIds.length > 0) {
         toast.showPersistent({
             id: "print-report",
             icon: "bx bx-collection",

apps/client/src/widgets/PromotedAttributes.tsx

@@ -217,7 +217,6 @@ function LabelInput({ inputId, ...props }: CellProps & { inputId: string }) {
         id={inputId}
         type={LABEL_MAPPINGS[definition.labelType ?? "text"]}
         value={valueAttr.value}
-        checked={definition.labelType === "boolean" ? valueAttr.value === "true" : undefined}
         placeholder={t("promoted_attributes.unset-field-placeholder")}
         data-attribute-id={valueAttr.attributeId}
         data-attribute-type={valueAttr.type}

apps/client/src/widgets/buttons/right_pane_toggle.tsx

@@ -1,17 +1,11 @@
 import clsx from "clsx";
 
 import { t } from "../../services/i18n";
-import options from "../../services/options";
 import ActionButton from "../react/ActionButton";
-import { useState, useCallback } from "preact/hooks";
-import { useTriliumEvent } from "../react/hooks";
+import { useTriliumOptionBool } from "../react/hooks";
 
 export default function RightPaneToggle() {
-    const [ rightPaneVisible, setRightPaneVisible ] = useState(options.is("rightPaneVisible"));
-
-    useTriliumEvent("toggleRightPane", useCallback(() => {
-        setRightPaneVisible(current => !current);
-    }, []));
+    const [ rightPaneVisible, setRightPaneVisible ] = useTriliumOptionBool("rightPaneVisible");
 
     return (
         <ActionButton
@@ -21,7 +15,7 @@ export default function RightPaneToggle() {
             )}
             text={t("right_pane.toggle")}
             icon="bx bx-sidebar"
-            triggerCommand="toggleRightPane"
+            onClick={() => setRightPaneVisible(!rightPaneVisible)}
         />
     );
 }

apps/client/src/widgets/collections/NoteList.css

@@ -12,7 +12,7 @@ body.prefers-centered-content .note-list-widget:not(.full-height) {
 }
 
 .note-list-widget .note-list {
-    padding-block: 10px;
+    padding: 10px;
 }
 
 .note-list-widget.full-height,

apps/client/src/widgets/collections/NoteList.tsx

@@ -1,7 +1,7 @@
 import "./NoteList.css";
 
 import { WebSocketMessage } from "@triliumnext/commons";
-import { Component, VNode } from "preact";
+import { VNode } from "preact";
 import { lazy, Suspense } from "preact/compat";
 import { useEffect, useRef, useState } from "preact/hooks";
 
@@ -11,8 +11,7 @@ import froca from "../../services/froca";
 import { subscribeToMessages, unsubscribeToMessage as unsubscribeFromMessage } from "../../services/ws";
 import { useNoteContext, useNoteLabel, useNoteLabelBoolean, useNoteProperty, useTriliumEvent } from "../react/hooks";
 import { allViewTypes, ViewModeMedia, ViewModeProps, ViewTypeOptions } from "./interface";
-import ViewModeStorage, { type ViewModeStorageType } from "./view_mode_storage";
-
+import ViewModeStorage from "./view_mode_storage";
 interface NoteListProps {
     note: FNote | null | undefined;
     notePath: string | null | undefined;
@@ -120,9 +119,7 @@ export function CustomNoteList({ note, viewType, isEnabled: shouldEnable, notePa
     }
 
     const ComponentToRender = viewType && props && isEnabled && (
-        props.media === "print"
-            ? ViewComponents[viewType].print ?? ViewComponents[viewType].normal
-            : ViewComponents[viewType].normal
+        props.media === "print" ? ViewComponents[viewType].print : ViewComponents[viewType].normal
     );
 
     return (
@@ -218,7 +215,7 @@ export function useNoteIds(note: FNote | null | undefined, viewType: ViewTypeOpt
     return noteIds;
 }
 
-export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewModeStorageType | undefined) {
+export function useViewModeConfig<T extends object>(note: FNote | null | undefined, viewType: ViewTypeOptions | undefined) {
     const [ viewConfig, setViewConfig ] = useState<{
         config: T | undefined;
         storeFn: (data: T) => void;

apps/client/src/widgets/collections/calendar/api.ts

@@ -1,8 +1,8 @@
-import { AttributeRow, CreateChildrenResponse } from "@triliumnext/commons";
-
+import { CreateChildrenResponse } from "@triliumnext/commons";
+import server from "../../../services/server";
 import FNote from "../../../entities/fnote";
 import { setAttribute, setLabel } from "../../../services/attributes";
-import server from "../../../services/server";
+import froca from "../../../services/froca";
 
 interface NewEventOpts {
     title: string;
@@ -10,7 +10,6 @@ interface NewEventOpts {
     endDate?: string | null;
     startTime?: string | null;
     endTime?: string | null;
-    componentId?: string;
 }
 
 interface ChangeEventOpts {
@@ -18,48 +17,30 @@ interface ChangeEventOpts {
     endDate?: string | null;
     startTime?: string | null;
     endTime?: string | null;
-    componentId?: string;
 }
 
-export async function newEvent(parentNote: FNote, { title, startDate, endDate, startTime, endTime, componentId }: NewEventOpts) {
-    const attributes: Omit<AttributeRow, "noteId" | "attributeId">[] = [];
-    attributes.push({
-        type: "label",
-        name: "startDate",
-        value: startDate
-    });
-    if (endDate) {
-        attributes.push({
-            type: "label",
-            name: "endDate",
-            value: endDate
-        });
-    }
-    if (startTime) {
-        attributes.push({
-            type: "label",
-            name: "startTime",
-            value: startTime
-        });
-    }
-    if (endTime) {
-        attributes.push({
-            type: "label",
-            name: "endTime",
-            value: endTime
-        });
-    }
-
+export async function newEvent(parentNote: FNote, { title, startDate, endDate, startTime, endTime }: NewEventOpts) {
     // Create the note.
-    await server.post<CreateChildrenResponse>(`notes/${parentNote.noteId}/children?target=into`, {
+    const { note } = await server.post<CreateChildrenResponse>(`notes/${parentNote.noteId}/children?target=into`, {
         title,
         content: "",
-        type: "text",
-        attributes
-    }, componentId);
+        type: "text"
+    });
+
+    // Set the attributes.
+    setLabel(note.noteId, "startDate", startDate);
+    if (endDate) {
+        setLabel(note.noteId, "endDate", endDate);
+    }
+    if (startTime) {
+        setLabel(note.noteId, "startTime", startTime);
+    }
+    if (endTime) {
+        setLabel(note.noteId, "endTime", endTime);
+    }
 }
 
-export async function changeEvent(note: FNote, { startDate, endDate, startTime, endTime, componentId }: ChangeEventOpts) {
+export async function changeEvent(note: FNote, { startDate, endDate, startTime, endTime }: ChangeEventOpts) {
     // Don't store the end date if it's empty.
     if (endDate === startDate) {
         endDate = undefined;
@@ -71,12 +52,12 @@ export async function changeEvent(note: FNote, { startDate, endDate, startTime,
     let endAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:endDate").shift()?.value||"endDate";
 
     const noteId = note.noteId;
-    setLabel(noteId, startAttribute, startDate, false, componentId);
-    setAttribute(note, "label", endAttribute, endDate, componentId);
+    setLabel(noteId, startAttribute, startDate);
+    setAttribute(note, "label", endAttribute, endDate);
 
     startAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:startTime").shift()?.value||"startTime";
     endAttribute = note.getAttributes("label").filter(attr => attr.name == "calendar:endTime").shift()?.value||"endTime";
 
-    setAttribute(note, "label", startAttribute, startTime, componentId);
-    setAttribute(note, "label", endAttribute, endTime, componentId);
+    setAttribute(note, "label", startAttribute, startTime);
+    setAttribute(note, "label", endAttribute, endTime);
 }

apps/client/src/widgets/collections/calendar/context_menu.ts

@@ -1,12 +1,12 @@
+import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker";
 import FNote from "../../../entities/fnote";
 import contextMenu, { ContextMenuEvent } from "../../../menus/context_menu";
-import { getArchiveMenuItem } from "../../../menus/context_menu_utils";
-import NoteColorPicker from "../../../menus/custom-items/NoteColorPicker";
 import link_context_menu from "../../../menus/link_context_menu";
 import branches from "../../../services/branches";
+import { getArchiveMenuItem } from "../../../menus/context_menu_utils";
 import { t } from "../../../services/i18n";
 
-export function openCalendarContextMenu(e: ContextMenuEvent, note: FNote, parentNote: FNote, componentId?: string) {
+export function openCalendarContextMenu(e: ContextMenuEvent, note: FNote, parentNote: FNote) {
     e.preventDefault();
     e.stopPropagation();
 
@@ -30,16 +30,16 @@ export function openCalendarContextMenu(e: ContextMenuEvent, note: FNote, parent
                     }
 
                     if (branchIdToDelete) {
-                        await branches.deleteNotes([ branchIdToDelete ], false, false, componentId);
+                        await branches.deleteNotes([ branchIdToDelete ], false, false);
                     }
                 }
             },
             { kind: "separator" },
             {
                 kind: "custom",
-                componentFn: () => NoteColorPicker({note})
+                componentFn: () => NoteColorPicker({note: note})
             }
         ],
         selectMenuItemHandler: ({ command }) =>  link_context_menu.handleLinkContextMenuItem(command, e, note.noteId),
-    });
+    })
 }

apps/client/src/widgets/collections/calendar/event_builder.ts

@@ -1,10 +1,9 @@
 import { EventInput, EventSourceFuncArg, EventSourceInput } from "@fullcalendar/core/index.js";
-import clsx from "clsx";
-
-import FNote from "../../../entities/fnote";
 import froca from "../../../services/froca";
-import server from "../../../services/server";
 import { formatDateToLocalISO, getCustomisableLabel, getMonthsInDateRange, offsetDate } from "./utils";
+import FNote from "../../../entities/fnote";
+import server from "../../../services/server";
+import clsx from "clsx";
 
 interface Event {
     startDate: string,
@@ -106,8 +105,7 @@ export async function buildEvent(note: FNote, { startDate, endDate, startTime, e
 
         endDate = (endTime ? `${endDate}T${endTime}:00` : endDate);
         const eventData: EventInput = {
-            id: note.noteId,
-            title,
+            title: title,
             start: startDate,
             url: `#${note.noteId}?popup`,
             noteId: note.noteId,
@@ -150,12 +148,12 @@ async function parseCustomTitle(customTitlettributeName: string | null, note: FN
 }
 
 async function buildDisplayedAttributes(note: FNote, calendarDisplayedAttributes: string[]) {
-    const filteredDisplayedAttributes = note.getAttributes().filter((attr): boolean => calendarDisplayedAttributes.includes(attr.name));
+    const filteredDisplayedAttributes = note.getAttributes().filter((attr): boolean => calendarDisplayedAttributes.includes(attr.name))
     const result: Array<[string, string]> = [];
 
     for (const attribute of filteredDisplayedAttributes) {
         if (attribute.type === "label") result.push([attribute.name, attribute.value]);
-        else result.push([attribute.name, (await attribute.getTargetNote())?.title || ""]);
+        else result.push([attribute.name, (await attribute.getTargetNote())?.title || ""])
     }
 
     return result;

apps/client/src/widgets/collections/calendar/index.tsx

@@ -1,30 +1,27 @@
-import "./index.css";
-
-import { Calendar as FullCalendar } from "@fullcalendar/core";
 import { DateSelectArg, EventChangeArg, EventMountArg, EventSourceFuncArg, LocaleInput, PluginDef } from "@fullcalendar/core/index.js";
-import { DateClickArg } from "@fullcalendar/interaction";
-import { DISPLAYABLE_LOCALE_IDS } from "@triliumnext/commons";
-import { RefObject } from "preact";
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
-
-import appContext from "../../../components/app_context";
-import FNote from "../../../entities/fnote";
-import date_notes from "../../../services/date_notes";
-import dialog from "../../../services/dialog";
-import froca from "../../../services/froca";
-import { t } from "../../../services/i18n";
-import { isMobile } from "../../../services/utils";
-import ActionButton from "../../react/ActionButton";
-import Button, { ButtonGroup } from "../../react/Button";
-import { useNoteLabel, useNoteLabelBoolean, useResizeObserver, useSpacedUpdate, useTriliumEvent, useTriliumOption, useTriliumOptionInt } from "../../react/hooks";
-import { ParentComponent } from "../../react/react_utils";
-import TouchBar, { TouchBarButton, TouchBarLabel, TouchBarSegmentedControl, TouchBarSpacer } from "../../react/TouchBar";
 import { ViewModeProps } from "../interface";
-import { changeEvent, newEvent } from "./api";
 import Calendar from "./calendar";
-import { openCalendarContextMenu } from "./context_menu";
-import { buildEvents, buildEventsForCalendar } from "./event_builder";
+import { useCallback, useEffect, useMemo, useRef, useState } from "preact/hooks";
+import "./index.css";
+import { useNoteLabel, useNoteLabelBoolean, useResizeObserver, useSpacedUpdate, useTriliumEvent, useTriliumOption, useTriliumOptionInt } from "../../react/hooks";
+import { DISPLAYABLE_LOCALE_IDS } from "@triliumnext/commons";
+import { Calendar as FullCalendar } from "@fullcalendar/core";
 import { parseStartEndDateFromEvent, parseStartEndTimeFromEvent } from "./utils";
+import dialog from "../../../services/dialog";
+import { t } from "../../../services/i18n";
+import { buildEvents, buildEventsForCalendar } from "./event_builder";
+import { changeEvent, newEvent } from "./api";
+import froca from "../../../services/froca";
+import date_notes from "../../../services/date_notes";
+import appContext from "../../../components/app_context";
+import { DateClickArg } from "@fullcalendar/interaction";
+import FNote from "../../../entities/fnote";
+import Button, { ButtonGroup } from "../../react/Button";
+import ActionButton from "../../react/ActionButton";
+import { RefObject } from "preact";
+import TouchBar, { TouchBarButton, TouchBarLabel, TouchBarSegmentedControl, TouchBarSpacer } from "../../react/TouchBar";
+import { openCalendarContextMenu } from "./context_menu";
+import { isMobile } from "../../../services/utils";
 
 interface CalendarViewData {
 
@@ -62,7 +59,7 @@ const CALENDAR_VIEWS = [
         previousText: t("calendar.month_previous"),
         nextText: t("calendar.month_next")
     }
-];
+]
 
 const SUPPORTED_CALENDAR_VIEW_TYPE = CALENDAR_VIEWS.map(v => v.type);
 
@@ -78,7 +75,6 @@ export const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, (() => Promise<{ de
     ru: () => import("@fullcalendar/core/locales/ru"),
     ja: () => import("@fullcalendar/core/locales/ja"),
     pt: () => import("@fullcalendar/core/locales/pt"),
-    pl: () => import("@fullcalendar/core/locales/pl"),
     "pt_br": () => import("@fullcalendar/core/locales/pt-br"),
     uk: () => import("@fullcalendar/core/locales/uk"),
     en: null,
@@ -88,7 +84,6 @@ export const LOCALE_MAPPINGS: Record<DISPLAYABLE_LOCALE_IDS, (() => Promise<{ de
 };
 
 export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarViewData>) {
-    const parentComponent = useContext(ParentComponent);
     const containerRef = useRef<HTMLDivElement>(null);
     const calendarRef = useRef<FullCalendar>(null);
 
@@ -107,34 +102,26 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi
     const eventBuilder = useMemo(() => {
         if (!isCalendarRoot) {
             return async () => await buildEvents(noteIds);
+        } else {
+            return async (e: EventSourceFuncArg) => await buildEventsForCalendar(note, e);
         }
-        return async (e: EventSourceFuncArg) => await buildEventsForCalendar(note, e);
     }, [isCalendarRoot, noteIds]);
 
     const plugins = usePlugins(isEditable, isCalendarRoot);
     const locale = useLocale();
 
-    const { eventDidMount } = useEventDisplayCustomization(note, parentComponent?.componentId);
-    const editingProps = useEditing(note, isEditable, isCalendarRoot, parentComponent?.componentId);
+    const { eventDidMount } = useEventDisplayCustomization(note);
+    const editingProps = useEditing(note, isEditable, isCalendarRoot);
 
     // React to changes.
     useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
-        const api = calendarRef.current;
-        if (!api) return;
-
-        // Subnote attribute change.
-        if (loadResults.getAttributeRows(parentComponent?.componentId).some((a) => noteIds.includes(a.noteId ?? ""))) {
+        if (loadResults.getNoteIds().some(noteId => noteIds.includes(noteId)) // note title change.
+            || loadResults.getAttributeRows().some((a) => noteIds.includes(a.noteId ?? ""))) // subnote change.
+        {
             // Defer execution after the load results are processed so that the event builder has the updated data to work with.
-            setTimeout(() => api.refetchEvents(), 0);
-            return; // early return since we'll refresh the events anyway
-        }
-
-        // Title change.
-        for (const noteId of loadResults.getNoteIds().filter(noteId => noteIds.includes(noteId))) {
-            const event = api.getEventById(noteId);
-            const note = froca.getNoteFromCache(noteId);
-            if (!event || !note) continue;
-            event.setProp("title", note.title);
+            setTimeout(() => {
+                calendarRef.current?.refetchEvents();
+            }, 0);
         }
     });
 
@@ -191,7 +178,7 @@ function CalendarHeader({ calendarRef }: { calendarRef: RefObject<FullCalendar>
                 <ActionButton icon="bx bx-chevron-right" text={currentViewData?.nextText ?? ""} frame onClick={() => calendarRef.current?.next()} />
             </ButtonGroup>
         </div>
-    );
+    )
 }
 
 function usePlugins(isEditable: boolean, isCalendarRoot: boolean) {
@@ -232,7 +219,7 @@ function useLocale() {
     return calendarLocale;
 }
 
-function useEditing(note: FNote, isEditable: boolean, isCalendarRoot: boolean, componentId: string | undefined) {
+function useEditing(note: FNote, isEditable: boolean, isCalendarRoot: boolean) {
     const onCalendarSelection = useCallback(async (e: DateSelectArg) => {
         const { startDate, endDate } = parseStartEndDateFromEvent(e);
         if (!startDate) return;
@@ -244,8 +231,8 @@ function useEditing(note: FNote, isEditable: boolean, isCalendarRoot: boolean, c
             return;
         }
 
-        newEvent(note, { title, startDate, endDate, startTime, endTime, componentId });
-    }, [ note, componentId ]);
+        newEvent(note, { title, startDate, endDate, startTime, endTime });
+    }, [ note ]);
 
     const onEventChange = useCallback(async (e: EventChangeArg) => {
         const { startDate, endDate } = parseStartEndDateFromEvent(e.event);
@@ -254,8 +241,8 @@ function useEditing(note: FNote, isEditable: boolean, isCalendarRoot: boolean, c
         const { startTime, endTime } = parseStartEndTimeFromEvent(e.event);
         const note = await froca.getNote(e.event.extendedProps.noteId);
         if (!note) return;
-        changeEvent(note, { startDate, endDate, startTime, endTime, componentId });
-    }, [ componentId ]);
+        changeEvent(note, { startDate, endDate, startTime, endTime });
+    }, []);
 
     // Called upon when clicking the day number in the calendar, opens or creates the day note but only if in a calendar root.
     const onDateClick = useCallback(async (e: DateClickArg) => {
@@ -274,7 +261,7 @@ function useEditing(note: FNote, isEditable: boolean, isCalendarRoot: boolean, c
     };
 }
 
-function useEventDisplayCustomization(parentNote: FNote, componentId: string | undefined) {
+function useEventDisplayCustomization(parentNote: FNote) {
     const eventDidMount = useCallback((e: EventMountArg) => {
         const { iconClass, promotedAttributes } = e.event.extendedProps;
 
@@ -306,7 +293,7 @@ function useEventDisplayCustomization(parentNote: FNote, componentId: string | u
         if (promotedAttributes) {
             let promotedAttributesHtml = "";
             for (const [name, value] of promotedAttributes) {
-                promotedAttributesHtml = `${promotedAttributesHtml  /*html*/}\
+                promotedAttributesHtml = promotedAttributesHtml + /*html*/`\
                 <div class="promoted-attribute">
                     <span class="promoted-attribute-name">${name}</span>: <span class="promoted-attribute-value">${value}</span>
                 </div>`;
@@ -331,7 +318,7 @@ function useEventDisplayCustomization(parentNote: FNote, componentId: string | u
             const note = await froca.getNote(e.event.extendedProps.noteId);
             if (!note) return;
 
-            openCalendarContextMenu(contextMenuEvent, note, parentNote, componentId);
+            openCalendarContextMenu(contextMenuEvent, note, parentNote);
         }
 
         if (isMobile()) {

apps/client/src/widgets/collections/geomap/index.css

@@ -40,7 +40,7 @@
   z-index: -1;
 }
 
-.geo-map-container .leaflet-div-icon .tn-icon {
+.geo-map-container .leaflet-div-icon .bx {
   position: absolute;
   top: 3px;
   inset-inline-start: 2px;

apps/client/src/widgets/collections/legacy/ListOrGridView.css

@@ -142,10 +142,4 @@
     border: 1px solid var(--main-border-color);
     background: var(--more-accented-background-color);
 }
-
-.note-list.grid-view .note-path {
-    margin-left: 0.5em;
-    vertical-align: middle;
-    opacity: 0.5;
-}
 /* #endregion */

apps/client/src/widgets/collections/legacy/ListOrGridView.tsx

@@ -7,6 +7,7 @@ import attribute_renderer from "../../../services/attribute_renderer";
 import content_renderer from "../../../services/content_renderer";
 import { t } from "../../../services/i18n";
 import link from "../../../services/link";
+import tree from "../../../services/tree";
 import { useImperativeSearchHighlighlighting, useNoteLabel, useNoteLabelBoolean } from "../../react/hooks";
 import Icon from "../../react/Icon";
 import NoteLink from "../../react/NoteLink";
@@ -44,7 +45,6 @@ export function ListView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
 export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }: ViewModeProps<{}>) {
     const noteIds = useFilteredNoteIds(note, unfilteredNoteIds);
     const { pageNotes, ...pagination } = usePagination(note, noteIds);
-    const [ includeArchived ] = useNoteLabelBoolean(note, "includeArchived");
 
     return (
         <div class="note-list grid-view">
@@ -53,7 +53,7 @@ export function GridView({ note, noteIds: unfilteredNoteIds, highlightedTokens }
 
                 <div class="note-list-container use-tn-links">
                     {pageNotes?.map(childNote => (
-                        <GridNoteCard note={childNote} parentNote={note} highlightedTokens={highlightedTokens} includeArchived={includeArchived} />
+                        <GridNoteCard note={childNote} parentNote={note} highlightedTokens={highlightedTokens} />
                     ))}
                 </div>
 
@@ -95,17 +95,24 @@ function ListNoteCard({ note, parentNote, highlightedTokens, currentLevel, expan
             </h5>
 
             {isExpanded && <>
-                <NoteContent note={note} highlightedTokens={highlightedTokens} noChildrenList includeArchivedNotes={includeArchived} />
+                <NoteContent note={note} highlightedTokens={highlightedTokens} noChildrenList />
                 <NoteChildren note={note} parentNote={parentNote} highlightedTokens={highlightedTokens} currentLevel={currentLevel} expandDepth={expandDepth} includeArchived={includeArchived} />
             </>}
         </div>
     );
 }
 
-function GridNoteCard({ note, parentNote, highlightedTokens, includeArchived }: { note: FNote, parentNote: FNote, highlightedTokens: string[] | null | undefined, includeArchived: boolean }) {
+function GridNoteCard({ note, parentNote, highlightedTokens }: { note: FNote, parentNote: FNote, highlightedTokens: string[] | null | undefined }) {
     const titleRef = useRef<HTMLSpanElement>(null);
     const [ noteTitle, setNoteTitle ] = useState<string>();
     const notePath = getNotePath(parentNote, note);
+    const highlightSearch = useImperativeSearchHighlighlighting(highlightedTokens);
+
+    useEffect(() => {
+        tree.getNoteTitle(note.noteId, parentNote.noteId).then(setNoteTitle);
+    }, [ note ]);
+
+    useEffect(() => highlightSearch(titleRef.current), [ noteTitle, highlightedTokens ]);
 
     return (
         <div
@@ -116,14 +123,13 @@ function GridNoteCard({ note, parentNote, highlightedTokens, includeArchived }:
         >
             <h5 className="note-book-header">
                 <Icon className="note-icon" icon={note.getIcon()} />
-                <NoteLink className="note-book-title" notePath={notePath} noPreview showNotePath={parentNote.type === "search"} highlightedTokens={highlightedTokens} />
+                <span ref={titleRef} className="note-book-title">{noteTitle}</span>
                 <NoteAttributes note={note} />
             </h5>
             <NoteContent
                 note={note}
                 trim
                 highlightedTokens={highlightedTokens}
-                includeArchivedNotes={includeArchived}
             />
         </div>
     );
@@ -140,22 +146,14 @@ function NoteAttributes({ note }: { note: FNote }) {
     return <span className="note-list-attributes" ref={ref} />;
 }
 
-function NoteContent({ note, trim, noChildrenList, highlightedTokens, includeArchivedNotes }: {
-    note: FNote;
-    trim?: boolean;
-    noChildrenList?: boolean;
-    highlightedTokens: string[] | null | undefined;
-    includeArchivedNotes: boolean;
-}) {
+function NoteContent({ note, trim, noChildrenList, highlightedTokens }: { note: FNote, trim?: boolean, noChildrenList?: boolean, highlightedTokens: string[] | null | undefined }) {
     const contentRef = useRef<HTMLDivElement>(null);
     const highlightSearch = useImperativeSearchHighlighlighting(highlightedTokens);
 
     useEffect(() => {
         content_renderer.getRenderedContent(note, {
             trim,
-            noChildrenList,
-            noIncludedNotes: true,
-            includeArchivedNotes
+            noChildrenList
         })
             .then(({ $renderedContent, type }) => {
                 if (!contentRef.current) return;

apps/client/src/widgets/collections/presentation/model.spec.ts

@@ -74,11 +74,11 @@ describe("Presentation model", () => {
     });
 
     it("rewrites links to other slides", () => {
-        expect(data.slides[1].content.__html).toStrictEqual(`<div class="ck-content"><p>Go to&nbsp;<a class="reference-link" href="#/slide-slide1"><span><span class="tn-icon bx bx-folder"></span>First slide</span></a>.</p></div>`);
-        expect(data.slides[1].verticalSlides![0].content.__html).toStrictEqual(`<div class="ck-content"><p>Go to&nbsp;<a class="reference-link" href="#/slide-slide2"><span><span class="tn-icon bx bx-note"></span>First-sub</span></a>.</p></div>`);
+        expect(data.slides[1].content.__html).toStrictEqual(`<div class="ck-content"><p>Go to&nbsp;<a class="reference-link" href="#/slide-slide1"><span><span class="bx bx-folder"></span>First slide</span></a>.</p></div>`);
+        expect(data.slides[1].verticalSlides![0].content.__html).toStrictEqual(`<div class="ck-content"><p>Go to&nbsp;<a class="reference-link" href="#/slide-slide2"><span><span class="bx bx-note"></span>First-sub</span></a>.</p></div>`);
     });
 
     it("rewrites links even if they are not part of the slideshow", () => {
-        expect(data.slides[0].verticalSlides![0].content.__html).toStrictEqual(`<div class="ck-content"><p>Go to&nbsp;<a class="reference-link" href="#/slide-other"><span><span class="tn-icon bx bx-note"></span>Other note</span></a>.</p></div>`);
+        expect(data.slides[0].verticalSlides![0].content.__html).toStrictEqual(`<div class="ck-content"><p>Go to&nbsp;<a class="reference-link" href="#/slide-other"><span><span class="bx bx-note"></span>Other note</span></a>.</p></div>`);
     });
 });

apps/client/src/widgets/collections/table/index.css

@@ -4,10 +4,6 @@
     height: 100%;
     user-select: none;
     padding: 0 5px 0 10px;
-
-    .tabulator-tableholder {
-        height: unset !important;
-    }
 }
 
 .table-view-container {
@@ -72,4 +68,4 @@
     inset-inline-start: 0;
     font-size: 1.5em;
     transform: translateY(-50%);
-}
+}

apps/client/src/widgets/collections/table/tabulator.tsx

@@ -1,20 +1,18 @@
+import { useContext, useEffect, useLayoutEffect, useRef } from "preact/hooks";
+import { EventCallBackMethods, Module, Options, Tabulator as VanillaTabulator } from "tabulator-tables";
 import "tabulator-tables/dist/css/tabulator.css";
 import "../../../../src/stylesheets/table.css";
-
-import { isValidElement, RefObject } from "preact";
-import { useContext, useEffect, useLayoutEffect, useRef } from "preact/hooks";
-import { JSX } from "preact/jsx-runtime";
-import { EventCallBackMethods, Module, Options, Tabulator as VanillaTabulator } from "tabulator-tables";
-
 import { ParentComponent, renderReactWidget } from "../../react/react_utils";
+import { JSX } from "preact/jsx-runtime";
+import { isValidElement, RefObject } from "preact";
 
 interface TableProps<T> extends Omit<Options, "data" | "footerElement" | "index"> {
-    tabulatorRef?: RefObject<VanillaTabulator>;
+    tabulatorRef: RefObject<VanillaTabulator>;
     className?: string;
     data?: T[];
     modules?: (new (table: VanillaTabulator) => Module)[];
     events?: Partial<EventCallBackMethods>;
-    index?: keyof T;
+    index: keyof T;
     footerElement?: string | HTMLElement | JSX.Element;
     onReady?: () => void;
 }
@@ -45,9 +43,7 @@ export default function Tabulator<T>({ className, columns, data, modules, tabula
 
         tabulator.on("tableBuilt", () => {
             tabulatorRef.current = tabulator;
-            if (externalTabulatorRef) {
-                externalTabulatorRef.current = tabulator;
-            }
+            externalTabulatorRef.current = tabulator;
             onReady?.();
         });
 
@@ -66,15 +62,12 @@ export default function Tabulator<T>({ className, columns, data, modules, tabula
             for (const [ eventName, handler ] of Object.entries(events)) {
                 tabulator.off(eventName as keyof EventCallBackMethods, handler);
             }
-        };
+        }
     }, Object.values(events ?? {}));
 
     // Change in data.
-    useEffect(() => { tabulatorRef.current?.setData(data); }, [ data ]);
-    useEffect(() => {
-        if (!columns) return;
-        tabulatorRef.current?.setColumns(columns);
-    }, [ columns ]);
+    useEffect(() => { tabulatorRef.current?.setData(data) }, [ data ]);
+    useEffect(() => { columns && tabulatorRef.current?.setColumns(columns)}, [ data]);
 
     return (
         <div ref={containerRef} className={className} />

apps/client/src/widgets/collections/view_mode_storage.ts

@@ -4,16 +4,14 @@ import { ViewTypeOptions } from "../collections/interface";
 
 const ATTACHMENT_ROLE = "viewConfig";
 
-export type ViewModeStorageType = ViewTypeOptions | "pdfHistory";
-
 export default class ViewModeStorage<T extends object> {
 
     private note: FNote;
     private attachmentName: string;
 
-    constructor(note: FNote, viewType: ViewModeStorageType) {
+    constructor(note: FNote, viewType: ViewTypeOptions) {
         this.note = note;
-        this.attachmentName = `${viewType}.json`;
+        this.attachmentName = viewType + ".json";
     }
 
     async store(data: T) {

apps/client/src/widgets/containers/scrolling_container.css

@@ -2,13 +2,6 @@
     overflow: auto;
     scroll-behavior: smooth;
     position: relative;
-
-    > .inline-title,
-    > .note-detail > .note-detail-editable-text,
-    > .note-list-widget:not(.full-height) {
-        padding-inline: 24px;
-    }
-
 }
 
 .note-split.type-code:not(.mime-text-x-sqlite) {

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

@@ -1,11 +1,10 @@
+import FlexContainer from "./flex_container.js";
 import appContext, { type CommandData, type CommandListenerData, type EventData, type EventNames, type NoteSwitchedContext } from "../../components/app_context.js";
+import type BasicWidget from "../basic_widget.js";
 import Component from "../../components/component.js";
-import NoteContext from "../../components/note_context.js";
 import splitService from "../../services/resizer.js";
 import { isMobile } from "../../services/utils.js";
-import type BasicWidget from "../basic_widget.js";
-import NoteContextAwareWidget from "../note_context_aware_widget.js";
-import FlexContainer from "./flex_container.js";
+import NoteContext from "../../components/note_context.js";
 
 interface SplitNoteWidget extends BasicWidget {
     hasBeenAlreadyShown?: boolean;
@@ -75,7 +74,7 @@ export default class SplitNoteContainer extends FlexContainer<SplitNoteWidget> {
 
 
         const subContexts = activeContext.getSubContexts();
-        let noteContext: NoteContext | undefined;
+        let noteContext: NoteContext | undefined = undefined;
         if (isMobile() && subContexts.length > 1) {
             noteContext = subContexts.find(s => s.ntxId !== ntxId);
         }
@@ -202,11 +201,6 @@ export default class SplitNoteContainer extends FlexContainer<SplitNoteWidget> {
 
     async refresh() {
         this.toggleExt(true);
-
-        // Mark the active note context.
-        for (const child of this.children as NoteContextAwareWidget[]) {
-            child.$widget.toggleClass("active", !!child.noteContext?.isActive());
-        }
     }
 
     toggleInt(show: boolean) {} // not needed
@@ -245,16 +239,16 @@ export default class SplitNoteContainer extends FlexContainer<SplitNoteWidget> {
                 widget.hasBeenAlreadyShown = true;
 
                 return [widget.handleEvent("noteSwitched", noteSwitchedContext), this.refreshNotShown(noteSwitchedContext)];
+            } else {
+                return Promise.resolve();
             }
-            return Promise.resolve();
-
         }
 
         if (name === "activeContextChanged") {
             return this.refreshNotShown(data as EventData<"activeContextChanged">);
+        } else {
+            return super.handleEventInChildren(name, data);
         }
-        return super.handleEventInChildren(name, data);
-
     }
 
     refreshNotShown(data: NoteSwitchedContext | EventData<"activeContextChanged">) {

apps/client/src/widgets/dialogs/PopupEditor.css

@@ -82,10 +82,6 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
     align-items: flex-start;
 }
 
-.modal.popup-editor-dialog .note-detail {
-    width: 100%;
-}
-
 .modal.popup-editor-dialog .note-detail.full-height {
     flex-grow: 0;
     height: 100%;
@@ -110,4 +106,4 @@ body.mobile .modal.popup-editor-dialog .modal-dialog {
         margin: 0;
         border-radius: 0;
     }
-}
+}

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

@@ -88,7 +88,6 @@ export default function PopupEditor() {
                     onHidden={() => setShown(false)}
                     keepInDom // needed for faster loading
                     noFocus // automatic focus breaks block popup
-                    stackable
                 >
                     {!isNewLayout && <ReadOnlyNoteInfoBar />}
                     <PromotedAttributes />

apps/client/src/widgets/dialogs/revisions.css

@@ -14,7 +14,7 @@ body.mobile .revisions-dialog {
         flex-grow: 1;
         width: 100%;
     }
-
+    
     .modal-body {
         height: fit-content !important;
         flex-direction: column;
@@ -24,7 +24,7 @@ body.mobile .revisions-dialog {
     .modal-footer {
         font-size: 0.9em;
     }
-
+    
     .revision-list {
         height: fit-content !important;
         max-height: 20vh;
@@ -32,7 +32,7 @@ body.mobile .revisions-dialog {
         padding: 0 1em;
         flex-shrink: 0;
     }
-
+    
     .modal-body > .revision-content-wrapper {
         flex-grow: 1;
         max-width: unset !important;
@@ -40,68 +40,24 @@ body.mobile .revisions-dialog {
         margin: 0;
         display: block !important;
     }
-
+    
     .modal-body > .revision-content-wrapper > div:first-of-type {
         flex-direction: column;
     }
-
+    
     .revision-title {
         font-size: 1rem;
     }
-
+    
     .revision-title-buttons {
         text-align: center;
         display: flex;
         gap: 0.25em;
         flex-wrap: wrap;
     }
-
+    
     .revision-content {
         padding: 0.5em;
         height: fit-content;
     }
-}
-
-.revisions-dialog {
-    .revision-title-buttons {
-        flex-shrink: 0;
-    }
-
-    .revision-list {
-        flex-shrink: 0;
-    }
-
-    .revision-content.type-file {
-        display: flex;
-        min-width: 0;
-        min-height: 0;
-        flex-grow: 1;
-
-        .file-preview-table {
-            th,
-            td {
-                padding: 0.25em 0;
-            }
-        }
-
-        .revision-file-preview {
-            display: flex;
-            flex-direction: column;
-            min-width: 0;
-            min-height: 0;
-            flex-grow: 1;
-        }
-
-        .revision-file-preview-content {
-            flex-grow: 1;
-            min-height: 0;
-            display: flex;
-            flex-direction: column;
-
-            > * {
-                height: 100%;
-            }
-        }
-    }
-
-}
+}

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

@@ -1,31 +1,26 @@
-import "./revisions.css";
-
-import type { RevisionItem, RevisionPojo } from "@triliumnext/commons";
-import clsx from "clsx";
-import { diffWords } from "diff";
-import type { CSSProperties } from "preact/compat";
-import { Dispatch, StateUpdater, useEffect, useRef, useState } from "preact/hooks";
-
+import type { RevisionPojo, RevisionItem } from "@triliumnext/commons";
 import appContext from "../../components/app_context";
 import FNote from "../../entities/fnote";
 import dialog from "../../services/dialog";
 import froca from "../../services/froca";
 import { t } from "../../services/i18n";
-import { renderMathInElement } from "../../services/math";
-import open from "../../services/open";
-import options from "../../services/options";
-import protected_session_holder from "../../services/protected_session_holder";
 import server from "../../services/server";
 import toast from "../../services/toast";
-import utils from "../../services/utils";
-import ActionButton from "../react/ActionButton";
 import Button from "../react/Button";
-import FormList, { FormListItem } from "../react/FormList";
 import FormToggle from "../react/FormToggle";
-import { useTriliumEvent } from "../react/hooks";
 import Modal from "../react/Modal";
-import { RawHtmlBlock } from "../react/RawHtml";
-import PdfViewer from "../type_widgets/file/PdfViewer";
+import FormList, { FormListItem } from "../react/FormList";
+import utils from "../../services/utils";
+import { Dispatch, StateUpdater, useEffect, useRef, useState } from "preact/hooks";
+import protected_session_holder from "../../services/protected_session_holder";
+import { renderMathInElement } from "../../services/math";
+import type { CSSProperties } from "preact/compat";
+import open from "../../services/open";
+import ActionButton from "../react/ActionButton";
+import options from "../../services/options";
+import { useTriliumEvent } from "../react/hooks";
+import { diffWords } from "diff";
+import "./revisions.css";
 
 export default function RevisionsDialog() {
     const [ note, setNote ] = useState<FNote>();
@@ -52,7 +47,7 @@ export default function RevisionsDialog() {
             setRevisions(undefined);
             setNoteContent(undefined);
         }
-    }, [ note, refreshCounter ]);
+    }, [ note?.noteId, refreshCounter ]);
 
     if (revisions?.length && !currentRevision) {
         setCurrentRevision(revisions[0]);
@@ -107,38 +102,38 @@ export default function RevisionsDialog() {
                 setRevisions(undefined);
             }}
             show={shown}
-        >
-            <RevisionsList
-                revisions={revisions ?? []}
-                onSelect={(revisionId) => {
-                    const correspondingRevision = (revisions ?? []).find((r) => r.revisionId === revisionId);
-                    if (correspondingRevision) {
-                        setCurrentRevision(correspondingRevision);
-                    }
-                }}
-                currentRevision={currentRevision}
-            />
+            >
+                <RevisionsList
+                    revisions={revisions ?? []}
+                    onSelect={(revisionId) => {
+                        const correspondingRevision = (revisions ?? []).find((r) => r.revisionId === revisionId);
+                        if (correspondingRevision) {
+                            setCurrentRevision(correspondingRevision);
+                        }
+                    }}
+                    currentRevision={currentRevision}
+                />
 
-            <div className="revision-content-wrapper" style={{
-                flexGrow: "1",
-                marginInlineStart: "20px",
-                display: "flex",
-                flexDirection: "column",
-                maxWidth: "calc(100% - 150px)",
-                minWidth: 0
-            }}>
-                <RevisionPreview
-                    noteContent={noteContent}
-                    revisionItem={currentRevision}
-                    showDiff={showDiff}
-                    setShown={setShown}
-                    onRevisionDeleted={() => {
-                        setRefreshCounter(c => c + 1);
-                        setCurrentRevision(undefined);
-                    }} />
-            </div>
+                <div className="revision-content-wrapper" style={{
+                    flexGrow: "1",
+                    marginInlineStart: "20px",
+                    display: "flex",
+                    flexDirection: "column",
+                    maxWidth: "calc(100% - 150px)",
+                    minWidth: 0
+                }}>
+                    <RevisionPreview
+                        noteContent={noteContent}
+                        revisionItem={currentRevision}
+                        showDiff={showDiff}
+                        setShown={setShown}
+                        onRevisionDeleted={() => {
+                            setRefreshCounter(c => c + 1);
+                            setCurrentRevision(undefined);
+                        }} />
+                </div>
         </Modal>
-    );
+    )
 }
 
 function RevisionsList({ revisions, onSelect, currentRevision }: { revisions: RevisionItem[], onSelect: (val: string) => void, currentRevision?: RevisionItem }) {
@@ -146,7 +141,6 @@ function RevisionsList({ revisions, onSelect, currentRevision }: { revisions: Re
         <FormList onSelect={onSelect} fullHeight wrapperClassName="revision-list">
             {revisions.map((item) =>
                 <FormListItem
-                    key={item.revisionId}
                     value={item.revisionId}
                     active={currentRevision && item.revisionId === currentRevision.revisionId}
                 >
@@ -208,17 +202,14 @@ function RevisionPreview({noteContent, revisionItem, showDiff, setShown, onRevis
                                 text={t("revisions.download_button")}
                                 onClick={() => {
                                     if (revisionItem.revisionId) {
-                                        open.downloadRevision(revisionItem.noteId, revisionItem.revisionId);}
-                                }
+                                        open.downloadRevision(revisionItem.noteId, revisionItem.revisionId)}
+                                    }
                                 }/>
                         </>
                     }
                 </div>)}
             </div>
-            <div
-                className={clsx("revision-content use-tn-links selectable-text", `type-${revisionItem?.type}`)}
-                style={{ overflow: "auto", wordBreak: "break-word" }}
-            >
+            <div className="revision-content use-tn-links selectable-text" style={{ overflow: "auto", wordBreak: "break-word" }}>
                 <RevisionContent noteContent={noteContent} revisionItem={revisionItem} fullRevision={fullRevision} showDiff={showDiff}/>
             </div>
         </>
@@ -239,16 +230,16 @@ const CODE_STYLE: CSSProperties = {
 
 function RevisionContent({ noteContent, revisionItem, fullRevision, showDiff }: { noteContent?:string, revisionItem?: RevisionItem, fullRevision?: RevisionPojo, showDiff: boolean}) {
     const content = fullRevision?.content;
-    if (!revisionItem || !fullRevision) {
+    if (!revisionItem || !content) {
         return <></>;
     }
 
     if (showDiff) {
-        return <RevisionContentDiff noteContent={noteContent} itemContent={content} itemType={revisionItem.type}/>;
+        return <RevisionContentDiff noteContent={noteContent} itemContent={content} itemType={revisionItem.type}/>
     }
     switch (revisionItem.type) {
         case "text":
-            return <RevisionContentText content={content} />;
+            return <RevisionContentText content={content} />
         case "code":
             return <pre style={CODE_STYLE}>{content}</pre>;
         case "image":
@@ -265,11 +256,28 @@ function RevisionContent({ noteContent, revisionItem, fullRevision, showDiff }:
                     // as a URL to be used in a note. Instead, if they copy and paste it into a note, it will be uploaded as a new note
                     return <img
                         src={`data:${fullRevision.mime};base64,${fullRevision.content}`}
-                        style={IMAGE_STYLE} />;
+                        style={IMAGE_STYLE} />
                 }
             }
         case "file":
-            return <FilePreview fullRevision={fullRevision} revisionItem={revisionItem} />;
+            return <table cellPadding="10">
+                <tr>
+                    <th>{t("revisions.mime")}</th>
+                    <td>{revisionItem.mime}</td>
+                </tr>
+                <tr>
+                    <th>{t("revisions.file_size")}</th>
+                    <td>{revisionItem.contentLength && utils.formatSize(revisionItem.contentLength)}</td>
+                </tr>
+                {fullRevision.content &&
+                    <tr>
+                        <td colspan={2}>
+                            <strong>{t("revisions.preview")}</strong>
+                            <pre className="file-preview-content" style={CODE_STYLE}>{fullRevision.content}</pre>
+                        </td>
+                    </tr>
+                }
+            </table>;
         case "canvas":
         case "mindMap":
         case "mermaid": {
@@ -279,7 +287,7 @@ function RevisionContent({ noteContent, revisionItem, fullRevision, showDiff }:
                 style={IMAGE_STYLE} />;
         }
         default:
-            return <>{t("revisions.preview_not_available")}</>;
+            return <>{t("revisions.preview_not_available")}</>
     }
 }
 
@@ -290,7 +298,7 @@ function RevisionContentText({ content }: { content: string | Buffer<ArrayBuffer
             renderMathInElement(contentRef.current, { trust: true });
         }
     }, [content]);
-    return <RawHtmlBlock containerRef={contentRef} className="ck-content" html={content as string} />;
+    return <div ref={contentRef} className="ck-content" dangerouslySetInnerHTML={{ __html: content as string }}></div>
 }
 
 function RevisionContentDiff({ noteContent, itemContent, itemType }: {
@@ -322,9 +330,9 @@ function RevisionContentDiff({ noteContent, itemContent, itemType }: {
                 return `<span class="revision-diff-added">${utils.escapeHtml(part.value)}</span>`;
             } else if (part.removed) {
                 return `<span class="revision-diff-removed">${utils.escapeHtml(part.value)}</span>`;
+            } else {
+                return utils.escapeHtml(part.value);
             }
-            return utils.escapeHtml(part.value);
-
         }).join("");
 
         if (contentRef.current) {
@@ -332,7 +340,7 @@ function RevisionContentDiff({ noteContent, itemContent, itemType }: {
         }
     }, [noteContent, itemContent, itemType]);
 
-    return <div ref={contentRef} className="ck-content" style={{ whiteSpace: "pre-wrap" }} />;
+    return <div ref={contentRef} className="ck-content" style={{ whiteSpace: "pre-wrap" }}></div>;
 }
 
 function RevisionFooter({ note }: { note?: FNote }) {
@@ -340,7 +348,7 @@ function RevisionFooter({ note }: { note?: FNote }) {
         return <></>;
     }
 
-    let revisionsNumberLimit: number | string = parseInt(note?.getLabelValue("versioningLimit") ?? "", 10);
+    let revisionsNumberLimit: number | string = parseInt(note?.getLabelValue("versioningLimit") ?? "");
     if (!Number.isInteger(revisionsNumberLimit)) {
         revisionsNumberLimit = options.getInt("revisionSnapshotNumberLimit") ?? 0;
     }
@@ -362,67 +370,10 @@ function RevisionFooter({ note }: { note?: FNote }) {
     </>;
 }
 
-function FilePreview({ revisionItem, fullRevision }: { revisionItem: RevisionItem, fullRevision: RevisionPojo }) {
-    return (
-        <div className="revision-file-preview">
-            <table className="file-preview-table">
-                <tbody>
-                    <tr>
-                        <th>{t("revisions.mime")}</th>
-                        <td>{revisionItem.mime}</td>
-                    </tr>
-                    <tr>
-                        <th>{t("revisions.file_size")}</th>
-                        <td>{revisionItem.contentLength && utils.formatSize(revisionItem.contentLength)}</td>
-                    </tr>
-                </tbody>
-            </table>
-
-            <div class="revision-file-preview-content">
-                <FilePreviewInner revisionItem={revisionItem} fullRevision={fullRevision} />
-            </div>
-        </div>
-    );
-}
-
-function FilePreviewInner({ revisionItem, fullRevision }: { revisionItem: RevisionItem, fullRevision: RevisionPojo }) {
-    if (revisionItem.mime.startsWith("audio/")) {
-        return (
-            <audio
-                src={`api/revisions/${revisionItem.revisionId}/download`}
-                controls
-            />
-        );
-    }
-
-    if (revisionItem.mime.startsWith("video/")) {
-        return (
-            <video
-                src={`api/revisions/${revisionItem.revisionId}/download`}
-                controls
-            />
-        );
-    }
-
-    if (revisionItem.mime === "application/pdf") {
-        return (
-            <PdfViewer
-                pdfUrl={`../../api/revisions/${revisionItem.revisionId}/download`}
-            />
-        );
-    }
-
-    if (fullRevision.content) {
-        return <pre className="file-preview-content" style={CODE_STYLE}>{fullRevision.content}</pre>;
-    }
-
-    return t("revisions.preview_not_available");
-}
-
 async function getNote(noteId?: string | null) {
     if (noteId) {
         return await froca.getNote(noteId);
+    } else {
+        return appContext.tabManager.getActiveContextNote();
     }
-    return appContext.tabManager.getActiveContextNote();
-
 }

apps/client/src/widgets/launch_bar/LauncherContainer.tsx

@@ -1,18 +1,17 @@
 import { useCallback, useLayoutEffect, useState } from "preact/hooks";
-
 import FNote from "../../entities/fnote";
 import froca from "../../services/froca";
 import { isDesktop, isMobile } from "../../services/utils";
+import CalendarWidget from "./CalendarWidget";
+import SpacerWidget from "./SpacerWidget";
+import BookmarkButtons from "./BookmarkButtons";
+import ProtectedSessionStatusWidget from "./ProtectedSessionStatusWidget";
+import SyncStatus from "./SyncStatus";
+import HistoryNavigationButton from "./HistoryNavigation";
+import { AiChatButton, CommandButton, CustomWidget, NoteLauncher, QuickSearchLauncherWidget, ScriptLauncher, TodayLauncher } from "./LauncherDefinitions";
 import { useTriliumEvent } from "../react/hooks";
 import { onWheelHorizontalScroll } from "../widget_utils";
-import BookmarkButtons from "./BookmarkButtons";
-import CalendarWidget from "./CalendarWidget";
-import HistoryNavigationButton from "./HistoryNavigation";
 import { LaunchBarContext } from "./launch_bar_widgets";
-import { AiChatButton, CommandButton, CustomWidget, NoteLauncher, QuickSearchLauncherWidget, ScriptLauncher, TodayLauncher } from "./LauncherDefinitions";
-import ProtectedSessionStatusWidget from "./ProtectedSessionStatusWidget";
-import SpacerWidget from "./SpacerWidget";
-import SyncStatus from "./SyncStatus";
 
 export default function LauncherContainer({ isHorizontalLayout }: { isHorizontalLayout: boolean }) {
     const childNotes = useLauncherChildNotes();
@@ -35,19 +34,18 @@ export default function LauncherContainer({ isHorizontalLayout }: { isHorizontal
             }}>
                 {childNotes?.map(childNote => {
                     if (childNote.type !== "launcher") {
-                        console.warn(`Note '${childNote.noteId}' '${childNote.title}' is not a launcher even though it's in the launcher subtree`);
-                        return false;
+                        throw new Error(`Note '${childNote.noteId}' '${childNote.title}' is not a launcher even though it's in the launcher subtree`);
                     }
 
                     if (!isDesktop() && childNote.isLabelTruthy("desktopOnly")) {
                         return false;
                     }
 
-                    return <Launcher key={childNote.noteId} note={childNote} isHorizontalLayout={isHorizontalLayout} />;
+                    return <Launcher key={childNote.noteId} note={childNote} isHorizontalLayout={isHorizontalLayout} />
                 })}
             </LaunchBarContext.Provider>
         </div>
-    );
+    )
 }
 
 function Launcher({ note, isHorizontalLayout }: { note: FNote, isHorizontalLayout: boolean }) {
@@ -74,7 +72,7 @@ function initBuiltinWidget(note: FNote, isHorizontalLayout: boolean) {
     const builtinWidget = note.getLabelValue("builtinWidget");
     switch (builtinWidget) {
         case "calendar":
-            return <CalendarWidget launcherNote={note} />;
+            return <CalendarWidget launcherNote={note} />
         case "spacer":
             // || has to be inside since 0 is a valid value
             const baseSize = parseInt(note.getLabelValue("baseSize") || "40");
@@ -88,15 +86,15 @@ function initBuiltinWidget(note: FNote, isHorizontalLayout: boolean) {
         case "syncStatus":
             return <SyncStatus />;
         case "backInHistoryButton":
-            return <HistoryNavigationButton launcherNote={note} command="backInNoteHistory" />;
+            return <HistoryNavigationButton launcherNote={note} command="backInNoteHistory" />
         case "forwardInHistoryButton":
-            return <HistoryNavigationButton launcherNote={note} command="forwardInNoteHistory" />;
+            return <HistoryNavigationButton launcherNote={note} command="forwardInNoteHistory" />
         case "todayInJournal":
-            return <TodayLauncher launcherNote={note} />;
+            return <TodayLauncher launcherNote={note} />
         case "quickSearch":
-            return <QuickSearchLauncherWidget />;
+            return <QuickSearchLauncherWidget />
         case "aiChatLauncher":
-            return <AiChatButton launcherNote={note} />;
+            return <AiChatButton launcherNote={note} />
         default:
             throw new Error(`Unrecognized builtin widget ${builtinWidget} for launcher ${note.noteId} "${note.title}"`);
     }