Merge branch 'develop' into Icon_improvements

2025-08-10 10:22:29 +08:00 · 2024-09-09 14:08:27 +08:00 · 2024-09-09 14:08:27 +08:00 · d66c07717c
commit d66c07717c
parent 89e073bf28 fb28b9d36d
47 changed files with 907 additions and 304 deletions
--- a/.github/workflows/main-docker-alpine.yml
+++ b/.github/workflows/main-docker-alpine.yml
@ -1,14 +1,4 @@
 on:
-  push:
-    branches:
-      - "develop"
-      - "feature/update**"
-      - "feature/server_esm**"
-    paths-ignore:
-      - "docs/**"
-      - "bin/**"
-    tags:
-      - "v*"
  workflow_dispatch:  

 env:
--- a/.github/workflows/main-docker.yml
+++ b/.github/workflows/main-docker.yml
@ -16,7 +16,7 @@ env:
  DOCKERHUB_REGISTRY: docker.io
  IMAGE_NAME: ${{ github.repository }}
  TEST_TAG: triliumnext/notes:test
-  PLATFORMS: linux/arm64,linux/arm/v7
+  PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7

 jobs:
  test_docker:
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -2,14 +2,11 @@ name: Main
 on:
  push:
    branches:
-      - "develop"
      - "feature/update**"
      - "feature/server_esm**"
    paths-ignore:
      - "docs/**"
      - ".github/workflows/main-docker.yml"
-    tags:
-      - "v*"
  workflow_dispatch:    

 concurrency:
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,95 @@
+name: Release
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:    
+permissions:
+  contents: write
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  make-electron:
+    name: Make Electron
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x64, arm64]
+        os:
+          - name: macos
+            image: macos-latest
+            extension: dmg
+          - name: linux
+            image: ubuntu-latest
+            extension: deb
+          - name: windows
+            image: windows-latest
+            extension: exe
+    runs-on: ${{ matrix.os.image }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - name: Set up Python for appdmg to be installed
+        if: ${{ matrix.os.name == 'macos' }}
+        run: brew install python-setuptools
+      - name: Install dependencies
+        run: npm ci
+      - name: Update build info
+        run: npm run update-build-info
+      - name: Run electron-forge
+        run: npm run make-electron -- --arch=${{ matrix.arch }}
+      - name: Prepare artifacts (Unix)
+        if: runner.os != 'windows'
+        run: |
+          mkdir -p upload
+          file=$(find out/make -name '*.zip' -print -quit)
+          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
+          file=$(find out/make -name '*.${{ matrix.os.extension }}' -print -quit)
+          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"
+      - name: Prepare artifacts (Windows)
+        if: runner.os == 'windows'
+        run: |
+          mkdir upload
+          $file = Get-ChildItem -Path out/make -Filter '*.zip' -Recurse | Select-Object -First 1
+          Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
+          $file = Get-ChildItem -Path out/make -Filter '*.${{ matrix.os.extension }}' -Recurse | Select-Object -First 1
+          Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"      
+      - name: Publish release
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          fail_on_unmatched_files: true
+          files: upload/*.*
+  build_linux_server-x64:
+    name: Build Linux Server x86_64
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up node & dependencies
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "npm"
+      - name: Install dependencies
+        run: npm ci
+      - name: Run Linux server build (x86_64)
+        run: |
+          npm run update-build-info
+          ./bin/build-server.sh
+      - name: Prepare artifacts
+        if: runner.os != 'windows'
+        run: |
+          mkdir -p upload
+          file=$(find dist -name '*.tar.xz' -print -quit)
+          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-server-linux-x64.tar.xz"
+      - name: Publish release
+        uses: softprops/action-gh-release@v2
+        with:
+          draft: true
+          fail_on_unmatched_files: true
+          files: upload/*.*
--- a/.vscode/i18n-ally-custom-framework.yml
+++ b/.vscode/i18n-ally-custom-framework.yml
@ -3,6 +3,7 @@
 languageIds:
  - javascript
  - typescript
+  - html

 # An array of RegExes to find the key usage. **The key should be captured in the first match group**.
 # You should unescape RegEx strings in order to fit in the YAML file
@ -25,6 +26,7 @@ scopeRangeRegex: "useTranslation\\(\\s*\\[?\\s*['\"`](.*?)['\"`]"
 refactorTemplates:
  - t("$1")
  - ${t("$1")}
+  - <%= t("$1") %>


 # If set to true, only enables this custom framework (will disable all built-in frameworks)
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -6,7 +6,8 @@
    "i18n-ally.sourceLanguage": "en",
    "i18n-ally.keystyle": "nested",
    "i18n-ally.localesPaths": [
-        "./src/public/translations"
+        "./src/public/translations",
+        "./translations"
    ],
    "[jsonc]": {
        "editor.defaultFormatter": "vscode.json-language-features"
--- a/README.es.md
+++ b/README.es.md
@ -18,7 +18,7 @@ No hay pasos de migración especiales para migrar de una instancia de zadam/Tril

 ## 💬 Discuta con nosotros

-Siéntase libre de unirse a nuestras conversaciones oficiales. ¡Nos encantaría escuchar de las características, sugerencias o problemas pueda tener!
+Siéntase libre de unirse a nuestras conversaciones oficiales. ¡Nos encantaría escuchar de las características, sugerencias o problemas que pueda tener!

 - [Matrix](https://matrix.to/#/#triliumnext:matrix.org) (Para discusiones síncronas)
  - La sala `General` es replicada a [XMPP](xmpp:discuss@trilium.thisgreat.party?join)
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@ -22,7 +22,7 @@ rm -r $PKG_DIR/node/lib/node_modules/npm
 rm -r $PKG_DIR/node/include/node

 rm -r $PKG_DIR/node_modules/electron*
-rm -r $PKG_DIR/electron.js
+rm -r $PKG_DIR/electron*.js

 printf "#!/bin/sh\n./node/bin/node src/www" > $PKG_DIR/trilium.sh
 chmod 755 $PKG_DIR/trilium.sh
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@ -37,11 +37,11 @@ for f in 'package.json' 'package-lock.json' 'README.md' 'LICENSE' 'config-sample
 done

 # Patch package.json main
-sed -i 's/.\/dist\/electron.js/electron.js/g' "$DIR/package.json"
+sed -i 's/.\/dist\/electron-main.js/electron-main.js/g' "$DIR/package.json"

 script_dir=$(realpath $(dirname $0))
 cp -R "$script_dir/../build/src" "$DIR"
-cp "$script_dir/../build/electron.js" "$DIR"
+cp "$script_dir/../build/electron-main.js" "$DIR"

 # run in subshell (so we return to original dir)
 (cd $DIR && npm install --omit=dev)
--- a/bin/release.sh
+++ b/bin/release.sh
@ -47,35 +47,3 @@ echo "Tagging commit with $TAG"

 git tag $TAG
 git push origin $TAG
-
-bin/build.sh
-
-LINUX_X64_BUILD=trilium-linux-x64-$VERSION.tar.xz
-DEBIAN_X64_BUILD=trilium_${VERSION}_amd64.deb
-WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.zip
-MAC_X64_BUILD=trilium-mac-x64-$VERSION.zip
-MAC_ARM64_BUILD=trilium-mac-arm64-$VERSION.zip
-SERVER_BUILD=trilium-linux-x64-server-$VERSION.tar.xz
-
-echo "Creating release in GitHub"
-
-EXTRA=
-
-if [[ $TAG == *"beta"* ]]; then
-  EXTRA=--prerelease
-fi
-
-if [ ! -z "$GITHUB_CLI_AUTH_TOKEN" ]; then
-  echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token
-fi
-
-gh release create -d "$TAG" \
-    --title "$TAG release" \
-    --notes "" \
-    $EXTRA \
-    "dist/$DEBIAN_X64_BUILD" \
-    "dist/$LINUX_X64_BUILD" \
-    "dist/$WINDOWS_X64_BUILD" \
-    "dist/$MAC_X64_BUILD" \
-    "dist/$MAC_ARM64_BUILD" \
-    "dist/$SERVER_BUILD"
--- a/electron-main.ts
+++ b/electron-main.ts
@ -0,0 +1,4 @@
+import { initializeTranslations } from "./src/services/i18n.js";
+
+await initializeTranslations();
+await import("./electron.js")
--- a/electron.ts
+++ b/electron.ts
@ -70,4 +70,4 @@ electron.app.on("will-quit", () => {
 // this is to disable electron warning spam in the dev console (local development only)
 process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";

-await import('./src/www.js');
+await import('./src/main.js');
--- a/nodemon.json
+++ b/nodemon.json
@ -3,7 +3,10 @@
    "ignore": [".git", "node_modules/**/node_modules", "src/public/"],
    "verbose": false,
    "exec": "tsx",
-    "watch": ["src/"],
+    "watch": [
+        "src/",
+        "translations/"
+    ],
    "signal": "SIGTERM",
    "env": {
        "NODE_ENV": "development"
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "trilium",
-  "version": "0.90.4",
+  "version": "0.90.6-beta",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "trilium",
-      "version": "0.90.4",
+      "version": "0.90.6-beta",
      "license": "AGPL-3.0-only",
      "dependencies": {
        "@braintree/sanitize-url": "^7.1.0",
@ -48,6 +48,7 @@
        "http-proxy-agent": "7.0.2",
        "https-proxy-agent": "^7.0.5",
        "i18next": "^23.14.0",
+        "i18next-fs-backend": "^2.3.2",
        "i18next-http-backend": "^2.6.1",
        "image-type": "4.1.0",
        "ini": "^4.1.3",
@ -98,7 +99,7 @@
        "yauzl": "^3.1.3"
      },
      "bin": {
-        "trilium": "src/www.js"
+        "trilium": "src/main.js"
      },
      "devDependencies": {
        "@electron-forge/cli": "^7.4.0",
@ -9660,6 +9661,11 @@
        "@babel/runtime": "^7.23.2"
      }
    },
+    "node_modules/i18next-fs-backend": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/i18next-fs-backend/-/i18next-fs-backend-2.3.2.tgz",
+      "integrity": "sha512-LIwUlkqDZnUI8lnUxBnEj8K/FrHQTT/Sc+1rvDm9E8YvvY5YxzoEAASNx+W5M9DfD5s77lI5vSAFWeTp26B/3Q=="
+    },
    "node_modules/i18next-http-backend": {
      "version": "2.6.1",
      "resolved": "https://registry.npmjs.org/i18next-http-backend/-/i18next-http-backend-2.6.1.tgz",
--- a/package.json
+++ b/package.json
@ -2,9 +2,9 @@
  "name": "trilium",
  "productName": "TriliumNext Notes",
  "description": "Build your personal knowledge base with TriliumNext Notes",
-  "version": "0.90.4",
+  "version": "0.90.6-beta",
  "license": "AGPL-3.0-only",
-  "main": "./dist/electron.js",
+  "main": "./dist/electron-main.js",
  "author": {
    "name": "TriliumNext Notes Team",
    "email": "contact@eliandoran.me",
@ -12,7 +12,7 @@
  },
  "copyright": "",
  "bin": {
-    "trilium": "src/www.js"
+    "trilium": "src/main.js"
  },
  "repository": {
    "type": "git",
@ -20,12 +20,12 @@
  },
  "type": "module",
  "scripts": {
-    "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts",
-    "start-server-safe": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts",
-    "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/www.ts",
-    "start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/www.ts",
+    "start-server": "cross-env TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts",
+    "start-server-safe": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts",
+    "start-server-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 nodemon src/main.ts",
+    "start-test-server": "npm run switch-server; rimraf ./data-test; cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data-test TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev TRILIUM_PORT=9999 ts-node src/main.ts",
    "qstart-server": "npm run switch-server && npm run start-server",
-    "start-electron": "npm run prepare-dist && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron.js --inspect=5858 .",
+    "start-electron": "npm run prepare-dist && cross-env TRILIUM_SAFE_MODE=1 TRILIUM_DATA_DIR=./data TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 TRILIUM_ENV=dev electron ./dist/electron-main.js --inspect=5858 .",
    "start-electron-no-dir": "cross-env TRILIUM_SAFE_MODE=1 TRILIUM_ENV=dev TRILIUM_SYNC_SERVER_HOST=http://tsyncserver:4000 electron --inspect=5858 .",
    "qstart-electron": "npm run switch-electron && npm run start-electron",
    "switch-server": "rimraf ./node_modules/better-sqlite3 && npm install",
@ -43,9 +43,9 @@
    "prepare-dist": "rimraf ./dist && tsc && tsx ./bin/copy-dist.ts",
    "update-build-info": "tsx bin/update-build-info.ts",
    "errors": "tsc --watch --noEmit",
-    "integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/www.ts",
-    "integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/www.ts",
-    "integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/www.ts",
+    "integration-edit-db": "cross-env TRILIUM_INTEGRATION_TEST=edit TRILIUM_PORT=8081 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
+    "integration-mem-db": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
+    "integration-mem-db-dev": "cross-env TRILIUM_INTEGRATION_TEST=memory TRILIUM_PORT=8082 TRILIUM_ENV=dev TRILIUM_DATA_DIR=./integration-tests/db nodemon src/main.ts",
    "generate-document": "cross-env nodemon src/tools/generate_document.ts 1000"
  },
  "dependencies": {
@ -88,6 +88,7 @@
    "http-proxy-agent": "7.0.2",
    "https-proxy-agent": "^7.0.5",
    "i18next": "^23.14.0",
+    "i18next-fs-backend": "^2.3.2",
    "i18next-http-backend": "^2.6.1",
    "image-type": "4.1.0",
    "ini": "^4.1.3",
--- a/src/app.ts
+++ b/src/app.ts
@ -14,6 +14,7 @@ import custom from "./routes/custom.js";
 import error_handlers from "./routes/error_handlers.js";
 import { startScheduledCleanup } from "./services/erase.js";
 import sql_init from "./services/sql_init.js";
+import { t } from "i18next";

 await import('./services/handlers.js');
 await import('./becca/becca_loader.js');
@ -29,6 +30,11 @@ sql_init.initializeDb();
 app.set('views', path.join(scriptDir, 'views'));
 app.set('view engine', 'ejs');

+app.use((req, res, next) => {
+    res.locals.t = t;
+    return next();
+});
+
 if (!utils.isElectron()) {
    app.use(compression()); // HTTP compression
 }
--- a/src/main.ts
+++ b/src/main.ts
@ -0,0 +1,13 @@
+/*
+ * Make sure not to import any modules that depend on localized messages via i18next here, as the initializations
+ * are loaded later and will result in an empty string.
+ */
+
+import { initializeTranslations } from "./services/i18n.js";
+
+async function startApplication() {
+    await import("./www.js");
+}
+
+await initializeTranslations();
+await startApplication();
--- a/src/public/app/menus/tree_context_menu.js
+++ b/src/public/app/menus/tree_context_menu.js
@ -8,6 +8,7 @@ import noteTypesService from "../services/note_types.js";
 import server from "../services/server.js";
 import toastService from "../services/toast.js";
 import dialogService from "../services/dialog.js";
+import { t } from "../services/i18n.js";

 export default class TreeContextMenu {
    /**
@ -48,55 +49,55 @@ export default class TreeContextMenu {
        const insertNoteAfterEnabled = isNotRoot && !isHoisted && parentNotSearch;

        return [
-            { title: 'Open in a new tab <kbd>Ctrl+Click</kbd>', command: "openInTab", uiIcon: "bx bx-empty", enabled: noSelectedNotes },
-            { title: 'Open in a new split', command: "openNoteInSplit", uiIcon: "bx bx-dock-right", enabled: noSelectedNotes },
-            { title: 'Insert note after <kbd data-command="createNoteAfter"></kbd>', command: "insertNoteAfter", uiIcon: "bx bx-plus",
+            { title: `${t("tree-context-menu.open-in-a-new-tab")} <kbd>Ctrl+Click</kbd>`, command: "openInTab", uiIcon: "bx bx-empty", 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.insert-note-after")} <kbd data-command="createNoteAfter"></kbd>`, command: "insertNoteAfter", uiIcon: "bx bx-plus",
                items: insertNoteAfterEnabled ? await noteTypesService.getNoteTypeItems("insertNoteAfter") : null,
                enabled: insertNoteAfterEnabled && noSelectedNotes && notOptions },
-            { title: 'Insert child note <kbd data-command="createNoteInto"></kbd>', command: "insertChildNote", uiIcon: "bx bx-plus",
+            { title: `${t("tree-context-menu.insert-child-note")} <kbd data-command="createNoteInto"></kbd>`, command: "insertChildNote", uiIcon: "bx bx-plus",
                items: notSearch ? await noteTypesService.getNoteTypeItems("insertChildNote") : null,
                enabled: notSearch && noSelectedNotes && notOptions },
-            { title: 'Delete <kbd data-command="deleteNotes"></kbd>', command: "deleteNotes", uiIcon: "bx bx-trash",
+            { title: `${t("tree-context-menu.delete")} <kbd data-command="deleteNotes"></kbd>`, command: "deleteNotes", uiIcon: "bx bx-trash",
                enabled: isNotRoot && !isHoisted && parentNotSearch && notOptions },
            { title: "----" },
-            { title: 'Search in subtree <kbd data-command="searchInSubtree"></kbd>', command: "searchInSubtree", uiIcon: "bx bx-search",
+            { title: `${t("tree-context-menu.search-in-subtree")} <kbd data-command="searchInSubtree"></kbd>`, command: "searchInSubtree", uiIcon: "bx bx-search",
                enabled: notSearch && noSelectedNotes },
            isHoisted ? null : { title: 'Hoist note <kbd data-command="toggleNoteHoisting"></kbd>', command: "toggleNoteHoisting", uiIcon: "bx bx-empty", enabled: noSelectedNotes && notSearch },
            !isHoisted || !isNotRoot ? null : { title: 'Unhoist note <kbd data-command="toggleNoteHoisting"></kbd>', command: "toggleNoteHoisting", uiIcon: "bx bx-door-open" },
-            { title: 'Edit branch prefix <kbd data-command="editBranchPrefix"></kbd>', command: "editBranchPrefix", uiIcon: "bx bx-empty",
+            { title: `${t("tree-context-menu.edit-branch-prefix")} <kbd data-command="editBranchPrefix"></kbd>`, command: "editBranchPrefix", uiIcon: "bx bx-empty",
                enabled: isNotRoot && parentNotSearch && noSelectedNotes && notOptions },
-            { title: "Advanced", uiIcon: "bx bx-empty", enabled: true, items: [
-                    { title: 'Expand subtree <kbd data-command="expandSubtree"></kbd>', command: "expandSubtree", uiIcon: "bx bx-expand", enabled: noSelectedNotes },
-                    { title: 'Collapse subtree <kbd data-command="collapseSubtree"></kbd>', command: "collapseSubtree", uiIcon: "bx bx-collapse", enabled: noSelectedNotes },
-                    { title: 'Sort by ... <kbd data-command="sortChildNotes"></kbd>', command: "sortChildNotes", uiIcon: "bx bx-empty", enabled: noSelectedNotes && notSearch },
-                    { title: 'Recent changes in subtree', command: "recentChangesInSubtree", uiIcon: "bx bx-history", enabled: noSelectedNotes && notOptions },
-                    { title: 'Convert to attachment', command: "convertNoteToAttachment", uiIcon: "bx bx-empty", enabled: isNotRoot && !isHoisted && notOptions },
-                    { title: 'Copy note path to clipboard', command: "copyNotePathToClipboard", uiIcon: "bx bx-empty", enabled: true }
+            { title: t("tree-context-menu.advanced"), uiIcon: "bx bx-empty", enabled: true, items: [
+                    { title: `${t("tree-context-menu.expand-subtree")} <kbd data-command="expandSubtree"></kbd>`, command: "expandSubtree", uiIcon: "bx bx-expand", enabled: noSelectedNotes },
+                    { title: `${t("tree-context-menu.collapse-subtree")} <kbd data-command="collapseSubtree"></kbd>`, command: "collapseSubtree", uiIcon: "bx bx-collapse", enabled: noSelectedNotes },
+                    { title: `${t("tree-context-menu.sort-by")} <kbd data-command="sortChildNotes"></kbd>`, command: "sortChildNotes", uiIcon: "bx bx-empty", enabled: noSelectedNotes && notSearch },
+                    { title: t("tree-context-menu.recent-changes-in-subtree"), command: "recentChangesInSubtree", uiIcon: "bx bx-history", enabled: noSelectedNotes && notOptions },
+                    { title: t("tree-context-menu.convert-to-attachment"), command: "convertNoteToAttachment", uiIcon: "bx bx-empty", enabled: isNotRoot && !isHoisted && notOptions },
+                    { title: t("tree-context-menu.copy-note-path-to-clipboard"), command: "copyNotePathToClipboard", uiIcon: "bx bx-empty", enabled: true }
                ] },
            { title: "----" },
-            { title: "Protect subtree", command: "protectSubtree", uiIcon: "bx bx-check-shield", enabled: noSelectedNotes },
-            { title: "Unprotect subtree", command: "unprotectSubtree", uiIcon: "bx bx-shield", enabled: noSelectedNotes },
+            { title: t("tree-context-menu.protect-subtree"), command: "protectSubtree", uiIcon: "bx bx-check-shield", enabled: noSelectedNotes },
+            { title: t("tree-context-menu.unprotect-subtree"), command: "unprotectSubtree", uiIcon: "bx bx-shield", enabled: noSelectedNotes },
            { title: "----" },
-            { title: 'Copy / clone <kbd data-command="copyNotesToClipboard"></kbd>', command: "copyNotesToClipboard", uiIcon: "bx bx-copy",
+            { title: `${t("tree-context-menu.copy-clone")} <kbd data-command="copyNotesToClipboard"></kbd>`, command: "copyNotesToClipboard", uiIcon: "bx bx-copy",
                enabled: isNotRoot && !isHoisted },
-            { title: 'Clone to ... <kbd data-command="cloneNotesTo"></kbd>', command: "cloneNotesTo", uiIcon: "bx bx-empty",
+            { title: `${t("tree-context-menu.clone-to")} <kbd data-command="cloneNotesTo"></kbd>`, command: "cloneNotesTo", uiIcon: "bx bx-empty",
                enabled: isNotRoot && !isHoisted },
-            { title: 'Cut <kbd data-command="cutNotesToClipboard"></kbd>', command: "cutNotesToClipboard", uiIcon: "bx bx-cut",
+            { title: `${t("tree-context-menu.cut")} <kbd data-command="cutNotesToClipboard"></kbd>`, command: "cutNotesToClipboard", uiIcon: "bx bx-cut",
                enabled: isNotRoot && !isHoisted && parentNotSearch },
-            { title: 'Move to ... <kbd data-command="moveNotesTo"></kbd>', command: "moveNotesTo", uiIcon: "bx bx-empty",
+            { title: `${t("tree-context-menu.move-to")} <kbd data-command="moveNotesTo"></kbd>`, command: "moveNotesTo", uiIcon: "bx bx-empty",
                enabled: isNotRoot && !isHoisted && parentNotSearch },
-            { title: 'Paste into <kbd data-command="pasteNotesFromClipboard"></kbd>', command: "pasteNotesFromClipboard", uiIcon: "bx bx-paste",
+            { title: `${t("tree-context-menu.paste-into")} <kbd data-command="pasteNotesFromClipboard"></kbd>`, command: "pasteNotesFromClipboard", uiIcon: "bx bx-paste",
                enabled: !clipboard.isClipboardEmpty() && notSearch && noSelectedNotes },
-            { title: 'Paste after', command: "pasteNotesAfterFromClipboard", uiIcon: "bx bx-paste",
+            { title: t("tree-context-menu.paste-after"), command: "pasteNotesAfterFromClipboard", uiIcon: "bx bx-paste",
                enabled: !clipboard.isClipboardEmpty() && isNotRoot && !isHoisted && parentNotSearch && noSelectedNotes },
-            { title: `Duplicate subtree <kbd data-command="duplicateSubtree">`, command: "duplicateSubtree", uiIcon: "bx bx-empty",
+            { title: `${t("tree-context-menu.duplicate-subtree")} <kbd data-command="duplicateSubtree">`, command: "duplicateSubtree", uiIcon: "bx bx-empty",
                enabled: parentNotSearch && isNotRoot && !isHoisted && notOptions },
            { title: "----" },
-            { title: "Export", command: "exportNote", uiIcon: "bx bx-empty",
+            { title: t("tree-context-menu.export"), command: "exportNote", uiIcon: "bx bx-empty",
                enabled: notSearch && noSelectedNotes && notOptions },
-            { title: "Import into note", command: "importIntoNote", uiIcon: "bx bx-empty",
+            { title: t("tree-context-menu.import-into-note"), command: "importIntoNote", uiIcon: "bx bx-empty",
                enabled: notSearch && noSelectedNotes && notOptions },
-            { title: "Apply bulk actions", command: "openBulkActionsDialog", uiIcon: "bx bx-list-plus",
+            { title: t("tree-context-menu.apply-bulk-actions"), command: "openBulkActionsDialog", uiIcon: "bx bx-list-plus",
                enabled: true }
        ].filter(row => row !== null);
    }
--- a/src/public/app/services/note_types.js
+++ b/src/public/app/services/note_types.js
@ -1,19 +1,20 @@
 import server from "./server.js";
 import froca from "./froca.js";
+import { t } from "./i18n.js";

 async function getNoteTypeItems(command) {
    const items = [
-        { title: "Text", command: command, type: "text", uiIcon: "bx bx-note" },
-        { title: "Code", command: command, type: "code", uiIcon: "bx bx-code" },
-        { title: "Saved Search", command: command, type: "search", uiIcon: "bx bx-file-find" },
-        { title: "Relation Map", command: command, type: "relationMap", uiIcon: "bx bxl-graphql" },
-        { title: "Note Map", command: command, type: "noteMap", uiIcon: "bx bxl-graphql" },
-        { title: "Render Note", command: command, type: "render", uiIcon: "bx bx-extension" },
-        { title: "Book", command: command, type: "book", uiIcon: "bx bx-book" },
-        { title: "Mermaid Diagram", command: command, type: "mermaid", uiIcon: "bx bx-selection" },
-        { title: "Canvas", command: command, type: "canvas", uiIcon: "bx bx-pen" },
-        { title: "Web View", command: command, type: "webView", uiIcon: "bx bx-globe-alt" },
-        { title: "Mind Map", command, type: "mindMap", uiIcon: "bx bx-sitemap" }
+        { title: t("note_types.text"), command: command, type: "text", uiIcon: "bx bx-note" },
+        { title: t("note_types.code"), command: command, type: "code", uiIcon: "bx bx-code" },
+        { title: t("note_types.saved-search"), command: command, type: "search", uiIcon: "bx bx-file-find" },
+        { title: t("note_types.relation-map"), command: command, type: "relationMap", uiIcon: "bx bx-map-alt" },
+        { title: t("note_types.note-map"), command: command, type: "noteMap", uiIcon: "bx bxl-graphql" },
+        { title: t("note_types.render-note"), command: command, type: "render", uiIcon: "bx bx-extension" },
+        { title: t("note_types.book"), command: command, type: "book", uiIcon: "bx bx-book" },
+        { title: t("note_types.mermaid-diagram"), command: command, type: "mermaid", uiIcon: "bx bx-selection" },
+        { title: t("note_types.canvas"), command: command, type: "canvas", uiIcon: "bx bx-pen" },
+        { title: t("note_types.web-view"), command: command, type: "webView", uiIcon: "bx bx-globe-alt" },
+        { title: t("note_types.mind-map"), command, type: "mindMap", uiIcon: "bx bx-sitemap" }
    ];

    const templateNoteIds = await server.get("search-templates");
--- a/src/public/app/widgets/buttons/note_actions.js
+++ b/src/public/app/widgets/buttons/note_actions.js
@ -17,7 +17,7 @@ const TPL = `
    }  
    
    .note-actions .dropdown-menu {
-        width: 15em;
+        min-width: 15em;
    }
    
    .note-actions .dropdown-item[disabled], .note-actions .dropdown-item[disabled]:hover {
--- a/src/public/app/widgets/note_map.js
+++ b/src/public/app/widgets/note_map.js
@ -6,6 +6,7 @@ import appContext from "../components/app_context.js";
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
 import linkContextMenuService from "../menus/link_context_menu.js";
 import utils from "../services/utils.js";
+import { t } from "../services/i18n.js";

 const esc = utils.escapeHtml;

@ -30,8 +31,8 @@ const TPL = `<div class="note-map-widget" style="position: relative;">
    </style>
    
    <div class="btn-group btn-group-sm map-type-switcher" role="group">
-      <button type="button" class="btn bx bx-network-chart" title="Link Map" data-type="link"></button>
-      <button type="button" class="btn bx bx-sitemap" title="Tree map" data-type="tree"></button>
+      <button type="button" class="btn bx bx-network-chart" title="${t("note-map.button-link-map")}" data-type="link"></button>
+      <button type="button" class="btn bx bx-sitemap" title="${t("note-map.button-tree-map")}" data-type="tree"></button>
    </div>

    <div class="style-resolver"></div>
--- a/src/public/app/widgets/note_type.js
+++ b/src/public/app/widgets/note_type.js
@ -2,25 +2,26 @@ import server from '../services/server.js';
 import mimeTypesService from '../services/mime_types.js';
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
 import dialogService from "../services/dialog.js";
+import { t } from '../services/i18n.js';

 const NOTE_TYPES = [
-    { type: "file", title: "File", selectable: false },
-    { type: "image", title: "Image", selectable: false },
-    { type: "search", title: "Saved Search", selectable: false },
-    { type: "noteMap", mime: '', title: "Note Map", selectable: false },
-    { type: "launcher", mime: '', title: "Launcher", selectable: false },
-    { type: "doc", mime: '', title: "Doc", selectable: false },
-    { type: "contentWidget", mime: '', title: "Widget", selectable: false },
+    { type: "file", title: t("note_types.file"), selectable: false },
+    { type: "image", title: t("note_types.image"), selectable: false },
+    { type: "search", title: t("note_types.saved-search"), selectable: false },
+    { type: "noteMap", mime: '', title: t("note_types.note-map"), selectable: false },
+    { type: "launcher", mime: '', title: t("note_types.launcher"), selectable: false },
+    { type: "doc", mime: '', title: t("note_types.doc"), selectable: false },
+    { type: "contentWidget", mime: '', title: t("note_types.widget"), selectable: false },

-    { type: "text", mime: "text/html", title: "Text", selectable: true },
-    { type: "relationMap", mime: "application/json", title: "Relation Map", selectable: true },
-    { type: "mindMap", mime: "application/json", "title": "Mind Map", selectable: true },
-    { type: "render", mime: '', title: "Render Note", selectable: true },
-    { type: "canvas", mime: 'application/json', title: "Canvas", selectable: true },
-    { type: "mermaid", mime: 'text/mermaid', title: "Mermaid Diagram", selectable: true },
-    { type: "book", mime: '', title: "Book", selectable: true },
-    { type: "webView", mime: '', title: "Web View", selectable: true },
-    { type: "code", mime: 'text/plain', title: "Code", selectable: true }
+    { type: "text", mime: "text/html", title: t("note_types.text"), selectable: true },
+    { type: "relationMap", mime: "application/json", title: t("note_types.relation-map"), selectable: true },
+    { type: "mindMap", mime: "application/json", "title": t("note_types.mind-map"), selectable: true },
+    { type: "render", mime: '', title: t("note_types.render-note"), selectable: true },
+    { type: "canvas", mime: 'application/json', title: t("note_types.canvas"), selectable: true },
+    { type: "mermaid", mime: 'text/mermaid', title: t("note_types.mermaid-diagram"), selectable: true },
+    { type: "book", mime: '', title: t("note_types.book"), selectable: true },
+    { type: "webView", mime: '', title: t("note_types.web-view"), selectable: true },
+    { type: "code", mime: 'text/plain', title: t("note_types.code"), selectable: true }
 ];

 const NOT_SELECTABLE_NOTE_TYPES = NOTE_TYPES.filter(nt => !nt.selectable).map(nt => nt.type);
--- a/src/public/app/widgets/protected_note_switch.js
+++ b/src/public/app/widgets/protected_note_switch.js
@ -1,3 +1,4 @@
+import { t } from "../services/i18n.js";
 import protectedSessionService from "../services/protected_session.js";
 import SwitchWidget from "./switch.js";

@ -5,11 +6,11 @@ export default class ProtectedNoteSwitchWidget extends SwitchWidget {
    doRender() {
        super.doRender();

-        this.$switchOnName.text("Protect the note");
-        this.$switchOnButton.attr("title", "Note is not protected, click to make it protected");
+        this.$switchOnName.text(t("protect_note.toggle-on"));
+        this.$switchOnButton.attr("title", t("protect_note.toggle-on-hint"));

-        this.$switchOffName.text("Unprotect the note");
-        this.$switchOffButton.attr("title", "Note is protected, click to make it unprotected");
+        this.$switchOffName.text(t("protect_note.toggle-off"));
+        this.$switchOffButton.attr("title", t("protect_note.toggle-off-hint"));
    }

    switchOn() {
--- a/src/public/app/widgets/shared_info.js
+++ b/src/public/app/widgets/shared_info.js
@ -1,6 +1,7 @@
 import NoteContextAwareWidget from "./note_context_aware_widget.js";
 import options from "../services/options.js";
 import attributeService from "../services/attributes.js";
+import { t } from "../services/i18n.js";

 const TPL = `
 <div class="shared-info-widget alert alert-warning">
@ -13,7 +14,7 @@ const TPL = `
        }
    </style>
    
-    <span class="shared-text"></span> <a class="shared-link external"></a>. For help visit <a href="https://triliumnext.github.io/Docs/Wiki/sharing.html">wiki</a>.
+    <span class="shared-text"></span> <a class="shared-link external"></a>. ${t("shared_info.help_link")}
 </div>`;

 export default class SharedInfoWidget extends NoteContextAwareWidget {
@ -36,7 +37,7 @@ export default class SharedInfoWidget extends NoteContextAwareWidget {

        if (syncServerHost) {
            link = `${syncServerHost}/share/${shareId}`;
-            this.$sharedText.text("This note is shared publicly on");
+            this.$sharedText.text(t("shared_info.shared_publicly"));
        }
        else {
            let host = location.host;
@ -47,7 +48,7 @@ export default class SharedInfoWidget extends NoteContextAwareWidget {
            }

            link = `${location.protocol}//${host}${location.pathname}share/${shareId}`;
-            this.$sharedText.text("This note is shared locally on");
+            this.$sharedText.text(t("shared_info.shared_locally"));
        }

        this.$sharedLink.attr("href", link).text(link);
--- a/src/public/app/widgets/shared_switch.js
+++ b/src/public/app/widgets/shared_switch.js
@ -4,6 +4,7 @@ import server from "../services/server.js";
 import utils from "../services/utils.js";
 import syncService from "../services/sync.js";
 import dialogService from "../services/dialog.js";
+import { t } from "../services/i18n.js";

 export default class SharedSwitchWidget extends SwitchWidget {
    isEnabled() {
@ -15,11 +16,11 @@ export default class SharedSwitchWidget extends SwitchWidget {
    doRender() {
        super.doRender();

-        this.$switchOnName.text("Shared");
-        this.$switchOnButton.attr("title", "Share the note");
+        this.$switchOnName.text(t("shared_switch.shared"));
+        this.$switchOnButton.attr("title", t("shared_switch.toggle-on-title"));

-        this.$switchOffName.text("Shared");
-        this.$switchOffButton.attr("title", "Unshare the note");
+        this.$switchOffName.text(t("shared_switch.shared"));
+        this.$switchOffButton.attr("title", t("shared_switch.toggle-off-title"));

        this.$helpButton.attr("data-help-page", "sharing.html").show();
        this.$helpButton.on('click', e => utils.openHelp($(e.target)));
@ -39,9 +40,7 @@ export default class SharedSwitchWidget extends SwitchWidget {
        }

        if (this.note.getParentBranches().length === 1) {
-            const text = "This note exists only as a shared note, unsharing would delete it. Do you want to continue and thus delete this note?";
-
-            if (!await dialogService.confirm(text)) {
+            if (!await dialogService.confirm(t("shared_switch.shared-branch"))) {
                return;
            }
        }
@ -60,7 +59,7 @@ export default class SharedSwitchWidget extends SwitchWidget {
        this.$switchOff.toggle(!!isShared);

        if (switchDisabled) {
-            this.$widget.attr("title", "Note cannot be unshared here because it is shared through inheritance from an ancestor.");
+            this.$widget.attr("title", t("shared_switch.inherited"));
            this.$switchOff.addClass("switch-disabled");
        }
        else {
--- a/src/public/app/widgets/switch.js
+++ b/src/public/app/widgets/switch.js
@ -1,3 +1,4 @@
+import { t } from "../services/i18n.js";
 import NoteContextAwareWidget from "./note_context_aware_widget.js";

 const TPL = `
@ -90,7 +91,7 @@ const TPL = `
        </span>
    </div>
    
-    <button class="switch-help-button" type="button" data-help-page="" title="Open help page" style="display: none;">?</button>
+    <button class="switch-help-button" type="button" data-help-page="" title="${t("open-help-page")}" style="display: none;">?</button>
 </div>`;

 export default class SwitchWidget extends NoteContextAwareWidget {
--- a/src/public/app/widgets/template_switch.js
+++ b/src/public/app/widgets/template_switch.js
@ -1,5 +1,6 @@
 import SwitchWidget from "./switch.js";
 import attributeService from "../services/attributes.js";
+import { t } from "../services/i18n.js";

 /**
 * Switch for the basic properties widget which allows the user to select whether the note is a template or not, which toggles the `#template` attribute.
@ -14,11 +15,11 @@ export default class TemplateSwitchWidget extends SwitchWidget {
    doRender() {
        super.doRender();

-        this.$switchOnName.text("Template");
-        this.$switchOnButton.attr("title", "Make the note a template");
+        this.$switchOnName.text(t("template_switch.template"));
+        this.$switchOnButton.attr("title", t("template_switch.toggle-on-hint"));

        this.$switchOffName.text("Template");
-        this.$switchOffButton.attr("title", "Remove the note as a template");
+        this.$switchOffButton.attr("title", t("template_switch.toggle-off-hint"));

        this.$helpButton.attr("data-help-page", "template.html").show();
        this.$helpButton.on('click', e => utils.openHelp($(e.target)));
--- a/src/public/app/widgets/type_widgets/options/appearance/max_content_width.js
+++ b/src/public/app/widgets/type_widgets/options/appearance/max_content_width.js
@ -9,7 +9,7 @@ const TPL = `
    <p>${t("max_content_width.default_description")}</p>
    
    <div class="form-group row">
-        <div class="col-4">
+        <div class="col-6">
            <label>${t("max_content_width.max_width_label")}</label>
            <input type="number" min="200" step="10" class="max-content-width form-control options-number-input">
        </div>
--- a/src/public/translations/cn/translation.json
+++ b/src/public/translations/cn/translation.json
@ -1023,8 +1023,8 @@
    "title": "下拉菜单可用的MIME文件类型"
  },
  "vim_key_bindings": {
-    "use_vim_keybindings_in_code_notes": "在代码笔记中使用Vim键绑定（无ex模式）",
-    "enable_vim_keybindings": "启用Vim键绑定"
+    "use_vim_keybindings_in_code_notes": "",
+    "enable_vim_keybindings": ""
  },
  "wrap_lines": {
    "wrap_lines_in_code_notes": "代码笔记自动换行",
--- a/src/public/translations/en/translation.json
+++ b/src/public/translations/en/translation.json
@ -1026,8 +1026,8 @@
    "title": "Available MIME types in the dropdown"
  },
  "vim_key_bindings": {
-    "use_vim_keybindings_in_code_notes": "Use vim keybindings in code notes (no ex mode)",
-    "enable_vim_keybindings": "Enable Vim Keybindings"
+    "use_vim_keybindings_in_code_notes": "Vim keybindings",
+    "enable_vim_keybindings": "Enable Vim keybindings in code notes (no ex mode)"
  },
  "wrap_lines": {
    "wrap_lines_in_code_notes": "Wrap lines in code notes",
@ -1244,5 +1244,79 @@
    "note_is_editable": "Note is editable if it's not too long.",
    "note_is_read_only": "Note is read-only, but can be edited with a button click.",
    "note_is_always_editable": "Note is always editable, regardless of its length."
-  }
+  },
+  "note-map": {
+    "button-link-map": "Link Map",
+    "button-tree-map": "Tree map"
+  },
+  "tree-context-menu": {
+    "open-in-a-new-tab": "Open in a new tab",
+    "open-in-a-new-split": "Open in a new split",
+    "insert-note-after": "Insert note after",
+    "insert-child-note": "Insert child note",
+    "delete": "Delete",
+    "search-in-subtree": "Search in subtree",
+    "edit-branch-prefix": "Edit branch prefix",
+    "advanced": "Advanced",
+    "expand-subtree": "Expand subtree",
+    "collapse-subtree": "Collapse subtree",
+    "sort-by": "Sort by...",
+    "recent-changes-in-subtree": "Recent changes in subtree",
+    "convert-to-attachment": "Convert to attachment",
+    "copy-note-path-to-clipboard": "Copy note path to clipboard",
+    "protect-subtree": "Protect subtree",
+    "unprotect-subtree": "Unprotect subtree",
+    "copy-clone": "Copy / clone",
+    "clone-to": "Clone to...",
+    "cut": "Cut",
+    "move-to": "Move to...",
+    "paste-into": "Paste into",
+    "paste-after": "Paste after",
+    "duplicate-subtree": "Duplicate subtree",
+    "export": "Export",
+    "import-into-note": "Import into note",
+    "apply-bulk-actions": "Apply bulk actions"
+  },
+  "shared_info": {
+    "shared_publicly": "This note is shared publicly on",
+    "shared_locally": "This note is shared locally on",
+    "help_link": "For help visit <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki</a>."
+  },
+  "note_types": {
+    "text": "Text",
+    "code": "Code",
+    "saved-search": "Saved Search",
+    "relation-map": "Relation Map",
+    "note-map": "Note Map",
+    "render-note": "Render Note",
+    "book": "Book",
+    "mermaid-diagram": "Mermaid Diagram",
+    "canvas": "Canvas",
+    "web-view": "Web View",
+    "mind-map": "Mind Map",
+    "file": "File",
+    "image": "Image",
+    "launcher": "Launcher",
+    "doc": "Doc",
+    "widget": "Widget"
+  },
+  "protect_note": {
+    "toggle-on": "Protect the note",
+    "toggle-off": "Unprotect the note",
+    "toggle-on-hint": "Note is not protected, click to make it protected",
+    "toggle-off-hint": "Note is protected, click to make it unprotected"
+  },
+  "shared_switch": {
+    "shared": "Shared",
+    "toggle-on-title": "Share the note",
+    "toggle-off-title": "Unshare the note",
+    "shared-branch": "This note exists only as a shared note, unsharing would delete it. Do you want to continue and thus delete this note?",
+    "inherited": "Note cannot be unshared here because it is shared through inheritance from an ancestor."
+  },
+  "template_switch": {
+    "template": "Template",
+    "toggle-on-hint": "Make the note a template",
+    "toggle-off-hint": "Remove the note as a template"
+  },
+  "open-help-page": "Open help page"
 }
--- a/src/public/translations/es/translation.json
+++ b/src/public/translations/es/translation.json
@ -645,6 +645,9 @@
  "hide_floating_buttons_button": {
    "button_title": "Ocultar botones"
  },
+  "svg_export_button": {
+    "button_title": "Exportar diagrama como SVG"
+  },
  "relation_map_buttons": {
    "create_child_note_title": "Crear una nueva nota hijo y agregarla a este mapa de relaciones",
    "reset_pan_zoom_title": "Restablecer la panorámica y el zoom a las coordenadas y ampliación iniciales",
@ -1023,8 +1026,8 @@
    "title": "Tipos MIME disponibles en el menú desplegable"
  },
  "vim_key_bindings": {
-    "use_vim_keybindings_in_code_notes": "Utilizar combinaciones de teclas Vim en notas de código (no modo ex)",
-    "enable_vim_keybindings": "Habilitar combinaciones de teclas de Vim"
+    "use_vim_keybindings_in_code_notes": "",
+    "enable_vim_keybindings": ""
  },
  "wrap_lines": {
    "wrap_lines_in_code_notes": "Ajustar líneas en notas de código",
@ -1043,7 +1046,7 @@
    "attachment_auto_deletion_description": "Los archivos adjuntos se eliminan (y borran) automáticamente si ya no se hace referencia a ellos en su nota después de un tiempo de espera definido.",
    "erase_attachments_after_x_seconds": "Borrar archivos adjuntos después de X segundos de no usarse en su nota",
    "manual_erasing_description": "También puede activar el borrado manualmente (sin considerar el tiempo de espera definido anteriormente):",
-    "erase_unused_attachments_now": "Borrar ahora los archivos adjuntos no utilizados en la nota ",
+    "erase_unused_attachments_now": "Borrar ahora los archivos adjuntos no utilizados en la nota",
    "unused_attachments_erased": "Los archivos adjuntos no utilizados se han eliminado."
  },
  "network_connections": {
@ -1078,7 +1081,7 @@
    "save_button": "Guardar"
  },
  "tray": {
-    "title": "Bandeja",
+    "title": "Bandeja de sistema",
    "enable_tray": "Habilitar bandeja (es necesario reiniciar Trilium para que este cambio surta efecto)"
  },
  "heading_style": {
--- a/src/public/translations/ro/translation.json
+++ b/src/public/translations/ro/translation.json
@ -77,7 +77,7 @@
    "attachment_auto_deletion_description": "Atașamentele se șterg automat (permanent) dacă nu sunt referențiate de către notița lor părinte după un timp prestabilit de timp.",
    "attachment_erasure_timeout": "Perioadă de ștergere a atașamentelor",
    "erase_attachments_after_x_seconds": "Șterge atașamentele după X secunde după ce acestea n-au mai fost folosite într-o notiță",
-    "erase_unused_attachments_now": "Se poate lansa o ștergere manuală (fără a mai considera perioada de grație definită anterior):",
+    "erase_unused_attachments_now": "Elimină atașamentele șterse acum",
    "manual_erasing_description": "Șterge acum toate atașamentele nefolosite din notițe",
    "unused_attachments_erased": "Atașamentele nefolosite au fost șterse."
  },
@ -142,8 +142,8 @@
    "icon_class": "valoarea acestei etichete este adăugată ca o clasă CSS la iconița notiței din ierarhia notițelor, fapt ce poate ajuta la identificarea vizuală mai rapidă a notițelor. Un exemplu ar fi „bx bx-home” pentru iconițe preluate din boxicons. Poate fi folosită în notițe de tip șablon.",
    "inbox": "locația implicită în care vor apărea noile notițe atunci când se crează o noitiță utilizând butonul „Crează notiță” din bara laterală, notițele vor fi create în interiorul notiței cu această etichetă.",
    "inherit": "atributele acestei notițe vor fi moștenite chiar dacă nu există o relație părinte-copil între notițe. A se vedea relația de tip șablon pentru un concept similar. De asemenea, a se vedea moștenirea atributelor în documentație.",
-    "inheritable": "Moștenibil",
-    "inheritable_title": "Atributele moștenibile vor fi moștenite tuturor descendenților acestei notițe.",
+    "inheritable": "Moștenibilă",
+    "inheritable_title": "Atributele moștenibile vor fi moștenite de către toți descendenții acestei notițe.",
    "inverse_relation": "Relație inversă",
    "inverse_relation_title": "Setare opțională pentru a defini relația inversă. Exemplu: Tată - Fiu sunt două relații inverse.",
    "is_owned_by_note": "este deținut(ă) de notița",
@ -1219,8 +1219,8 @@
    "vacuuming_database": "Baza de date este în curs de compactare..."
  },
  "vim_key_bindings": {
-    "enable_vim_keybindings": "Activează combinațiile de taste Vim",
-    "use_vim_keybindings_in_code_notes": "Permite utilizarea combinațiilor de taste în stil Vim pentru notițeled e tip cod (fără modul ex)"
+    "enable_vim_keybindings": "Permite utilizarea combinațiilor de taste în stil Vim pentru notițele de tip cod (fără modul ex)",
+    "use_vim_keybindings_in_code_notes": "Combinații de taste Vim"
  },
  "web_view": {
    "create_label": "Pentru a începe, creați o etichetă cu adresa URL de încorporat, e.g.  #webViewSrc=\"https://www.google.com\"",
@ -1244,5 +1244,79 @@
  },
  "svg_export_button": {
    "button_title": "Exportă diagrama ca SVG"
-  }
+  },
+  "note-map": {
+    "button-link-map": "Harta legăturilor",
+    "button-tree-map": "Harta ierarhiei"
+  },
+  "tree-context-menu": {
+    "advanced": "Opțiuni avansate",
+    "apply-bulk-actions": "Aplică acțiuni în masă",
+    "clone-to": "Clonare în...",
+    "collapse-subtree": "Minimizează subnotițele",
+    "convert-to-attachment": "Convertește în atașament",
+    "copy-clone": "Copiază/clonează",
+    "copy-note-path-to-clipboard": "Copiază calea notiței în clipboard",
+    "cut": "Decupează",
+    "delete": "Șterge",
+    "duplicate-subtree": "Dublifică ierarhia",
+    "edit-branch-prefix": "Editează prefixul ramurii",
+    "expand-subtree": "Expandează subnotițele",
+    "export": "Exportă",
+    "import-into-note": "Importă în notiță",
+    "insert-child-note": "Inserează subnotiță",
+    "insert-note-after": "Inserează după notiță",
+    "move-to": "Mutare la...",
+    "open-in-a-new-split": "Deschide în lateral",
+    "open-in-a-new-tab": "Deschide în tab nou",
+    "paste-after": "Lipește după notiță",
+    "paste-into": "Lipește în notiță",
+    "protect-subtree": "Protejează ierarhia",
+    "recent-changes-in-subtree": "Schimbări recente în ierarhie",
+    "search-in-subtree": "Caută în ierarhie",
+    "sort-by": "Ordonare după...",
+    "unprotect-subtree": "Deprotejează ierarhia"
+  },
+  "shared_info": {
+    "help_link": "Pentru informații vizitați <a href=\"https://triliumnext.github.io/Docs/Wiki/sharing.html\">wiki-ul</a>.",
+    "shared_locally": "Această notiță este partajată local la",
+    "shared_publicly": "Această notiță este partajată public la"
+  },
+  "note_types": {
+    "book": "Carte",
+    "canvas": "Schiță",
+    "code": "Cod sursă",
+    "mermaid-diagram": "Diagramă Mermaid",
+    "mind-map": "Hartă mentală",
+    "note-map": "Hartă notițe",
+    "relation-map": "Hartă relații",
+    "render-note": "Randare notiță",
+    "saved-search": "Căutare salvată",
+    "text": "Text",
+    "web-view": "Vizualizare web",
+    "doc": "Document",
+    "file": "Fișier",
+    "image": "Imagine",
+    "launcher": "Scurtătură",
+    "widget": "Widget"
+  },
+  "protect_note": {
+    "toggle-off": "Deprotejează notița",
+    "toggle-off-hint": "Notița este protejată, click pentru a o deproteja",
+    "toggle-on": "Protejează notița",
+    "toggle-on-hint": "Notița nu este protejată, clic pentru a o proteja"
+  },
+  "shared_switch": {
+    "inherited": "Nu se poate înlătura partajarea deoarece notița este partajată prin moștenirea de la o notiță părinte.",
+    "shared": "Partajată",
+    "shared-branch": "Această notiță există doar ca o notiță partajată, anularea partajării ar cauza ștergerea ei. Sigur doriți ștergerea notiței?",
+    "toggle-off-title": "Anulează partajarea notițeii",
+    "toggle-on-title": "Partajează notița"
+  },
+  "template_switch": {
+    "template": "Șablon",
+    "toggle-off-hint": "Înlătură notița ca șablon",
+    "toggle-on-hint": "Marchează notița drept șablon"
+  },
+  "open-help-page": "Deschide pagina de informații"
 }
--- a/src/services/build.ts
+++ b/src/services/build.ts
@ -1,4 +1,4 @@
 export default {
-    buildDate: "2024-08-09T22:05:59Z",
-    buildRevision: "2a5c444eff3eb99389339716ea8bfc989be90ecd"
+    buildDate: "2024-09-07T18:36:34Z",
+    buildRevision: "7c0d6930fa8f20d269dcfbcbc8f636a25f6bb9a7"
 };
--- a/src/services/i18n.ts
+++ b/src/services/i18n.ts
@ -0,0 +1,31 @@
+import i18next from "i18next";
+import Backend from "i18next-fs-backend";
+import options from "./options.js";
+import sql_init from "./sql_init.js";
+
+export async function initializeTranslations() {
+  // Initialize translations
+  await i18next.use(Backend).init({
+      lng: await getCurrentLanguage(),
+      fallbackLng: "en",
+      ns: "server",
+      backend: {
+          loadPath: "translations/{{lng}}/{{ns}}.json"
+      },
+      debug: true
+  });
+}
+
+function getCurrentLanguage() {
+  let language;
+  if (sql_init.isDbInitialized()) {
+    language = options.getOption("locale");  
+  }
+
+  if (!language) {
+    console.info("Language option not found, falling back to en.");
+    language = "en";
+  }
+
+  return language;
+}
--- a/src/services/keyboard_actions.ts
+++ b/src/services/keyboard_actions.ts
@ -4,6 +4,7 @@ import optionService from "./options.js";
 import log from "./log.js";
 import utils from "./utils.js";
 import { KeyboardShortcut } from './keyboard_actions_interface.js';
+import { t } from "i18next";

 const isMac = process.platform === "darwin";
 const isElectron = utils.isElectron();
@ -19,7 +20,7 @@ const isElectron = utils.isElectron();

 const DEFAULT_KEYBOARD_ACTIONS: KeyboardShortcut[] = [
    {
-        separator: "Note navigation"
+        separator: t("keyboard_actions.note-navigation")
    },
    {
        actionName: "backInNoteHistory",
@ -36,7 +37,7 @@ const DEFAULT_KEYBOARD_ACTIONS: KeyboardShortcut[] = [
    {
        actionName: "jumpToNote",
        defaultShortcuts: ["CommandOrControl+J"],
-        description: 'Open "Jump to note" dialog',
+        description: t("keyboard_actions.open-jump-to-note-dialog"),
        scope: "window"
    },
    {
@ -52,37 +53,37 @@ const DEFAULT_KEYBOARD_ACTIONS: KeyboardShortcut[] = [
    {
        actionName: "searchInSubtree",
        defaultShortcuts: ["CommandOrControl+Shift+S"],
-        description: "Search for notes in the active note's subtree",
+        description: t("keyboard_actions.search-in-subtree"),
        scope: "note-tree"
    },
    {
        actionName: "expandSubtree",
        defaultShortcuts: [],
-        description: "Expand subtree of current note",
+        description: t("keyboard_actions.expand-subtree"),
        scope: "note-tree"
    },
    {
        actionName: "collapseTree",
        defaultShortcuts: ["Alt+C"],
-        description: "Collapses the complete note tree",
+        description: t("keyboard_actions.collapse-tree"),
        scope: "window"
    },
    {
        actionName: "collapseSubtree",
        defaultShortcuts: ["Alt+-"],
-        description: "Collapses subtree of current note",
+        description: t("keyboard_actions.collapse-subtree"),
        scope: "note-tree"
    },
    {
        actionName: "sortChildNotes",
        defaultShortcuts: ["Alt+S"],
-        description: "Sort child notes",
+        description: t("keyboard_actions.sort-child-notes"),
        scope: "note-tree"
    },


    {
-        separator: "Creating and moving notes"
+        separator: t("keyboard_actions.creating-and-moving-notes")
    },
    {
        actionName: "createNoteAfter",
@ -97,49 +98,49 @@ const DEFAULT_KEYBOARD_ACTIONS: KeyboardShortcut[] = [
    {
        actionName: "createNoteIntoInbox",
        defaultShortcuts: ["global:CommandOrControl+Alt+P"],
-        description: "Create and open in the inbox (if defined) or day note",
+        description: t("keyboard_actions.create-note-into-inbox"),
        scope: "window"
    },
    {
        actionName: "deleteNotes",
        defaultShortcuts: ["Delete"],
-        description: "Delete note",
+        description: t("keyboard_actions.delete-note"),
        scope: "note-tree"
    },
    {
        actionName: "moveNoteUp",
        defaultShortcuts: isMac ? ["Alt+Up"] : ["CommandOrControl+Up"],
-        description: "Move note up",
+        description: t("keyboard_actions.move-note-up"),
        scope: "note-tree"
    },
    {
        actionName: "moveNoteDown",
        defaultShortcuts: isMac ? ["Alt+Down"] : ["CommandOrControl+Down"],
-        description: "Move note down",
+        description: t("keyboard_actions.move-note-down"),
        scope: "note-tree"
    },
    {
        actionName: "moveNoteUpInHierarchy",
        defaultShortcuts: isMac ? ["Alt+Left"] : ["CommandOrControl+Left"],
-        description: "Move note up in hierarchy",
+        description: t("keyboard_actions.move-note-up-in-hierarchy"),
        scope: "note-tree"
    },
    {
        actionName: "moveNoteDownInHierarchy",
        defaultShortcuts: isMac ? ["Alt+Right"] : ["CommandOrControl+Right"],
-        description: "Move note down in hierarchy",
+        description: t("keyboard_actions.move-note-down-in-hierarchy"),
        scope: "note-tree"
    },
    {
        actionName: "editNoteTitle",
        defaultShortcuts: ["Enter"],
-        description: "Jump from tree to the note detail and edit title",
+        description: t("keyboard_actions.edit-note-title"),
        scope: "note-tree"
    },
    {
        actionName: "editBranchPrefix",
        defaultShortcuts: ["F2"],
-        description: "Show Edit branch prefix dialog",
+        description: t("keyboard_actions.edit-branch-prefix"),
        scope: "note-tree"
    },
    {
@ -154,399 +155,398 @@ const DEFAULT_KEYBOARD_ACTIONS: KeyboardShortcut[] = [
    },

    {
-        separator: "Note clipboard"
+        separator: t("keyboard_actions.note-clipboard")
    },

-
    {
        actionName: "copyNotesToClipboard",
        defaultShortcuts: ["CommandOrControl+C"],
-        description: "Copy selected notes to the clipboard",
+        description: t("keyboard_actions.copy-notes-to-clipboard"),
        scope: "note-tree"
    },
    {
        actionName: "pasteNotesFromClipboard",
        defaultShortcuts: ["CommandOrControl+V"],
-        description: "Paste notes from the clipboard into active note",
+        description: t("keyboard_actions.paste-notes-from-clipboard"),
        scope: "note-tree"
    },
    {
        actionName: "cutNotesToClipboard",
        defaultShortcuts: ["CommandOrControl+X"],
-        description: "Cut selected notes to the clipboard",
+        description: t("keyboard_actions.cut-notes-to-clipboard"),
        scope: "note-tree"
    },
    {
        actionName: "selectAllNotesInParent",
        defaultShortcuts: ["CommandOrControl+A"],
-        description: "Select all notes from the current note level",
+        description: t("keyboard_actions.select-all-notes-in-parent"),
        scope: "note-tree"
    },
    {
        actionName: "addNoteAboveToSelection",
        defaultShortcuts: ["Shift+Up"],
-        description: "Add note above to the selection",
+        description: t("keyboard_actions.add-note-above-to-the-selection"),
        scope: "note-tree"
    },
    {
        actionName: "addNoteBelowToSelection",
        defaultShortcuts: ["Shift+Down"],
-        description: "Add note above to the selection",
+        description: t("keyboard_actions.add-note-below-to-selection"),
        scope: "note-tree"
    },
    {
        actionName: "duplicateSubtree",
        defaultShortcuts: [],
-        description: "Duplicate subtree",
+        description: t("keyboard_actions.duplicate-subtree"),
        scope: "note-tree"
    },


    {
-        separator: "Tabs & Windows"
+        separator: t("keyboard_actions.tabs-and-windows")
    },
    {
        actionName: "openNewTab",
        defaultShortcuts: isElectron ? ["CommandOrControl+T"] : [],
-        description: "Opens new tab",
+        description: t("keyboard_actions.open-new-tab"),
        scope: "window"
    },
    {
        actionName: "closeActiveTab",
        defaultShortcuts: isElectron ? ["CommandOrControl+W"] : [],
-        description: "Closes active tab",
+        description: t("keyboard_actions.close-active-tab"),
        scope: "window"
    },
    {
        actionName: "reopenLastTab",
        defaultShortcuts: isElectron ? ["CommandOrControl+Shift+T"] : [],
-        description: "Reopens the last closed tab",
+        description: t("keyboard_actions.reopen-last-tab"),
        scope: "window"
    },
    {
        actionName: "activateNextTab",
        defaultShortcuts: isElectron ? ["CommandOrControl+Tab", "CommandOrControl+PageDown"] : [],
-        description: "Activates tab on the right",
+        description: t("keyboard_actions.activate-next-tab"),
        scope: "window"
    },
    {
        actionName: "activatePreviousTab",
        defaultShortcuts: isElectron ? ["CommandOrControl+Shift+Tab", "CommandOrControl+PageUp"] : [],
-        description: "Activates tab on the left",
+        description: t("keyboard_actions.activate-previous-tab"),
        scope: "window"
    },
    {
        actionName: "openNewWindow",
        defaultShortcuts: [],
-        description: "Open new empty window",
+        description: t("keyboard_actions.open-new-window"),
        scope: "window"
    },
    {
        actionName: "toggleTray",
        defaultShortcuts: [],
-        description: "Shows/hides the application from the system tray",
+        description: t("keyboard_actions.toggle-tray"),
        scope: "window"
    },
    {
        actionName: "firstTab",
        defaultShortcuts: ["CommandOrControl+1"],
-        description: "Activates the first tab in the list",
+        description: t("keyboard_actions.first-tab"),
        scope: "window"
    },
    {
        actionName: "secondTab",
        defaultShortcuts: ["CommandOrControl+2"],
-        description: "Activates the second tab in the list",
+        description: t("keyboard_actions.second-tab"),
        scope: "window"
    },
    {
        actionName: "thirdTab",
        defaultShortcuts: ["CommandOrControl+3"],
-        description: "Activates the third tab in the list",
+        description: t("keyboard_actions.third-tab"),
        scope: "window"
    },
    {
        actionName: "fourthTab",
        defaultShortcuts: ["CommandOrControl+4"],
-        description: "Activates the fourth tab in the list",
+        description: t("keyboard_actions.fourth-tab"),
        scope: "window"
    },
    {
        actionName: "fifthTab",
        defaultShortcuts: ["CommandOrControl+5"],
-        description: "Activates the fifth tab in the list",
+        description: t("keyboard_actions.fifth-tab"),
        scope: "window"
    },
    {
        actionName: "sixthTab",
        defaultShortcuts: ["CommandOrControl+6"],
-        description: "Activates the sixth tab in the list",
+        description: t("keyboard_actions.sixth-tab"),
        scope: "window"
    },
    {
        actionName: "seventhTab",
        defaultShortcuts: ["CommandOrControl+7"],
-        description: "Activates the seventh tab in the list",
+        description: t("keyboard_actions.seventh-tab"),
        scope: "window"
    },
    {
        actionName: "eigthTab",
        defaultShortcuts: ["CommandOrControl+8"],
-        description: "Activates the eighth tab in the list",
+        description: t("keyboard_actions.eight-tab"),
        scope: "window"
    },
    {
        actionName: "ninthTab",
        defaultShortcuts: ["CommandOrControl+9"],
-        description: "Activates the ninth tab in the list",
+        description: t("keyboard_actions.ninth-tab"),
        scope: "window"
    },
    {
        actionName: "lastTab",
        defaultShortcuts: [],
-        description: "Activates the last tab in the list",
+        description: t("keyboard_actions.last-tab"),
        scope: "window"
    },


    {
-        separator: "Dialogs"
+        separator: t("keyboard_actions.dialogs")
    },
    {
        actionName: "showNoteSource",
        defaultShortcuts: [],
-        description: "Shows Note Source dialog",
+        description: t("keyboard_actions.show-note-source"),
        scope: "window"
    },
    {
        actionName: "showOptions",
        defaultShortcuts: [],
-        description: "Shows Options dialog",
+        description: t("keyboard_actions.show-options"),
        scope: "window"
    },
    {
        actionName: "showRevisions",
        defaultShortcuts: [],
-        description: "Shows Note Revisions dialog",
+        description: t("keyboard_actions.show-revisions"),
        scope: "window"
    },
    {
        actionName: "showRecentChanges",
        defaultShortcuts: [],
-        description: "Shows Recent Changes dialog",
+        description: t("keyboard_actions.show-recent-changes"),
        scope: "window"
    },
    {
        actionName: "showSQLConsole",
        defaultShortcuts: ["Alt+O"],
-        description: "Shows SQL Console dialog",
+        description: t("keyboard_actions.show-sql-console"),
        scope: "window"
    },
    {
        actionName: "showBackendLog",
        defaultShortcuts: [],
-        description: "Shows Backend Log dialog",
+        description: t("keyboard_actions.show-backend-log"),
        scope: "window"
    },
    {
        actionName: "showHelp",
        defaultShortcuts: ["F1"],
-        description: "Shows built-in Help / cheatsheet",
+        description: t("keyboard_actions.show-help"),
        scope: "window"
    },


    {
-        separator: "Text note operations"
+        separator: t("keyboard_actions.text-note-operations")
    },

    {
        actionName: "addLinkToText",
        defaultShortcuts: ["CommandOrControl+L"],
-        description: "Open dialog to add link to the text",
+        description: t("keyboard_actions.add-link-to-text"),
        scope: "text-detail"
    },
    {
        actionName: "followLinkUnderCursor",
        defaultShortcuts: ["CommandOrControl+Enter"],
-        description: "Follow link within which the caret is placed",
+        description: t("keyboard_actions.follow-link-under-cursor"),
        scope: "text-detail"
    },
    {
        actionName: "insertDateTimeToText",
        defaultShortcuts: ["Alt+T"],
-        description: "Insert current date & time into text",
+        description: t("keyboard_actions.insert-date-and-time-to-text"),
        scope: "text-detail"
    },
    {
        actionName: "pasteMarkdownIntoText",
        defaultShortcuts: [],
-        description: "Pastes Markdown from clipboard into text note",
+        description: t("keyboard_actions.paste-markdown-into-text"),
        scope: "text-detail"
    },
    {
        actionName: "cutIntoNote",
        defaultShortcuts: [],
-        description: "Cuts the selection from the current note and creates subnote with the selected text",
+        description: t("keyboard_actions.cut-into-note"),
        scope: "text-detail"
    },
    {
        actionName: "addIncludeNoteToText",
        defaultShortcuts: [],
-        description: "Opens the dialog to include a note",
+        description: t("keyboard_actions.add-include-note-to-text"),
        scope: "text-detail"
    },
    {
        actionName: "editReadOnlyNote",
        defaultShortcuts: [],
-        description: "Edit a read-only note",
+        description: t("keyboard_actions.edit-readonly-note"),
        scope: "window"
    },

    {
-        separator: "Attributes (labels & relations)"
+        separator: t("keyboard_actions.attributes-labels-and-relations")
    },

    {
        actionName: "addNewLabel",
        defaultShortcuts: ["Alt+L"],
-        description: "Create new label",
+        description: t("keyboard_actions.add-new-label"),
        scope: "window"
    },
    {
        actionName: "addNewRelation",
        defaultShortcuts: ["Alt+R"],
-        description: "Create new relation",
+        description: t("keyboard_actions.create-new-relation"),
        scope: "window"
    },

    {
-        separator: "Ribbon tabs"
+        separator: t("keyboard_actions.ribbon-tabs")
    },

    {
        actionName: "toggleRibbonTabBasicProperties",
        defaultShortcuts: [],
-        description: "Toggle Basic Properties",
+        description: t("keyboard_actions.toggle-basic-properties"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabBookProperties",
        defaultShortcuts: [],
-        description: "Toggle Book Properties",
+        description: t("keyboard_actions.toggle-book-properties"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabFileProperties",
        defaultShortcuts: [],
-        description: "Toggle File Properties",
+        description: t("keyboard_actions.toggle-file-properties"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabImageProperties",
        defaultShortcuts: [],
-        description: "Toggle Image Properties",
+        description: t("keyboard_actions.toggle-image-properties"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabOwnedAttributes",
        defaultShortcuts: ["Alt+A"],
-        description: "Toggle Owned Attributes",
+        description: t("keyboard_actions.toggle-owned-attributes"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabInheritedAttributes",
        defaultShortcuts: [],
-        description: "Toggle Inherited Attributes",
+        description: t("keyboard_actions.toggle-inherited-attributes"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabPromotedAttributes",
        defaultShortcuts: [],
-        description: "Toggle Promoted Attributes",
+        description: t("keyboard_actions.toggle-promoted-attributes"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabNoteMap",
        defaultShortcuts: [],
-        description: "Toggle Link Map",
+        description: t("keyboard_actions.toggle-link-map"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabNoteInfo",
        defaultShortcuts: [],
-        description: "Toggle Note Info",
+        description: t("keyboard_actions.toggle-note-info"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabNotePaths",
        defaultShortcuts: [],
-        description: "Toggle Note Paths",
+        description: t("keyboard_actions.toggle-note-paths"),
        scope: "window"
    },
    {
        actionName: "toggleRibbonTabSimilarNotes",
        defaultShortcuts: [],
-        description: "Toggle Similar Notes",
+        description: t("keyboard_actions.toggle-similar-notes"),
        scope: "window"
    },

    {
-        separator: "Other"
+        separator: t("keyboard_actions.other")
    },

    {
        actionName: "toggleRightPane",
        defaultShortcuts: [],
-        description: "Toggle the display of the right pane, which includes Table of Contents and Highlights",
+        description: t("keyboard_actions.toggle-right-pane"),
        scope: "window"
    },
    {
        actionName: "printActiveNote",
        defaultShortcuts: [],
-        description: "Print active note",
+        description: t("keyboard_actions.print-active-note"),
        scope: "window"
    },
    {
        actionName: "openNoteExternally",
        defaultShortcuts: [],
-        description: "Open note as a file with default application",
+        description: t("keyboard_actions.open-note-externally"),
        scope: "window"
    },
    {
        actionName: "renderActiveNote",
        defaultShortcuts: [],
-        description: "Render (re-render) active note",
+        description: t("keyboard_actions.render-active-note"),
        scope: "window"
    },
    {
        actionName: "runActiveNote",
        defaultShortcuts: ["CommandOrControl+Enter"],
-        description: "Run active JavaScript (frontend/backend) code note",
+        description: t("keyboard_actions.run-active-note"),
        scope: "code-detail"
    },
    {
        actionName: "toggleNoteHoisting",
        defaultShortcuts: ["Alt+H"],
-        description: "Toggles note hoisting of active note",
+        description: t("keyboard_actions.toggle-note-hoisting"),
        scope: "window"
    },
    {
        actionName: "unhoist",
        defaultShortcuts: ["Alt+U"],
-        description: "Unhoist from anywhere",
+        description: t("keyboard_actions.unhoist"),
        scope: "window"
    },
    {
        actionName: "reloadFrontendApp",
        defaultShortcuts: ["F5", "CommandOrControl+R"],
-        description: "Reload frontend App",
+        description: t("keyboard_actions.reload-frontend-app"),
        scope: "window"
    },
    {
        actionName: "openDevTools",
        defaultShortcuts: isElectron ? ["CommandOrControl+Shift+I"] : [],
-        description: "Open dev tools",
+        description: t("keyboard_actions.open-dev-tools"),
        scope: "window"
    },
    {
@ -557,43 +557,43 @@ const DEFAULT_KEYBOARD_ACTIONS: KeyboardShortcut[] = [
    {
        actionName: "toggleLeftPane",
        defaultShortcuts: [],
-        description: "Toggle left (note tree) panel",
+        description: t("keyboard_actions.toggle-left-note-tree-panel"),
        scope: "window"
    },
    {
        actionName: "toggleFullscreen",
        defaultShortcuts: ["F11"],
-        description: "Toggle full screen",
+        description: t("keyboard_actions.toggle-full-screen"),
        scope: "window"
    },
    {
        actionName: "zoomOut",
        defaultShortcuts: isElectron ? ["CommandOrControl+-"] : [],
-        description: "Zoom Out",
+        description: t("keyboard_actions.zoom-out"),
        scope: "window"
    },
    {
        actionName: "zoomIn",
-        description: "Zoom In",
+        description: t("keyboard_actions.zoom-in"),
        defaultShortcuts: isElectron ? ["CommandOrControl+="] : [],
        scope: "window"
    },
    {
        actionName: "zoomReset",
-        description: "Reset zoom level",
+        description: t("keyboard_actions.reset-zoom-level"),
        defaultShortcuts: isElectron ? ["CommandOrControl+0"] : [],
        scope: "window"
    },
    {
        actionName: "copyWithoutFormatting",
        defaultShortcuts: ["CommandOrControl+Alt+C"],
-        description: "Copy selected text without formatting",
+        description: t("keyboard_actions.copy-without-formatting"),
        scope: "text-detail"
    },
    {
        actionName: "forceSaveRevision",
        defaultShortcuts: [],
-        description: "Force creating / saving new note revision of the active note",
+        description: t("keyboard_actions.force-save-revision"),
        scope: "window"
    }
 ];
--- a/src/views/desktop.ejs
+++ b/src/views/desktop.ejs
@ -7,7 +7,7 @@
    <title>TriliumNext Notes</title>
 </head>
 <body class="desktop heading-style-<%= headingStyle %>">
-<noscript>Trilium requires JavaScript to be enabled.</noscript>
+<noscript><%= t("javascript-required") %></noscript>

 <script>
    // hide body to reduce flickering on the startup. This is done through JS and not CSS to not hide <noscript>
--- a/src/views/login.ejs
+++ b/src/views/login.ejs
@ -3,24 +3,24 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Login</title>
+    <title><%= t("login.title") %></title>
    <link rel="apple-touch-icon" sizes="180x180" href="<%= assetPath %>/images/app-icons/ios/apple-touch-icon.png">
    <link rel="shortcut icon" href="favicon.ico">
 </head>
 <body>
 <div class="container">
    <div class="col-xs-12 col-sm-10 col-md-6 col-lg-4 col-xl-4 mx-auto" style="padding-top: 25px;">
-        <h1>Trilium login</h1>
+        <h1><%= t("login.heading") %></h1>

        <% if (failedAuth) { %>
            <div class="alert alert-warning">
-                Password is incorrect. Please try again.
+                <%= t("login.incorrect-password") %>
            </div>
        <% } %>

        <form action="login" method="POST">
            <div class="form-group">
-                <label for="password">Password</label>
+                <label for="password"><%= t("login.password") %></label>
                <div class="controls">
                    <input id="password" name="password" placeholder="" class="form-control" type="password">
                </div>
@ -28,12 +28,12 @@
            <div class="form-group">
                <div class="checkbox">
                    <label>
-                        <input id="remember-me" name="rememberMe" value="1" type="checkbox"> Remember me
+                        <input id="remember-me" name="rememberMe" value="1" type="checkbox"> <%= t("login.remember-me") %>
                    </label>
                </div>
            </div>
            <div class="form-group">
-                <button class="btn btn-success">Login</button>
+                <button class="btn btn-success"><%= t("login.button") %></button>
            </div>
        </form>
    </div>
--- a/src/views/mobile.ejs
+++ b/src/views/mobile.ejs
@ -96,7 +96,7 @@
    </style>
 </head>
 <body class="mobile heading-style-<%= headingStyle %>">
-<noscript>Trilium requires JavaScript to be enabled.</noscript>
+<noscript><%= t("javascript-required") %></noscript>

 <div id="toast-container" class="d-flex flex-column justify-content-center align-items-center"></div>

--- a/src/views/set_password.ejs
+++ b/src/views/set_password.ejs
@ -3,14 +3,14 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Login</title>
+    <title><%= t("login.title") %></title>
    <link rel="apple-touch-icon" sizes="180x180" href="<%= assetPath %>/images/app-icons/ios/apple-touch-icon.png">
    <link rel="shortcut icon" href="favicon.ico">
 </head>
 <body>
 <div class="container">
    <div class="col-xs-12 col-sm-10 col-md-6 col-lg-4 col-xl-4 mx-auto" style="padding-top: 25px;">
-        <h1>Set password</h1>
+        <h1><%= t("set_password.heading") %></h1>

        <% if (error) { %>
            <div class="alert alert-warning">
@ -18,24 +18,24 @@
            </div>
        <% } %>

-        <p>Before you can start using Trilium from web, you need to set a password first. You will then use this password to login.</p>
+        <p><%= t("set_password.description") %></p>

        <form action="set-password" method="POST">
            <div class="form-group">
-                <label for="password">Password</label>
+                <label for="password"><%= t("set_password.password") %></label>
                <div class="controls">
                    <input id="password" name="password1" placeholder="" class="form-control" type="password">
                </div>
            </div>
            <div class="form-group">
-                <label for="password">Password confirmation</label>
+                <label for="password"><%= t("set_password.password-confirmation") %></label>
                <div class="controls">
                    <input id="password" name="password2" placeholder="" class="form-control" type="password">
                </div>
            </div>

            <div class="form-group">
-                <button class="btn btn-success">Set password</button>
+                <button class="btn btn-success"><%= t("set_password.button") %></button>
            </div>
        </form>
    </div>
--- a/src/views/setup.ejs
+++ b/src/views/setup.ejs
@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Setup</title>
+    <title><%= t("setup.title") %></title>

    <style>
        .lds-ring {
@ -44,10 +44,10 @@
    </style>
 </head>
 <body>
-<noscript>Trilium requires JavaScript to be enabled.</noscript>
+<noscript><%= t("javascript-required") %></noscript>
 <div class="container">
    <div id="setup-dialog" class="col-md-12 col-lg-8 col-xl-6 mx-auto" style="padding-top: 25px; font-size: larger; display: none;">
-        <h1>TriliumNext Notes setup</h1>
+        <h1><%= t("setup.heading") %></h1>

        <div class="alert alert-warning" id="alert" style="display: none;">
        </div>
@ -55,22 +55,22 @@
        <div id="setup-type" data-bind="visible: step() == 'setup-type'" style="margin-top: 20px;">
            <div class="radio" style="margin-bottom: 15px;">
                <label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupType">
-                    I'm a new user, and I want to create a new Trilium document for my notes</label>
+                    <%= t("setup.new-document") %></label>
            </div>
            <div class="radio" style="margin-bottom: 15px;">
                <label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupType">
-                    I have a desktop instance already, and I want to set up sync with it</label>
+                    <%= t("setup.sync-from-desktop") %></label>
            </div>
            <div class="radio" style="margin-bottom: 15px;">
                <label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupType">
-                    I have a server instance already, and I want to set up sync with it</label>
+                    <%= t("setup.sync-from-server") %></label>
            </div>

-            <button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary">Next</button>
+            <button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary"><%= t("setup.next") %></button>
        </div>

        <div data-bind="visible: step() == 'new-document-in-progress'">
-            <h2>Document initialization in progress</h2>
+            <h2><%= t("setup.init-in-progress") %></h2>

            <div style="display: flex; justify-content: flex-start; margin-top: 20px;">
                <div class="lds-ring" style="margin-right: 20px;">
@ -81,61 +81,61 @@
                </div>

                <div style="line-height: 60px;">
-                    <p>You will be shortly redirected to the application.</p>
+                    <p><%= t("setup.redirecting") %></p>
                </div>
            </div>
        </div>

        <div data-bind="visible: step() == 'sync-from-desktop'">
-            <h2>Sync from Desktop</h2>
+            <h2><%= t("setup_sync-from-desktop.heading") %></h2>

-            <p>This setup needs to be initiated from the desktop instance:</p>
+            <p><%= t("setup_sync-from-desktop.description") %></p>

            <ol>
-                <li>Open your desktop instance of TriliumNext Notes.</li>
-                <li>From the Trilium Menu, click Options.</li>
-                <li>Click on Sync tab.</li>
-                <li>Change server instance address to: <span id="current-host"></span> and click save.</li>
-                <li>Click "Test sync" button to verify connection is successful.</li>
-                <li>Once you've completed these steps, click <a href="/">here</a>.</li>
+                <li><%= t("setup_sync-from-desktop.step1") %></li>
+                <li><%= t("setup_sync-from-desktop.step2") %></li>
+                <li><%= t("setup_sync-from-desktop.step3") %></li>
+                <li><%- t("setup_sync-from-desktop.step4", { host: '<span id="current-host"></span>'}) %></li>
+                <li><%= t("setup_sync-from-desktop.step5") %></li>
+                <li><%- t("setup_sync-from-desktop.step6", { link: `<a href="/">${t("setup_sync-from-desktop.step6-here")}</a>` }) %></li>
            </ol>

            <button type="button" data-bind="click: back" class="btn btn-secondary">Back</button>
        </div>

        <div data-bind="visible: step() == 'sync-from-server'">
-            <h2>Sync from Server</h2>
+            <h2><%= t("setup_sync-from-server.heading") %></h2>

-            <p>Please enter Trilium server address and credentials below. This will download the whole Trilium document from server and setup sync to it. Depending on the document size and your connection speed, this may take a while.</p>
+            <p><%= t("setup_sync-from-server.instructions") %></p>

            <div class="form-group">
-                <label for="sync-server-host">Trilium server address</label>
-                <input type="text" id="syncServerHost" class="form-control" data-bind="value: syncServerHost" placeholder="https://<hostname>:<port>">
+                <label for="sync-server-host"><%= t("setup_sync-from-server.server-host") %></label>
+                <input type="text" id="syncServerHost" class="form-control" data-bind="value: syncServerHost" placeholder="<%= t("setup_sync-from-server.server-host-placeholder") %>">
            </div>
            <div class="form-group">
-                <label for="sync-proxy">Proxy server (optional)</label>
-                <input type="text" id="sync-proxy" class="form-control" data-bind="value: syncProxy" placeholder="https://<hostname>:<port>">
+                <label for="sync-proxy"><%= t("setup_sync-from-server.proxy-server") %></label>
+                <input type="text" id="sync-proxy" class="form-control" data-bind="value: syncProxy" placeholder="<%= t("setup_sync-from-server.proxy-server-placeholder") %>">

-                <p><strong>Note:</strong> If you leave proxy setting blank, system proxy will be used (applies to desktop/electron build only)</p>
+                <p><strong><%= t("setup_sync-from-server.note") %></strong> <%= t("setup_sync-from-server.proxy-instruction") %></p>
            </div>
            <div class="form-group">
-                <label for="password">Password</label>
-                <input type="password" id="password" class="form-control" data-bind="value: password" placeholder="Password">
+                <label for="password"><%= t("setup_sync-from-server.password") %></label>
+                <input type="password" id="password" class="form-control" data-bind="value: password" placeholder="<%= t("setup_sync-from-server.password-placeholder") %>">
            </div>

-            <button type="button" data-bind="click: back" class="btn btn-secondary">Back</button>
+            <button type="button" data-bind="click: back" class="btn btn-secondary"><%= t("setup_sync-from-server.back") %></button>

            &nbsp;

-            <button type="button" data-bind="click: finish" class="btn btn-primary">Finish setup</button>
+            <button type="button" data-bind="click: finish" class="btn btn-primary"><%= t("setup_sync-from-server.finish-setup") %></button>
        </div>

        <div data-bind="visible: step() == 'sync-in-progress'">
-            <h2>Sync in progress</h2>
+            <h2><%= t("setup_sync-in-progress.heading") %></h2>

-            <div class="alert alert-success">Sync has been correctly set up. It will take some time for the initial sync to finish. Once it's done, you'll be redirected to the login page.</div>
+            <div class="alert alert-success"><%= t("setup_sync-in-progress.successful") %></div>

-            <div>Outstanding sync items: <strong id="outstanding-syncs">N/A</strong></div>
+            <div><%= t("setup_sync-in-progress.outstanding-items") %> <strong id="outstanding-syncs"><%= t("setup_sync-in-progress.outstanding-items-default") %></strong></div>
        </div>
    </div>
 </div>
--- a/src/views/share/404.ejs
+++ b/src/views/share/404.ejs
@ -3,9 +3,9 @@
 <head>
    <meta charset="utf-8">
    <link rel="shortcut icon" href="../favicon.ico">
-    <title>Not found</title>
+    <title><%= t("share_404.title") %></title>
 </head>
 <body>
-    <h1>Not found</h1>
+    <h1><%= t("share_404.heading") %></h1>
 </body>
 </html>
--- a/src/views/share/page.ejs
+++ b/src/views/share/page.ejs
@ -37,15 +37,15 @@
    <div id="main">
        <% if (note.parents[0].noteId !== '_share' && note.parents.length !== 0) { %>
            <nav id="parentLink">
-                parent: <a href="<%= note.parents[0].shareId %>"
-                           class="type-<%= note.parents[0].type %>"><%= note.parents[0].title %></a>
+                <%= t("share_page.parent") %> <a href="<%= note.parents[0].shareId %>"
+                                     class="type-<%= note.parents[0].type %>"><%= note.parents[0].title %></a>
            </nav>
        <% } %>

        <h1 id="title"><%= note.title %></h1>

        <% if (note.hasLabel("pageUrl")) { %>
-            <div id="noteClippedFrom">This note was originally clipped from <a href="<%= note.getLabelValue("pageUrl") %>"><%= note.getLabelValue("pageUrl") %></a></div>
+            <div id="noteClippedFrom"><%- t("share_page.clipped-from", { url: `<a href="${note.getLabelValue("pageUrl")}">${note.getLabelValue("pageUrl")}</a>` }) %></div>
        <% } %>

        <% if (!isEmpty) { %>
@ -58,7 +58,7 @@
            <nav id="childLinks" class="<% if (isEmpty) { %>grid<% } else { %>list<% } %>">
                <% if (!isEmpty) { %>
                    <hr>
-                    <span>Child notes: </span>
+                    <span><%= t("share_page.child-notes") %> </span>
                <% } %>

                <ul>
@ -76,7 +76,7 @@
                </ul>
            </nav>
        <% } else if (isEmpty) { %>
-            <p>This note has no content.</p>
+            <p><%= t("share_page.no-content") %></p>
        <% } %>
    </div>

--- a/src/www.ts
+++ b/src/www.ts
@ -1,4 +1,5 @@
 #!/usr/bin/env node
+
 import app from "./app.js";
 import sessionParser from "./routes/session_parser.js";
 import fs from "fs";
@ -55,7 +56,7 @@ async function startTrilium() {
     */
    if (utils.isElectron()) {
        (await import('electron')).app.requestSingleInstanceLock();
-    }
+    }   

    log.info(JSON.stringify(appInfo, null, 2));

--- a/translations/cn/server.json
+++ b/translations/cn/server.json
@ -0,0 +1 @@
+{}
--- a/translations/en/server.json
+++ b/translations/en/server.json
@ -0,0 +1,161 @@
+{
+  "keyboard_actions": {
+    "open-jump-to-note-dialog": "Open \"Jump to note\" dialog",
+    "search-in-subtree": "Search for notes in the active note's subtree",
+    "expand-subtree": "Expand subtree of current note",
+    "collapse-tree": "Collapses the complete note tree",
+    "collapse-subtree": "Collapses subtree of current note",
+    "sort-child-notes": "Sort child notes",
+    "creating-and-moving-notes": "Creating and moving notes",
+    "create-note-into-inbox": "Create a note in the inbox (if defined) or day note",
+    "delete-note": "Delete note",
+    "move-note-up": "Move note up",
+    "move-note-down": "Move note down",
+    "move-note-up-in-hierarchy": "Move note up in hierarchy",
+    "move-note-down-in-hierarchy": "Move note down in hierarchy",
+    "edit-note-title": "Jump from tree to the note detail and edit title",
+    "edit-branch-prefix": "Show Edit branch prefix dialog",
+    "note-clipboard": "Note clipboard",
+    "copy-notes-to-clipboard": "Copy selected notes to the clipboard",
+    "paste-notes-from-clipboard": "Paste notes from the clipboard into active note",
+    "cut-notes-to-clipboard": "Cut selected notes to the clipboard",
+    "select-all-notes-in-parent": "Select all notes from the current note level",
+    "add-note-above-to-the-selection": "Add note above to the selection",
+    "add-note-below-to-selection": "Add note above to the selection",
+    "duplicate-subtree": "Duplicate subtree",
+    "tabs-and-windows": "Tabs & Windows",
+    "open-new-tab": "Opens new tab",
+    "close-active-tab": "Closes active tab",
+    "reopen-last-tab": "Reopens the last closed tab",
+    "activate-next-tab": "Activates tab on the right",
+    "activate-previous-tab": "Activates tab on the left",
+    "open-new-window": "Open new empty window",
+    "toggle-tray": "Shows/hides the application from the system tray",
+    "first-tab": "Activates the first tab in the list",
+    "second-tab": "Activates the second tab in the list",
+    "third-tab": "Activates the third tab in the list",
+    "fourth-tab": "Activates the fourth tab in the list",
+    "fifth-tab": "Activates the fifth tab in the list",
+    "sixth-tab": "Activates the sixth tab in the list",
+    "seventh-tab": "Activates the seventh tab in the list",
+    "eight-tab": "Activates the eighth tab in the list",
+    "ninth-tab": "Activates the ninth tab in the list",
+    "last-tab": "Activates the last tab in the list",
+    "dialogs": "Dialogs",
+    "show-note-source": "Shows Note Source dialog",
+    "show-options": "Shows Options dialog",
+    "show-revisions": "Shows Note Revisions dialog",
+    "show-recent-changes": "Shows Recent Changes dialog",
+    "show-sql-console": "Shows SQL Console dialog",
+    "show-backend-log": "Shows Backend Log dialog",
+    "text-note-operations": "Text note operations",
+    "add-link-to-text": "Open dialog to add link to the text",
+    "follow-link-under-cursor": "Follow link within which the caret is placed",
+    "insert-date-and-time-to-text": "Insert current date & time into text",
+    "paste-markdown-into-text": "Pastes Markdown from clipboard into text note",
+    "cut-into-note": "Cuts the selection from the current note and creates subnote with the selected text",
+    "add-include-note-to-text": "Opens the dialog to include a note",
+    "edit-readonly-note": "Edit a read-only note",
+    "attributes-labels-and-relations": "Attributes (labels & relations)",
+    "add-new-label": "Create new label",
+    "create-new-relation": "Create new relation",
+    "ribbon-tabs": "Ribbon tabs",
+    "toggle-basic-properties": "Toggle Basic Properties",
+    "toggle-file-properties": "Toggle File Properties",
+    "toggle-image-properties": "Toggle Image Properties",
+    "toggle-owned-attributes": "Toggle Owned Attributes",
+    "toggle-inherited-attributes": "Toggle Inherited Attributes",
+    "toggle-promoted-attributes": "Toggle Promoted Attributes",
+    "toggle-link-map": "Toggle Link Map",
+    "toggle-note-info": "Toggle Note Info",
+    "toggle-note-paths": "Toggle Note Paths",
+    "toggle-similar-notes": "Toggle Similar Notes",
+    "other": "Other",
+    "toggle-right-pane": "Toggle the display of the right pane, which includes Table of Contents and Highlights",
+    "print-active-note": "Print active note",
+    "open-note-externally": "Open note as a file with default application",
+    "render-active-note": "Render (re-render) active note",
+    "run-active-note": "Run active JavaScript (frontend/backend) code note",
+    "toggle-note-hoisting": "Toggles note hoisting of active note",
+    "unhoist": "Unhoist from anywhere",
+    "reload-frontend-app": "Reload frontend App",
+    "open-dev-tools": "Open dev tools",
+    "toggle-left-note-tree-panel": "Toggle left (note tree) panel",
+    "toggle-full-screen": "Toggle full screen",
+    "zoom-out": "Zoom Out",
+    "zoom-in": "Zoom In",
+    "note-navigation": "Note navigation",
+    "reset-zoom-level": "Reset zoom level",
+    "copy-without-formatting": "Copy selected text without formatting",
+    "force-save-revision": "Force creating / saving new note revision of the active note",
+    "show-help": "Shows built-in Help / cheatsheet",
+    "toggle-book-properties": "Toggle Book Properties"
+  },
+  "login": {
+    "title": "Login",
+    "heading": "Trilium login",
+    "incorrect-password": "Password is incorrect. Please try again.",
+    "password": "Password",
+    "remember-me": "Remember me",
+    "button": "Login"
+  },
+  "set_password": {
+    "heading": "Set password",
+    "description": "Before you can start using Trilium from web, you need to set a password first. You will then use this password to login.",
+    "password": "Password",
+    "password-confirmation": "Password confirmation",
+    "button": "Set password"
+  },
+  "javascript-required": "Trilium requires JavaScript to be enabled.",
+  "setup": {
+    "heading": "TriliumNext Notes setup",
+    "new-document": "I'm a new user, and I want to create a new Trilium document for my notes",
+    "sync-from-desktop": "I have a desktop instance already, and I want to set up sync with it",
+    "sync-from-server": "I have a server instance already, and I want to set up sync with it",
+    "next": "Next",
+    "init-in-progress": "Document initialization in progress",
+    "redirecting": "You will be shortly redirected to the application.",
+    "title": "Setup"
+  },
+  "setup_sync-from-desktop": {
+    "heading": "Sync from Desktop",
+    "description": "This setup needs to be initiated from the desktop instance:",
+    "step1": "Open your desktop instance of TriliumNext Notes.",
+    "step2": "From the Trilium Menu, click Options.",
+    "step3": "Click on Sync category.",
+    "step4": "Change server instance address to: {{- host}} and click Save.",
+    "step5": "Click \"Test sync\" button to verify connection is successful.",
+    "step6": "Once you've completed these steps, click {{- link}}.",
+    "step6-here": "here"
+  },
+  "setup_sync-from-server": {
+    "heading": "Sync from Server",
+    "instructions": "Please enter Trilium server address and credentials below. This will download the whole Trilium document from server and setup sync to it. Depending on the document size and your connection speed, this may take a while.",
+    "server-host": "Trilium server address",
+    "server-host-placeholder": "https://<hostname>:<port>",
+    "proxy-server": "Proxy server (optional)",
+    "proxy-server-placeholder": "https://<hostname>:<port>",
+    "note": "Note:",
+    "proxy-instruction": "If you leave proxy setting blank, system proxy will be used (applies to the desktop application only)",
+    "password": "Password",
+    "password-placeholder": "Password",
+    "back": "Back",
+    "finish-setup": "Finish setup"
+  },
+  "setup_sync-in-progress": {
+    "heading": "Sync in progress",
+    "successful": "Sync has been correctly set up. It will take some time for the initial sync to finish. Once it's done, you'll be redirected to the login page.",
+    "outstanding-items": "Outstanding sync items:",
+    "outstanding-items-default": "N/A"
+  },
+  "share_404": {
+    "title": "Not found",
+    "heading": "Not found"
+  },
+  "share_page": {
+    "parent": "parent:",
+    "clipped-from": "This note was originally clipped from {{- url}}",
+    "child-notes": "Child notes:",
+    "no-content": "This note has no content."
+  }
+}
--- a/translations/es/server.json
+++ b/translations/es/server.json
@ -0,0 +1 @@
+{}
--- a/translations/ro/server.json
+++ b/translations/ro/server.json
@ -0,0 +1,164 @@
+{
+  "keyboard-actions": {
+    "note-navigation": "Navigarea printre notițe"
+  },
+  "keyboard_actions": {
+    "activate-next-tab": "Activează tab-ul din dreapta",
+    "activate-previous-tab": "Activează tab-ul din stânga",
+    "add-include-note-to-text": "Deschide fereastra de includere notițe",
+    "add-link-to-text": "Deschide fereastra de adaugă legături în text",
+    "add-new-label": "Crează o nouă etichetă",
+    "add-note-above-to-the-selection": "Adaugă notița deasupra selecției",
+    "add-note-below-to-selection": "Adaugă notița deasupra selecției",
+    "attributes-labels-and-relations": "Atribute (etichete și relații)",
+    "close-active-tab": "Închide tab-ul activ",
+    "collapse-subtree": "Minimizează ierarhia notiței curente",
+    "collapse-tree": "Minimizează întreaga ierarhie de notițe",
+    "copy-notes-to-clipboard": "Copiază notițele selectate în clipboard",
+    "copy-without-formatting": "Copiază textul selectat fără formatare",
+    "create-new-relation": "Crează o nouă relație",
+    "create-note-into-inbox": "Crează o notiță și o deschide în inbox (dacă este definit) sau notița zilnică",
+    "cut-notes-to-clipboard": "Decupează notițele selectate în clipboard",
+    "creating-and-moving-notes": "Crearea și mutarea notițelor",
+    "cut-into-note": "Decupează selecția din notița curentă și crează o subnotiță cu textul selectat",
+    "delete-note": "Șterge notița",
+    "dialogs": "Ferestre",
+    "duplicate-subtree": "Dublifică subnotițele",
+    "edit-branch-prefix": "Afișează ecranul „Editează prefixul ramurii”",
+    "edit-note-title": "Sare de la arborele notițelor la detaliile notiței și editează titlul",
+    "edit-readonly-note": "Editează o notiță care este în modul doar în citire",
+    "eight-tab": "Activează cel de-al optelea tab din listă",
+    "expand-subtree": "Expandează ierarhia notiței curente",
+    "fifth-tab": "Activează cel de-al cincelea tab din listă",
+    "first-tab": "Activează cel primul tab din listă",
+    "follow-link-under-cursor": "Urmărește legătura de sub poziția cursorului",
+    "force-save-revision": "Forțează crearea/salvarea unei noi revizii ale notiției curente",
+    "fourth-tab": "Activează cel de-al patrulea tab din listă",
+    "insert-date-and-time-to-text": "Inserează data curentă și timpul în text",
+    "last-tab": "Activează ultimul tab din listă",
+    "move-note-down": "Mută notița mai jos",
+    "move-note-down-in-hierarchy": "Mută notița mai jos în ierarhie",
+    "move-note-up": "Mută notița mai sus",
+    "move-note-up-in-hierarchy": "Mută notița mai sus în ierarhie",
+    "ninth-tab": "Activează cel de-al nouălea tab din listă",
+    "note-clipboard": "Clipboard-ul notițelor",
+    "note-navigation": "Navigarea printre notițe",
+    "open-dev-tools": "Deschide uneltele de dezvoltator",
+    "open-jump-to-note-dialog": "Deschide ecranul „Sari la notiță”",
+    "open-new-tab": "Deschide un tab nou",
+    "open-new-window": "Deschide o nouă fereastră goală",
+    "open-note-externally": "Deschide notița ca un fișier utilizând aplicația implicită",
+    "other": "Altele",
+    "paste-markdown-into-text": "Lipește text Markdown din clipboard în notița de tip text",
+    "paste-notes-from-clipboard": "Lipește notițele din clipboard în notița activă",
+    "print-active-note": "Imprimă notița activă",
+    "reload-frontend-app": "Reîncarcă interfața grafică",
+    "render-active-note": "Reîmprospătează notița activă",
+    "reopen-last-tab": "Deschide din nou ultimul tab închis",
+    "reset-zoom-level": "Resetează nivelul de magnificare",
+    "ribbon-tabs": "Tab-urile din panglică",
+    "run-active-note": "Rulează notița curentă de tip JavaScript (frontend sau backend)",
+    "search-in-subtree": "Caută notițe în ierarhia notiței active",
+    "second-tab": "Activează cel de-al doilea tab din listă",
+    "select-all-notes-in-parent": "Selectează toate notițele din nivelul notiței curente",
+    "seventh-tab": "Activează cel de-al șaptelea tab din listă",
+    "show-backend-log": "Afișează fereastra „Log-uri din backend”",
+    "show-help": "Afișează informații utile",
+    "show-note-source": "Afișează fereastra „Sursa notiței”",
+    "show-options": "Afișează fereastra de opțiuni",
+    "show-recent-changes": "Afișează fereastra „Schimbări recente”",
+    "show-revisions": "Afișează fereastra „Revizii ale notiței”",
+    "show-sql-console": "Afișează ecranul „Consolă SQL”",
+    "sixth-tab": "Activează cel de-al șaselea tab din listă",
+    "sort-child-notes": "Ordonează subnotițele",
+    "tabs-and-windows": "Tab-uri și ferestre",
+    "text-note-operations": "Operații asupra notițelor text",
+    "third-tab": "Activează cel de-al treilea tab din listă",
+    "toggle-basic-properties": "Comută tab-ul „Proprietăți de bază”",
+    "toggle-book-properties": "Comută tab-ul „Proprietăți ale cărții”",
+    "toggle-file-properties": "Comută tab-ul „Proprietăți fișier”",
+    "toggle-full-screen": "Comută modul ecran complet",
+    "toggle-image-properties": "Comută tab-ul „Proprietăți imagini”",
+    "toggle-inherited-attributes": "Comută tab-ul „Atribute moștenite”",
+    "toggle-left-note-tree-panel": "Comută panoul din stânga (arborele notițelor)",
+    "toggle-link-map": "Comută harta legăturilor",
+    "toggle-note-hoisting": "Comută focalizarea pe notița curentă",
+    "toggle-note-info": "Comută tab-ul „Informații despre notiță”",
+    "toggle-note-paths": "Comută tab-ul „Căile notiței”",
+    "toggle-owned-attributes": "Comută tab-ul „Atribute proprii”",
+    "toggle-promoted-attributes": "Comută tab-ul „Atribute promovate”",
+    "toggle-right-pane": "Comută afișarea panoului din dreapta, ce include tabela de conținut și evidențieri",
+    "toggle-similar-notes": "Comută tab-ul „Notițe similare”",
+    "toggle-tray": "Afișează/ascunde aplicația din tray-ul de sistem",
+    "unhoist": "Defocalizează complet",
+    "zoom-in": "Mărește zoom-ul",
+    "zoom-out": "Micșorează zoom-ul"
+  },
+  "login": {
+    "button": "Autentifică",
+    "heading": "Autentificare în Trilium",
+    "incorrect-password": "Parola nu este corectă. Încercați din nou.",
+    "password": "Parolă",
+    "remember-me": "Ține-mă minte",
+    "title": "Autentificare"
+  },
+  "set_password": {
+    "heading": "Setare parolă",
+    "button": "Setează parola",
+    "description": "Înainte de a putea utiliza Trilium din navigator, trebuie mai întâi setată o parolă. Ulterior această parolă va fi folosită la autentificare.",
+    "password": "Parolă",
+    "password-confirmation": "Confirmarea parolei"
+  },
+  "javascript-required": "Trilium necesită JavaScript să fie activat pentru a putea funcționa.",
+  "setup": {
+    "heading": "Instalarea TriliumNext Notes",
+    "init-in-progress": "Se inițializează documentul",
+    "new-document": "Sunt un utilizator nou și doresc să creez un document Trilium pentru notițele mele",
+    "next": "Mai departe",
+    "redirecting": "În scurt timp veți fi redirecționat la aplicație.",
+    "sync-from-desktop": "Am deja o instanță de desktop și aș dori o sincronizare cu aceasta",
+    "sync-from-server": "Am deja o instanță de server și doresc o sincronizare cu aceasta",
+    "title": "Inițializare"
+  },
+  "setup_sync-from-desktop": {
+    "description": "Acești pași trebuie urmați de pe aplicația de desktop:",
+    "heading": "Sincronizare cu aplicația desktop",
+    "step1": "Deschideți aplicația TriliumNext Notes pentru desktop.",
+    "step2": "Din meniul Trilium, dați clic pe Opțiuni.",
+    "step3": "Clic pe categoria „Sincronizare”.",
+    "step4": "Schimbați adresa server-ului către: {{- host}} și apăsați „Salvează”.",
+    "step5": "Clic pe butonul „Testează sincronizarea” pentru a verifica dacă conexiunea a fost făcută cu succes.",
+    "step6": "După ce ați completat pașii, dați click {{- link}}.",
+    "step6-here": "aici"
+  },
+  "setup_sync-from-server": {
+    "back": "Înapoi",
+    "finish-setup": "Finalizează inițializarea",
+    "heading": "Sincronizare cu server-ul",
+    "instructions": "Introduceți adresa server-ului Trilium și credențialele în secțiunea de jos. Astfel se va descărca întregul document Trilium de pe server și se va configura sincronizarea cu acesta. În funcție de dimensiunea documentului și viteza rețelei, acest proces poate dura.",
+    "note": "De remarcat:",
+    "password": "Parolă",
+    "proxy-instruction": "Dacă lăsați câmpul de proxy nesetat, proxy-ul de sistem va fi folosit (valabil doar pentru aplicația de desktop)",
+    "proxy-server": "Server-ul proxy (opțional)",
+    "proxy-server-placeholder": "https://<sistem>:<port>",
+    "server-host": "Adresa server-ului Trilium",
+    "server-host-placeholder": "https://<sistem>:<port>",
+    "password-placeholder": "Parolă"
+  },
+  "setup_sync-in-progress": {
+    "heading": "Sincronizare în curs",
+    "outstanding-items": "Elemente de sincronizat:",
+    "outstanding-items-default": "-",
+    "successful": "Sincronizarea a fost configurată cu succes. Poate dura ceva timp pentru a finaliza sincronizarea inițială. După efectuarea ei se va redirecționa către pagina de autentificare."
+  },
+  "share_404": {
+    "heading": "Pagină negăsită",
+    "title": "Pagină negăsită"
+  },
+  "share_page": {
+    "child-notes": "Subnotițe:",
+    "clipped-from": "Această notiță a fost decupată inițial de pe {{- url}}",
+    "no-content": "Această notiță nu are conținut.",
+    "parent": "părinte:"
+  }
+}