Desktop release v3.6.6

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.coderabbit.yaml

@@ -0,0 +1,110 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+language: "en-GB"
+reviews:
+  high_level_summary: false
+  estimate_code_review_effort: false
+  poem: false
+  auto_review:
+    enabled: true
+    drafts: false
+    ignore_usernames:
+      - "renovate[bot]"
+  auto_apply_labels: true
+  labeling_instructions:
+    - label: "accessibility"
+      instructions: "Apply when the PR contains changes related to accessibility, screen readers, keyboard navigation, or ARIA attributes"
+    - label: "android"
+      instructions: "Apply when the PR modifies files under packages/app-mobile/android/. Or when the PR modifies files under packages/app-mobile and the change is specific to Android only"
+    - label: "api"
+      instructions: "Apply when the PR modifies files under packages/lib/services/rest/"
+    - label: "bug"
+      instructions: "Apply when the PR fixes a bug or unexpected behaviour"
+    - label: "ci"
+      instructions: "Apply when the PR modifies files under .github/workflows/ or .circleci/"
+    - label: "cli"
+      instructions: "Apply when the PR modifies files under packages/app-cli/, except if all the modified files are under packages/app-cli/tests/"
+    - label: "clipper"
+      instructions: "Apply when the PR modifies files under packages/app-clipper/"
+    - label: "database"
+      instructions: "Apply when the PR is mainly about modifying database schema, migrations, or database-related logic"
+    - label: "desktop"
+      instructions: "Apply when the PR modifies files under packages/app-desktop/"
+    - label: "documentation"
+      instructions: "Apply when the PR modifies files under readme/"
+    - label: "draw"
+      instructions: "Apply when the PR modifies files under packages/default-plugins and relates to the JS-Draw drawing plugin"
+    - label: "editor"
+      instructions: "Apply when the PR modifies files under packages/editor/ or packages/app-mobile/components/NoteEditor/"
+    - label: "enhancement"
+      instructions: "Apply when the PR adds a new feature or improves existing functionality (not a bug fix)"
+    - label: "export"
+      instructions: "Apply when the PR is mainly about changes to the export functionality (PDF, HTML, JEX, etc.)"
+    - label: "import"
+      instructions: "Apply when the PR is mainly about changes to the import functionality (Evernote, Markdown, etc.)"
+    - label: "iOS"
+      instructions: "Apply when the PR modifies files under packages/app-mobile/ios/. Or when the PR modifies files under packages/app-mobile and the change is specific to iOS only"
+    - label: "linux"
+      instructions: "Apply when the PR is mainly about changes specific to Linux"
+    - label: "linux/wayland"
+      instructions: "Apply when the PR is mainly about changes specific to Linux Wayland"
+    - label: "macOS"
+      instructions: "Apply when the PR is mainly about changes specific to macOS"
+    - label: "markdown-editor"
+      instructions: "Apply when the PR modifies files under packages/editor/CodeMirror"
+    - label: "mobile"
+      instructions: "Apply when the PR modifies files under packages/app-mobile/"
+    - label: "OCR"
+      instructions: "Apply when the PR contains changes related to OCR (optical character recognition) functionality"
+    - label: "performance"
+      instructions: "Apply when the PR improves performance, reduces memory usage, or optimises speed"
+    - label: "plugins"
+      instructions: "Apply when the PR modifies files under packages/lib/services/plugins/ or packages/plugin-repo-cli/"
+    - label: "Regression"
+      instructions: "Apply when the linked issue, if any, has the Regression label"
+    - label: "renderer"
+      instructions: "Apply when the PR modifies files under packages/renderer/ or packages/turndown/"
+    - label: "search"
+      instructions: "Apply when the PR is mainly about changes to the search functionality"
+    - label: "security"
+      instructions: "Apply when the PR is mainly about addressing a security vulnerability or improving security"
+    - label: "server"
+      instructions: "Apply when the PR modifies files under packages/server/"
+    - label: "Sharing"
+      instructions: "Apply when the PR is mainly about changes to the note or notebook/folder sharing features"
+    - label: "sync"
+      instructions: "Apply when the PR modifies files under packages/lib/services/synchronizer/, packages/lib/Sync*.ts or packages/lib/services/e2ee/"
+    - label: "tags"
+      instructions: "Apply when the PR is mainly about changes to the tag management or tagging functionality"
+    - label: "transcribe"
+      instructions: "Apply when the PR modifies files under packages/transcribe"
+    - label: "translation"
+      instructions: "Apply when the PR modifies files under packages/tools/locales/ or **/locales/"
+    - label: "Voice typing"
+      instructions: "Apply when the PR is mainly about changes to the voice typing functionality"
+    - label: "web"
+      instructions: "Apply when the PR modifies files under packages/app-web/. Or when the PR modifies files under packages/app-mobile and the change is specific to the web app only"
+    - label: "windows"
+      instructions: "Apply when the PR is mainly about changes specific to Windows"
+
+  pre_merge_checks:
+    description:
+      mode: "warning"
+    custom_checks:
+      - name: "PR Description Must Follow Guidelines"
+        mode: "error"
+        instructions: |
+          Fail if the pull request description does not include clear sections for:
+          - Problem or user-impact description
+          - A high-level Solution explanation
+          - Any Test Plan or verification steps
+
+          The description should align with our PR guidelines
+          at https://github.com/joplin/gsoc/blob/master/pull_request_guidelines.md
+          and should not just restate the diff or implementation details.
+knowledge_base:
+  code_guidelines:
+    enabled: true
+    filePatterns:
+      - "readme/dev/coding_style.md"
+      - "readme/dev/index.md"
+      - "CLAUDE.md"

.dockerignore

@@ -17,3 +17,4 @@ packages/server/db-*.sqlite
 packages/server/dist/
 packages/server/logs/
 packages/server/temp/
+packages/transcribe/.env

.env-sample

@@ -15,6 +15,24 @@
 # POSTGRES_PORT=5432
 # POSTGRES_HOST=localhost
 
+# =============================================================================
+# TRANSCRIBE CONFIG EXAMPLE
+# -----------------------------------------------------------------------------
+# This service is not required, and it will be ignored by using --profile server
+# when running docker-compose. If you want to use it, you need to set the
+# following environment variables.
+# =============================================================================
+
+# TRANSCRIBE_API_KEY=secret_string_shared_between_server_and_transcribe
+# TRANSCRIBE_ENABLED=true
+
+# QUEUE_DATABASE_NAME=transcribe
+# QUEUE_DATABASE_USER=transcribe
+# QUEUE_DATABASE_PASSWORD=transcribe
+# QUEUE_DATABASE_PORT=5431
+# HTR_CLI_IMAGES_FOLDER=/home/user/images_storage
+# HTR_CLI_MODELS_FOLDER=/home/user/transcribe_models
+
 # =============================================================================
 # DEV CONFIG EXAMPLE
 # -----------------------------------------------------------------------------

.env-transcribe-sample

@@ -1,30 +1,33 @@
+# Joplin Transcribe Configuration
+#
+# Copy this file to .env-transcribe and update the values.
+
 # =============================================================================
 # Required
-# -----------------------------------------------------------------------------
 # =============================================================================
 
-SERVER_PORT=4567
+# Set a secure API key for authentication
+API_KEY=changeme
 
-API_KEY=random-string
-QUEUE_TTL=900000
-QUEUE_RETRY_COUNT=2
-QUEUE_MAINTENANCE_INTERVAL=30000
+# =============================================================================
+# Optional (defaults are set in the Docker image)
+# =============================================================================
 
-HTR_CLI_DOCKER_IMAGE=joplin/htr-cli:0.0.2
-# Fullpath to images folder
-HTR_CLI_IMAGES_FOLDER=/home/user/joplin/packages/transcribe/images
+# Server port (default: 4567)
+# SERVER_PORT=4567
 
-QUEUE_DRIVER=pg
+# Maximum image dimension for processing (default: 400)
+# IMAGE_MAX_DIMENSION=400
+
+# Queue driver: sqlite (default) or pg
 # QUEUE_DRIVER=sqlite
 
+# =============================================================================
+# PostgreSQL settings (only if QUEUE_DRIVER=pg)
+# =============================================================================
 
-# =============================================================================
-# Queue driver
-# -----------------------------------------------------------------------------
-# =============================================================================
-#
-# QUEUE_DATABASE_NAME=./queue.sqlite3
-QUEUE_DATABASE_NAME=transcribe
-QUEUE_DATABASE_USER=transcribe
-QUEUE_DATABASE_PASSWORD=transcribe
-QUEUE_DATABASE_PORT=5432
+# QUEUE_DATABASE_NAME=transcribe
+# QUEUE_DATABASE_USER=transcribe
+# QUEUE_DATABASE_PASSWORD=transcribe
+# QUEUE_DATABASE_PORT=5432
+# QUEUE_DATABASE_HOST=localhost

.eslintrc.js

@@ -23,6 +23,8 @@ module.exports = {
 		'FileSystemCreateWritableOptions': 'readonly',
 		'FileSystemHandle': 'readonly',
 		'IDBTransactionMode': 'readonly',
+		'FlatArray': 'readonly',
+		'BigInt': 'readonly',
 		'globalThis': 'readonly',
 
 		// ServiceWorker

.github/PULL_REQUEST_TEMPLATE

@@ -1,6 +1,12 @@
 <!--
 
-Please prefix the title with the platform you are targetting:
+Before contributing, please read the contribution guidelines: https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md
+
+If this is a Google Summer of Code pull request, please read the [GSoC pull request guidelines](https://github.com/joplin/gsoc/blob/master/pull_request_guidelines.md).
+
+---
+
+**Pull request title**: Please prefix the title with the platform you are targetting.
 
 Here are some examples of good titles:
 
@@ -20,6 +26,4 @@ If it's not related to any platform (such as a translation, change to the docume
 
 Then please append the issue that you've addressed or fixed. Use "Resolves #123" for new features or improvements and "Fixes #123" for bug fixes.
 
-AND PLEASE READ THE GUIDE: https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md
-
 -->

.github/scripts/run_ci.sh

@@ -7,9 +7,13 @@
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 ROOT_DIR="$SCRIPT_DIR/../.."
 
+TRANSCRIBE_TAG_PREFIX=transcribe
+TRANSCRIBE_REPOSITORY=joplin/transcribe
+
 IS_PULL_REQUEST=0
 IS_DESKTOP_RELEASE=0
 IS_SERVER_RELEASE=0
+IS_TRANSCRIBE_RELEASE=0
 IS_LINUX=0
 IS_MACOS=0
 
@@ -23,6 +27,10 @@ if [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
 	IS_SERVER_RELEASE=1
 fi
 
+if [[ $GIT_TAG_NAME = $TRANSCRIBE_TAG_PREFIX-* ]]; then
+	IS_TRANSCRIBE_RELEASE=1
+fi
+
 if [[ $GIT_TAG_NAME = v* ]]; then
 	IS_DESKTOP_RELEASE=1
 fi
@@ -41,15 +49,17 @@ DOCKER_IMAGE_PLATFORM="linux/amd64"
 # a release
 RUN_TESTS=0
 
-if [ "$IS_SERVER_RELEASE" = 0 ] && [ "$IS_DESKTOP_RELEASE" = 0 ]; then
+if [ "$IS_SERVER_RELEASE" = 0 ] && [ "$IS_DESKTOP_RELEASE" = 0 ] && [ "$IS_TRANSCRIBE_RELEASE" = 0 ]; then
 	RUN_TESTS=1
 fi
 
-if [ "$RUNNER_ARCH" == "ARM64" ] && [ "$IS_SERVER_RELEASE" == "0" ]; then
-	# We exit now because nothing works properly with the ARM64 architecture.
-	# We only proceed  if building the server image.
-	echo "Running on ARM64 and not trying to build server image - early exit"
-	exit 0
+if [ "$RUNNER_ARCH" == "ARM64" ]; then
+	if [ "$IS_SERVER_RELEASE" == "0" ] && [ "$IS_TRANSCRIBE_RELEASE" == "0" ]; then
+		# We exit now because nothing works properly with the ARM64 architecture.
+		# We only proceed  if building the server image.
+		echo "Running on ARM64 and not trying to build server image - early exit"
+		exit 0
+	fi
 fi
 
 if [ "$RUNNER_ARCH" == "ARM64" ]; then
@@ -80,12 +90,14 @@ echo "GIT_TAG_NAME=$GIT_TAG_NAME"
 echo "BUILD_SEQUENCIAL=$BUILD_SEQUENCIAL"
 echo "SERVER_REPOSITORY=$SERVER_REPOSITORY"
 echo "SERVER_TAG_PREFIX=$SERVER_TAG_PREFIX"
+echo "TRANSCRIBE_TAG_PREFIX=$TRANSCRIBE_TAG_PREFIX"
 echo "DOCKER_IMAGE_PLATFORM=$DOCKER_IMAGE_PLATFORM"
 
 echo "IS_CONTINUOUS_INTEGRATION=$IS_CONTINUOUS_INTEGRATION"
 echo "IS_PULL_REQUEST=$IS_PULL_REQUEST"
 echo "IS_DESKTOP_RELEASE=$IS_DESKTOP_RELEASE"
 echo "IS_SERVER_RELEASE=$IS_SERVER_RELEASE"
+echo "IS_TRANSCRIBE_RELEASE=$IS_TRANSCRIBE_RELEASE"
 echo "RUN_TESTS=$RUN_TESTS"
 echo "IS_LINUX=$IS_LINUX"
 echo "IS_MACOS=$IS_MACOS"
@@ -301,9 +313,13 @@ if [ "$IS_DESKTOP_RELEASE" == "1" ]; then
 		USE_HARD_LINKS=false yarn dist
 	fi	
 elif [[ $IS_LINUX = 1 ]] && [ "$IS_SERVER_RELEASE" == "1" ]; then
-	echo "Step: Building Docker Image..."
+	echo "Step: Building Joplin Server Docker Image..."
 	cd "$ROOT_DIR"
-	yarn buildServerDocker --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
+	yarn buildServerDocker --docker-file Dockerfile.server --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $SERVER_REPOSITORY
+elif [[ $IS_LINUX = 1 ]] && [ "$IS_TRANSCRIBE_RELEASE" == "1" ]; then
+	echo "Step: Building Joplin Transcribe Docker Image..."
+	cd "$ROOT_DIR"
+	yarn buildServerDocker --docker-file Dockerfile.transcribe --platform $DOCKER_IMAGE_PLATFORM --tag-name $GIT_TAG_NAME --push-images --repository $TRANSCRIBE_REPOSITORY
 else
 	echo "Step: Building but *not* publishing desktop application..."
 	

.github/workflows/build-android.yml

@@ -4,6 +4,10 @@
 name: react-native-android-build-apk
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/dev' && github.run_id || format('{0}-{1}', github.workflow, github.ref) }}
+  cancel-in-progress: true
+
 jobs:
   AssembleRelease:
     if: github.repository == 'laurent22/joplin'
@@ -21,23 +25,53 @@ jobs:
           
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: '18'
+          node-version: '24'
           cache: 'yarn'
 
-      - uses: dtolnay/rust-toolchain@stable
-
       - name: Install Yarn
         run: |
           corepack enable
 
       - name: Install
         run:  yarn install
+        env:
+          SKIP_ONENOTE_CONVERTER_BUILD: 1
+      
+      - name: Free disk space
+        run: |
+          sudo rm -rf /usr/share/dotnet || true
+          sudo rm -rf /opt/ghc || true
 
       - name: Assemble Android Release
         run: |
           cd packages/app-mobile/android
           sed -i -- 's/signingConfig signingConfigs.release/signingConfig signingConfigs.debug/' app/build.gradle
           ./gradlew assembleRelease
-          
+      
+      - name: Verify alignment
+        run: |
+          cd packages/app-mobile/android/app
+          APK_FILE="./build/outputs/apk/release/app-release.apk"
+          if test ! -f "$APK_FILE" ; then
+            echo "APK file not found."
+            exit 1
+          else
+            echo "APK file found at: $APK_FILE"
+          fi
+
+          BUILD_TOOLS_PATH="$ANDROID_HOME/build-tools/"
+          if test ! -d "$BUILD_TOOLS_PATH" ; then
+            echo "Build tools not found at $BUILD_TOOLS_PATH ($ANDROID_HOME, $BUILD_TOOLS_VERSION)"
+            exit 1
+          fi
+          # The build-tools/ directory contains different subdirectories
+          # for each build tools version. As a result, there may be multiple
+          # zipalign tools. Select the most recent (biggest two-digit version number):
+          ZIPALIGN_PATH="$(find $BUILD_TOOLS_PATH -name "zipalign" -print | sort | tail -n1)"
+          if test ! -x "$ZIPALIGN_PATH" ; then
+            echo "zipalign not found (searching in $BUILD_TOOLS_PATH, candidate: $ZIPALIGN_PATH)"
+            exit 1
+          fi
+          "$ZIPALIGN_PATH" -c -P 16 -v 4 "$APK_FILE"

.github/workflows/build-macos-m1.yml

@@ -1,5 +1,10 @@
 name: Build macOS M1
 on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.ref == 'refs/heads/dev' && github.run_id || format('{0}-{1}', github.workflow, github.ref) }}
+  cancel-in-progress: true
+
 jobs:
   Main:
     # We always process desktop release tags, because they also publish the release
@@ -9,11 +14,9 @@ jobs:
 
       - uses: actions/checkout@v4
       - uses: olegtarasov/get-tag@v2.1.4
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          # We need to pin the version to 18.15, because 18.16+ fails with this error:
-          # https://github.com/facebook/react-native/issues/36440
-          node-version: '18.15.0'
+          node-version: '24'
           cache: 'yarn'
 
       - name: Install Yarn
@@ -30,7 +33,7 @@ jobs:
       # See github-action-main.yml for explanation
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.14'
 
       - name: Set Publish Flag
         run: |
@@ -50,6 +53,7 @@ jobs:
           CSC_LINK: ${{ secrets.APPLE_CSC_LINK }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GH_REPO: ${{ github.repository }}
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
           PUBLISH_ENABLED: ${{ env.PUBLISH_ENABLED }}
@@ -59,25 +63,38 @@ jobs:
           yarn install
           cd packages/app-desktop
           npm pkg set 'build.mac.artifactName'='${productName}-${version}-${arch}.${ext}'
+
+          npm pkg delete 'build.mac.target'
           npm pkg set 'build.mac.target[0].target'='dmg'
           npm pkg set 'build.mac.target[0].arch[0]'='arm64'
           npm pkg set 'build.mac.target[1].target'='zip'
           npm pkg set 'build.mac.target[1].arch[0]'='arm64'
 
-          if [[ "$PUBLISH_ENABLED" == "true" ]]; then
-            echo "Building and publishing desktop application..."
-            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
+          # Only enable pkg build in the main repository CI. As of 01/15/2026, pkg
+          # build fails when running on external pull requests.
+          if [[ "$GITHUB_EVENT_NAME" != "pull_request" ]]; then
+            npm pkg set 'build.mac.target[2].target'='pkg'
+            npm pkg set 'build.mac.target[2].arch[0]'='arm64'
+          fi
 
-            yarn modifyReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
-          else
-            echo "Building but *not* publishing desktop application..."
+          build_dist() {
+            if [[ "$PUBLISH_ENABLED" == "true" ]]; then
+              echo "Building and publishing desktop application..."
+              PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist --mac --arm64
 
-            # We also want to disable signing the app in this case, because
-            # it doesn't work and we don't need it.
-            # https://www.electron.build/code-signing#how-to-disable-code-signing-during-the-build-process-on-macos
+              yarn modifyReleaseAssets --repo="$GH_REPO" --tag="$GIT_TAG_NAME" --token="$GITHUB_TOKEN"
+            else
+              echo "Building but *not* publishing desktop application..."
 
-            export CSC_IDENTITY_AUTO_DISCOVERY=false
-            npm pkg set 'build.mac.identity'=null --json
+              # We also want to disable signing the app in this case, because
+              # it doesn't work and we don't need it.
+              # https://www.electron.build/code-signing#how-to-disable-code-signing-during-the-build-process-on-macos
 
-            PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
-          fi
+              export CSC_IDENTITY_AUTO_DISCOVERY=false
+              npm pkg set 'build.mac.identity'=null --json
+
+              PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn dist  --mac --arm64 --publish=never
+            fi
+          }
+
+          build_dist || build_dist

.github/workflows/github-actions-main.yml

@@ -1,5 +1,10 @@
 name: Joplin Continuous Integration
 on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.ref == 'refs/heads/dev' && github.run_id || format('{0}-{1}', github.workflow, github.ref) }}
+  cancel-in-progress: true
+
 jobs:
   Main:
     # We always process server or desktop release tags, because they also publish the release
@@ -9,7 +14,7 @@ jobs:
       matrix:
         # Do not use unbuntu-latest because it causes `The operation was canceled` failures:
         # https://github.com/actions/runner-images/issues/6709
-        os: [macos-13, ubuntu-22.04, windows-2025, ubuntu-22.04-arm]
+        os: [macos-15-intel, ubuntu-22.04, windows-2025, ubuntu-22.04-arm]
     steps:
       - uses: actions/checkout@v4
 
@@ -17,7 +22,6 @@ jobs:
         uses: ./.github/workflows/shared/setup-build-environment
 
       - name: Install Docker Engine
-        # if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
         if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y apt-transport-https
@@ -32,15 +36,41 @@ jobs:
           sudo apt-get update || true
           sudo apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin
 
+      - name: Free disk space
+        if: runner.os == 'Linux'
+        run: |
+          sudo rm -rf /usr/local/lib/android || true
+          sudo rm -rf /usr/share/dotnet || true
+          sudo rm -rf /opt/ghc || true
+          docker system prune -af || true
+          docker builder prune -af || true
+          sudo rm -rf /var/lib/docker/tmp/* || true
+
       # Login to Docker only if we're on a server release tag. If we run this on
       # a pull request it will fail because the PR doesn't have access to
       # secrets
       - uses: docker/login-action@v3
-        if: runner.os == 'Linux' && startsWith(github.ref, 'refs/tags/server-v')
+        if: runner.os == 'Linux' && (startsWith(github.ref, 'refs/tags/server-v') || startsWith(github.ref, 'refs/tags/transcribe-v'))
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      # - name: Test Windows app signing
+      #   if: runner.os == 'Windows'
+      #   env:
+      #     GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      #     IS_CONTINUOUS_INTEGRATION: 1
+      #     BUILD_SEQUENCIAL: 1
+      #     SSL_ESIGNER_USER_NAME: ${{ secrets.SSL_ESIGNER_USER_NAME }}
+      #     SSL_ESIGNER_USER_PASSWORD: ${{ secrets.SSL_ESIGNER_USER_PASSWORD }}
+      #     SSL_ESIGNER_CREDENTIAL_ID: ${{ secrets.SSL_ESIGNER_CREDENTIAL_ID }}
+      #     SSL_ESIGNER_USER_TOTP: ${{ secrets.SSL_ESIGNER_USER_TOTP }}
+      #     SIGN_APPLICATION: 1
+      #   # To ensure that the operations stop on failure, all commands
+      #   # should be on one line with "&&" in between.
+      #   run: |
+      #     yarn install && cd packages/app-desktop && yarn dist
+
       - name: Run tests, build and publish Linux and macOS apps
         if: runner.os == 'Linux' || runner.os == 'macOs'
         env:
@@ -62,11 +92,14 @@ jobs:
       - name: Build and publish Windows app
         if: runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/v')
         env:
-          CSC_KEY_PASSWORD: ${{ secrets.WINDOWS_CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.WINDOWS_CSC_LINK }}
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
+          SSL_ESIGNER_USER_NAME: ${{ secrets.SSL_ESIGNER_USER_NAME }}
+          SSL_ESIGNER_USER_PASSWORD: ${{ secrets.SSL_ESIGNER_USER_PASSWORD }}
+          SSL_ESIGNER_CREDENTIAL_ID: ${{ secrets.SSL_ESIGNER_CREDENTIAL_ID }}
+          SSL_ESIGNER_USER_TOTP: ${{ secrets.SSL_ESIGNER_USER_TOTP }}
+          SIGN_APPLICATION: 1
         # To ensure that the operations stop on failure, all commands
         # should be on one line with "&&" in between.
         run: |
@@ -119,10 +152,19 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
-          node-version: '18'
-          cache: 'yarn'
+          node-version: '24'
+
+      - name: Free disk space
+        if: runner.os == 'Linux'
+        run: |
+          sudo rm -rf /usr/local/lib/android || true
+          sudo rm -rf /usr/share/dotnet || true
+          sudo rm -rf /opt/ghc || true
+          docker system prune -af || true
+          docker builder prune -af || true
+          sudo rm -rf /var/lib/docker/tmp/* || true
 
       - name: Install Yarn
         run: |
@@ -142,7 +184,7 @@ jobs:
           echo "DOCKER_IMAGE_PLATFORM=$DOCKER_IMAGE_PLATFORM"
 
           yarn install
-          yarn buildServerDocker --platform $DOCKER_IMAGE_PLATFORM --tag-name server-v0.0.0 --repository joplin/server
+          yarn buildServerDocker --docker-file Dockerfile.server --platform $DOCKER_IMAGE_PLATFORM --tag-name server-v0.0.0 --repository joplin/server
 
           # Basic test to ensure that the created build is valid. It should exit with
           # code 0 if it works.
@@ -151,10 +193,10 @@ jobs:
       - name: Check HTTP request
         run: |
           # Need to pass environment variables:
-          docker run -p 22300:22300 joplin/server:$(dpkg --print-architecture)-0.0.0 node dist/app.js --env dev &
+          docker run --env MAX_TIME_DRIFT=0 --publish 22300:22300 joplin/server:$(dpkg --print-architecture)-0.0.0 node dist/app.js --env dev &
 
           # Wait for server to start
-          sleep 30
+          sleep 120
 
           # Check if status code is correct
           # if the actual_status DOES NOT include the expected_status
@@ -177,5 +219,4 @@ jobs:
           if [[ "$actual_body" != "$expected_body" ]]; then
             echo 'Failed while checking the body response after request to /api/ping'
             exit 1;
-          fi
-
+          fi

.github/workflows/shared/setup-build-environment/action.yml

@@ -50,13 +50,14 @@ runs:
     - uses: olegtarasov/get-tag@v2.1.4
     - uses: dtolnay/rust-toolchain@stable
       if: ${{ runner.os != 'Windows' }}
-    - uses: actions/setup-node@v4
+
+    - uses: actions/setup-node@v6
       with:
-        node-version: '18.18.0'
+        node-version: '24'
         # Disable the cache on ARM runners. For now, we don't run "yarn install" on these
         # environments and this breaks actions/setup-node.
         # See https://github.com/laurent22/joplin/commit/47d0d3eb9e89153a609fb5441344da10904c6308#commitcomment-159577783.
-        cache: ${{ (!contains(runner.os, 'arm') && 'yarn') || '' }}
+        # cache: ${{ (!contains(runner.os, 'arm') && 'yarn') || '' }}
 
     - name: Install Yarn
       shell: bash
@@ -71,4 +72,4 @@ runs:
     # Ref: https://github.com/nodejs/node-gyp/issues/2869
     - uses: actions/setup-python@v5
       with:
-        python-version: '3.11'
+        python-version: '3.14'

.github/workflows/ui-tests.yml

@@ -1,5 +1,10 @@
 name: Joplin UI tests
 on: [push, pull_request]
+
+concurrency:
+  group: ${{ github.ref == 'refs/heads/dev' && github.run_id || format('{0}-{1}', github.workflow, github.ref) }}
+  cancel-in-progress: true
+
 permissions:
   contents: read
 jobs:
@@ -9,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, ubuntu-22.04, windows-2025]
+        os: [ubuntu-22.04, windows-2025]
     steps:
       - uses: actions/checkout@v4
       - name: Setup build environment

.npmpackagejsonlintrc.json

@@ -5,6 +5,7 @@
 				"exceptions": [
 					"@joplin/editor",
 					"@joplin/fork-htmlparser2",
+					"@joplin/whisper-voice-typing",
 					"@joplin/fork-sax",
 					"@joplin/fork-uslug",
 					"@joplin/htmlpack",

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-	"cSpell.enabled": true
+	"cSpell.enabled": true,
+	"editor.insertSpaces": false
 }

.yarn/patches/@react-native-vector-icons-fontawesome5-npm-12.3.0-a1ca46610f.patch

@@ -0,0 +1,21 @@
+# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
+# permission from being added.
+# See:
+# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
+# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
+# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
+diff --git a/android/build.gradle b/android/build.gradle
+index a16b4ad6d1871cf5cf73ef7ebeaf8bd4d662b134..9871afb5fbf8e687370e08f54d884ecd7dde7e7c 100644
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -37,6 +37,10 @@ android {
+   }
+ 
+   compileSdkVersion safeExtGet('compileSdkVersion', 31)
++
++  defaultConfig {
++    minSdkVersion safeExtGet('minSdkVersion', 24)
++  }
+ }
+ 
+ dependencies {

.yarn/patches/@react-native-vector-icons-ionicons-npm-12.3.0-9bd4746f3f.patch

@@ -0,0 +1,21 @@
+# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
+# permission from being added.
+# See:
+# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
+# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
+# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
+diff --git a/android/build.gradle b/android/build.gradle
+index d42bd23123644cc324051e9c7ec4635de286315a..640996df60fe7769f69b30b35f771eb9cf0b75d4 100644
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -37,6 +37,10 @@ android {
+   }
+ 
+   compileSdkVersion safeExtGet('compileSdkVersion', 31)
++  
++  defaultConfig {
++    minSdkVersion safeExtGet('minSdkVersion', 24)
++  }
+ }
+ 
+ dependencies {

.yarn/patches/@react-native-vector-icons-material-design-icons-npm-12.4.0-890f7f618b.patch

@@ -0,0 +1,21 @@
+# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
+# permission from being added.
+# See:
+# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
+# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
+# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
+diff --git a/android/build.gradle b/android/build.gradle
+index 170ec0ff9befe0f9155aaf5e1b84133cfd87be99..e6a0ab4a019ee67c5af7761ae8bb35f18b05c590 100644
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -37,6 +37,10 @@ android {
+   }
+ 
+   compileSdkVersion safeExtGet('compileSdkVersion', 31)
++
++  defaultConfig {
++    minSdkVersion safeExtGet('minSdkVersion', 24)
++  }
+ }
+ 
+ dependencies {

.yarn/patches/@react-native-vector-icons-material-icons-npm-12.4.0-94138e627b.patch

@@ -0,0 +1,21 @@
+# Add a minSdkVersion to prevent the dangerous READ_PHONE_STATE
+# permission from being added.
+# See:
+# - Upstream issue report: https://github.com/oblador/react-native-vector-icons/issues/1861
+# - About the permission: https://developer.android.com/reference/android/Manifest.permission#READ_PHONE_STATE
+# - StackOverflow post with discussion and alternate workarounds: https://stackoverflow.com/questions/39668549/why-has-the-read-phone-state-permission-been-added
+diff --git a/android/build.gradle b/android/build.gradle
+index 3b22f9de66795ee01dbaa29655727ee7ddba3cc8..325daa88d33f066b3826e5031ce281793710af2d 100644
+--- a/android/build.gradle
++++ b/android/build.gradle
+@@ -37,6 +37,10 @@ android {
+   }
+ 
+   compileSdkVersion safeExtGet('compileSdkVersion', 31)
++
++  defaultConfig {
++    minSdkVersion safeExtGet('minSdkVersion', 24)
++  }
+ }
+ 
+ dependencies {

.yarn/patches/depd-npm-1.1.2-b0c8414da7.patch

@@ -0,0 +1,36 @@
+# Patch to remove eval. This allows using depd in an environment with
+# a strict Content-Security-Policy.
+# Ref: https://github.com/dougwilson/nodejs-depd/pull/33
+diff --git a/index.js b/index.js
+index d758d3c8f58a60bf27ef377ad77639bf10ce7854..2bad40d4eeba553d3bcfb206873eac059067ae3b 100644
+--- a/index.js
++++ b/index.js
+@@ -399,19 +399,20 @@ function wrapfunction (fn, message) {
+     throw new TypeError('argument fn must be a function')
+   }
+ 
+-  var args = createArgumentsString(fn.length)
+-  var deprecate = this // eslint-disable-line no-unused-vars
+   var stack = getStack()
+   var site = callSiteLocation(stack[1])
+ 
+   site.name = fn.name
+ 
+-   // eslint-disable-next-line no-eval
+-  var deprecatedfn = eval('(function (' + args + ') {\n' +
+-    '"use strict"\n' +
+-    'log.call(deprecate, message, site)\n' +
+-    'return fn.apply(this, arguments)\n' +
+-    '})')
++  var deprecatedfn
++  var self = this
++  deprecatedfn = function () {
++    'use strict'
++    log.call(self, message, site)
++    return fn.apply(this, arguments)
++  }
++  Object.defineProperty(deprecatedfn, 'length', { value: fn.length })
++  Object.defineProperty(deprecatedfn, 'name', { value: fn.name })
+ 
+   return deprecatedfn
+ }

.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch

@@ -0,0 +1,35 @@
+# Patch to remove eval. This allows using depd in an environment with
+# a strict Content-Security-Policy.
+# Ref: https://github.com/dougwilson/nodejs-depd/pull/33
+diff --git a/index.js b/index.js
+index 1bf2fcfdeffc984e5ad792eec08744c29d4a4590..1b24aa2414458bc651abfdded81b103c131efeaa 100644
+--- a/index.js
++++ b/index.js
+@@ -415,19 +415,19 @@ function wrapfunction (fn, message) {
+     throw new TypeError('argument fn must be a function')
+   }
+ 
+-  var args = createArgumentsString(fn.length)
+   var stack = getStack()
+   var site = callSiteLocation(stack[1])
+ 
+   site.name = fn.name
+ 
+-  // eslint-disable-next-line no-new-func
+-  var deprecatedfn = new Function('fn', 'log', 'deprecate', 'message', 'site',
+-    '"use strict"\n' +
+-    'return function (' + args + ') {' +
+-    'log.call(deprecate, message, site)\n' +
+-    'return fn.apply(this, arguments)\n' +
+-    '}')(fn, log, this, message, site)
++  var self = this
++  var deprecatedfn = function () {
++    'use strict'
++    log.call(self, message, site)
++    return fn.apply(this, arguments)
++  }
++  Object.defineProperty(deprecatedfn, 'length', { value: fn.length })
++  Object.defineProperty(deprecatedfn, 'name', { value: fn.name })
+ 
+   return deprecatedfn
+ }

.yarn/patches/formidable-npm-2.1.2-40ba18d67f.patch

@@ -0,0 +1,24 @@
+# Resolves an issue in which notes and attachments larger than 16 KB
+# could become corrupted during the upload process.
+# See https://github.com/laurent22/joplin/issues/14343
+diff --git a/src/parsers/JSON.js b/src/parsers/JSON.js
+index 9a096c25778c7c68be1ddd9dd78faa85bd1d8ec3..6d6bfd2d3789313a7adc8966ab8e58c3d3167356 100644
+--- a/src/parsers/JSON.js
++++ b/src/parsers/JSON.js
+@@ -12,13 +12,14 @@ class JSONParser extends Transform {
+   }
+ 
+   _transform(chunk, encoding, callback) {
+-    this.chunks.push(String(chunk)); // todo consider using a string decoder
++    this.chunks.push(chunk); // type: Uint8Array
+     callback();
+   }
+ 
+   _flush(callback) {
+     try {
+-      const fields = JSON.parse(this.chunks.join(''));
++      const data = Buffer.concat(this.chunks);
++      const fields = JSON.parse(data.toString('utf-8'));
+       Object.keys(fields).forEach((key) => {
+         const value = fields[key];
+         this.push({ key, value });

.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch

@@ -1,209 +0,0 @@
-diff --git a/android/build.gradle b/android/build.gradle
-index 6afcbbf0cc8ca2d69dd78077d61e59a90b2136bb..9f8d72b4ec5b2b3d290975d6a255917c95300854 100644
---- a/android/build.gradle
-+++ b/android/build.gradle
-@@ -67,19 +67,19 @@ repositories {
- }
- 
- // Generate UUIDs for each models contained in android/src/main/assets/
--tasks.register('genUUID') {
--  doLast {
--    fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
--      if (fileDetails.directory) {
--        def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
--        def ofile = file("$odir/uuid")
--        mkdir odir
--        ofile.text = UUID.randomUUID().toString()
--      }
--    }
--  }
--}
--preBuild.dependsOn genUUID
-+// tasks.register('genUUID') {
-+//   doLast {
-+//     fileTree(dir: "$rootDir/app/src/main/assets", exclude: ['*/*']).visit { fileDetails ->
-+//       if (fileDetails.directory) {
-+//         def odir = file("$rootDir/app/src/main/assets/$fileDetails.relativePath")
-+//         def ofile = file("$odir/uuid")
-+//         mkdir odir
-+//         ofile.text = UUID.randomUUID().toString()
-+//       }
-+//     }
-+//   }
-+// }
-+// preBuild.dependsOn genUUID
- 
- def kotlin_version = getExtOrDefault('kotlinVersion')
- 
-diff --git a/android/src/main/java/com/reactnativevosk/VoskModule.kt b/android/src/main/java/com/reactnativevosk/VoskModule.kt
-index 0e2b6595b1b2cf1ee01c6c64239c4b0ea37fce19..5a8539b9cce8951967640dba755e29a4e3ff404a 100644
---- a/android/src/main/java/com/reactnativevosk/VoskModule.kt
-+++ b/android/src/main/java/com/reactnativevosk/VoskModule.kt
-@@ -19,13 +19,25 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
-     return "Vosk"
-   }
- 
-+  @ReactMethod
-+  fun addListener(type: String?) {
-+    // Keep: Required for RN built in Event Emitter Calls.
-+  }
-+
-+  @ReactMethod
-+  fun removeListeners(type: Int?) {
-+    // Keep: Required for RN built in Event Emitter Calls.
-+  }
-+
-   override fun onResult(hypothesis: String) {
-     // Get text data from string object
-     val text = getHypothesisText(hypothesis)
- 
-     // Stop recording if data found
-     if (text != null && text.isNotEmpty()) {
--      cleanRecognizer();
-+      // Don't auto-stop the recogniser - we want to do that when the user
-+      // presses on "stop" only.
-+      // cleanRecognizer();
-       sendEvent("onResult", text)
-     }
-   }
-@@ -93,12 +105,11 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
-   @ReactMethod
-   fun loadModel(path: String, promise: Promise) {
-     cleanModel();
--    StorageService.unpack(context, path, "models",
--      { model: Model? ->
--        this.model = model
--        promise.resolve("Model successfully loaded")
--      }
--    ) { e: IOException ->
-+    
-+    try {
-+      this.model = Model(path);
-+      promise.resolve("Model successfully loaded")
-+    } catch (e: IOException) {
-       this.model = null
-       promise.reject(e)
-     }
-@@ -153,6 +164,25 @@ class VoskModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
-     cleanRecognizer();
-   }
- 
-+  @ReactMethod
-+  fun stopOnly() {
-+    if (speechService != null) {
-+      speechService!!.stop()
-+    }
-+  }
-+
-+  @ReactMethod
-+  fun cleanup() {
-+    if (speechService != null) {
-+      speechService!!.shutdown();
-+      speechService = null
-+    }
-+    if (recognizer != null) {
-+      recognizer!!.close();
-+      recognizer = null;
-+    }
-+  }
-+
-   @ReactMethod
-   fun unload() {
-     cleanRecognizer();
-diff --git a/lib/typescript/index.d.ts b/lib/typescript/index.d.ts
-index 441e41cc402cca3a60b34978ef4fea976076259c..a173acebb4b314402550442ad471e0f7c706e3c4 100644
---- a/lib/typescript/index.d.ts
-+++ b/lib/typescript/index.d.ts
-@@ -10,6 +10,8 @@ export default class Vosk {
-     currentRegisteredEvents: EmitterSubscription[];
-     start: (grammar?: string[] | null) => Promise<String>;
-     stop: () => void;
-+    stopOnly: () => void;
-+    cleanup: () => void;
-     unload: () => void;
-     onResult: (onResult: (e: VoskEvent) => void) => EventSubscription;
-     onFinalResult: (onFinalResult: (e: VoskEvent) => void) => EventSubscription;
-diff --git a/package.json b/package.json
-index 707eddb8d68007f93071ac659c5b087c935c5f01..90ebe20f224eeec472c377df1fef9b15f2ff8200 100644
---- a/package.json
-+++ b/package.json
-@@ -11,12 +11,9 @@
-     "src",
-     "lib",
-     "android",
--    "ios",
-     "cpp",
--    "react-native-vosk.podspec",
-     "!lib/typescript/example",
-     "!android/build",
--    "!ios/build",
-     "!**/__tests__",
-     "!**/__fixtures__",
-     "!**/__mocks__"
-diff --git a/react-native-vosk.podspec b/react-native-vosk.podspec
-deleted file mode 100644
-index e3d41b90c5eef890c7a5108aaf16ac07d34a698b..0000000000000000000000000000000000000000
---- a/react-native-vosk.podspec
-+++ /dev/null
-@@ -1,41 +0,0 @@
--require "json"
--
--package = JSON.parse(File.read(File.join(__dir__, "package.json")))
--folly_version = '2021.06.28.00-v2'
--folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
--
--Pod::Spec.new do |s|
--  s.name         = "react-native-vosk"
--  s.version      = package["version"]
--  s.summary      = package["description"]
--  s.homepage     = package["homepage"]
--  s.license      = package["license"]
--  s.authors      = package["author"]
--
--  s.platforms    = { :ios => "10.0" }
--  s.source       = { :git => "https://github.com/riderodd/react-native-vosk.git", :tag => "#{s.version}" }
--
--  s.source_files = "ios/**/*.{h,m,mm,swift}"
--  s.resource_bundles = { 'Vosk' => ['ios/Vosk/*'] }
--
--  s.dependency "React-Core"
--  s.frameworks = "Accelerate"
--  s.library = "c++"
--  s.vendored_frameworks = "ios/libvosk.xcframework"
--  s.requires_arc = true
--
--  # Don't install the dependencies when we run `pod install` in the old architecture.
--  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
--    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
--    s.pod_target_xcconfig    = {
--        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
--        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
--    }
--
--    s.dependency "React-Codegen"
--    s.dependency "RCT-Folly", folly_version
--    s.dependency "RCTRequired"
--    s.dependency "RCTTypeSafety"
--    s.dependency "ReactCommon/turbomodule/core"
--  end
--end
-diff --git a/src/index.tsx b/src/index.tsx
-index d9f90c921d89b1b4d85e145443ed3376546a368a..29e4068dbd7500828a73145bd25497a52c9bf638 100644
---- a/src/index.tsx
-+++ b/src/index.tsx
-@@ -69,6 +69,15 @@ export default class Vosk {
-     VoskModule.stop();
-   };
- 
-+  stopOnly = () => {
-+		VoskModule.stopOnly();
-+	};
-+
-+	cleanup = () => {
-+		this.cleanListeners();
-+		VoskModule.cleanup();
-+	};
-+
-   unload = () => {
-     this.cleanListeners();
-     VoskModule.unload();

Assets/WebsiteAssets/css/site.css

@@ -658,13 +658,84 @@ footer .bottom-links-row p {
 }
 
 .language-switcher {
-	display: inline;
+	display: inline-block;
+	position: relative;
+	margin-left: 20px;
 }
 
 .language-switcher > button {
 	border: none;
 	background-color: transparent;
 	color: #0557ba;
+	cursor: pointer;
+	padding: 0;
+}
+
+.language-switcher > button:hover {
+	opacity: 0.8;
+}
+
+.language-switcher .dropdown-menu {
+	min-width: 100px;
+	padding: 5px 0 !important;
+	margin: 0 !important;
+	text-align: left;
+}
+
+.language-switcher .dropdown-menu li {
+	padding: 0 !important;
+	margin: 0 !important;
+	list-style: none;
+}
+
+.language-switcher .dropdown-item {
+	color: #333 !important;
+	padding: 8px 15px !important;
+	margin: 0 !important;
+	display: block;
+	text-align: left;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+.language-switcher .dropdown-item.active {
+	background-color: #0557ba !important;
+	color: #fff !important;
+	margin: 0 !important;
+	border-radius: 0 !important;
+}
+
+.language-switcher .dropdown-item:hover:not(.active) {
+	background-color: #f0f0f0;
+}
+
+/* Language switcher on front page (blue background) */
+.navbar-frontpage .language-switcher > button {
+	color: #fff;
+}
+
+/* Mobile language section */
+.menu-mobile-language {
+	margin-top: 20px;
+	padding-top: 15px;
+	border-top: 1px solid rgba(255, 255, 255, 0.2);
+}
+
+.mobile-menu-language-label {
+	color: #90b1d9;
+	margin-bottom: 10px;
+	font-size: 0.9em;
+}
+
+.mobile-language-link {
+	display: inline-block;
+	margin: 0 10px;
+	padding: 5px 15px;
+	border-radius: 5px;
+}
+
+.mobile-language-link.active {
+	background-color: rgba(255, 255, 255, 0.2);
 }
 
 .joplin-cloud-feature-list .feature-description {
@@ -1280,11 +1351,7 @@ footer .bottom-links-row p {
  ENGLISH VERSION
 *****************************************************************/
 
-:lang(en-gb) #made-in-france-section {
-	display: none;
-}
-
-:lang(en-gb) .top-section-img-cn {
+:not(:lang(zh-cn)) .top-section-img-cn {
 	display: none;
 }
 
@@ -1300,4 +1367,9 @@ footer .bottom-links-row p {
 
 :lang(zh-cn) #plans-section .faq {
 	display: none;
+}
+
+
+.cfa-button {
+	margin-top: 10px;
 }

Assets/WebsiteAssets/js/script.js

@@ -124,7 +124,53 @@ async function setupDownloadPage() {
 	}
 }
 
+// Supported locale path prefixes (language code -> URL path)
+// Most languages use their code directly (fr, de), with exceptions mapped here
+const localePathOverrides = {
+	'zh': 'cn',
+};
+
+// List of supported language codes
+const supportedLanguages = ['fr', 'de', 'zh'];
+
+function getLocalePath(langCode) {
+	const pathPrefix = localePathOverrides[langCode] || langCode;
+	return '/' + pathPrefix;
+}
+
+function setupLocaleRedirect() {
+	// Only redirect on the front page (root path or index.html)
+	const path = window.location.pathname;
+	const isRootPage = path === '/' || path === '/index.html' || path === '';
+	if (!isRootPage) return;
+
+	// Check if user has explicitly chosen to stay on current locale
+	const localePreference = (localStorage.getItem('joplin-locale-preference') || '').toLowerCase();
+	if (localePreference === 'en') return;
+
+	// Get user's preferred language from browser
+	const browserLang = (navigator.language || navigator.userLanguage || '').toLowerCase();
+
+	// Extract the base language code (e.g., 'fr' from 'fr-ca')
+	const langCode = browserLang.split('-')[0];
+
+	// Check if we support this language
+	if (!supportedLanguages.includes(langCode)) return;
+
+	window.location.href = getLocalePath(langCode) + '/';
+}
+
+// Allow users to switch language and remember their preference
+function setLocalePreference(locale, url) {
+	localStorage.setItem('joplin-locale-preference', locale);
+	window.location.href = url;
+}
+
+// Expose globally for language switcher links
+window.setLocalePreference = setLocalePreference;
+
 $(function () {
 	setupMobileMenu();
+	setupLocaleRedirect();
 	void setupDownloadPage();
 });

Assets/WebsiteAssets/locales/de_DE.po

@@ -0,0 +1,164 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: de_DE\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
+msgid "/month"
+msgstr "/Monat"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
+msgid "/year"
+msgstr "/Jahr"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
+msgid "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues."
+msgstr "<a href=\"https://joplincloud.com\">Joplin Cloud</a> ermöglicht es Ihnen, Ihre Notizen geräteübergreifend zu synchronisieren. Sie können Notizen veröffentlichen und mit Freunden, Familie oder Kollegen gemeinsam an Notizbüchern arbeiten."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
+msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
+msgstr "Passen Sie es <span class=\"frame-bg frame-bg-yellow-lg\">an</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
+msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span>-Notizen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
+msgstr "100 % <span class=\"frame-bg frame-bg-yellow-lg\">Ihre Daten</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
+msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
+msgstr "Eine <span class=\"frame-bg frame-bg-yellow-lg\">französische</span> Alternative"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
+msgid "Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!"
+msgstr "Greifen Sie von Ihrem Computer, Smartphone oder Tablet auf Ihre Notizen zu, indem Sie sie mit verschiedenen Diensten wie Joplin Cloud, Dropbox und OneDrive synchronisieren. Die App ist für Windows, macOS, Linux, Android und iOS verfügbar. Eine Terminal-App ist ebenfalls verfügbar!"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
+msgid "Already have a Joplin Cloud account? <a href=\"https://joplincloud.com\">Login now</a>"
+msgstr "Sie haben bereits ein Joplin-Cloud-Konto? <a href=\"https://joplincloud.com\">Jetzt anmelden</a>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
+msgid "Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API."
+msgstr "Passen Sie die App mit Plugins, eigenen Designs und verschiedenen Texteditoren (Rich Text oder Markdown) an. Oder erstellen Sie mit der Erweiterungs-API eigene Skripte und Plugins."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
+msgid "Download it now"
+msgstr "Jetzt herunterladen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
+msgid "Download the app"
+msgstr "App herunterladen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
+msgid "Find out more"
+msgstr "Mehr erfahren"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
+msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
+msgstr "Befreien Sie Ihre <span class=\"frame-bg frame-bg-blue\">Notizen</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
+msgid "Get the clipper"
+msgstr "Clipper herunterladen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
+msgid "Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note."
+msgstr "Bilder, Videos, PDFs und Audiodateien werden unterstützt. Erstellen Sie mathematische Ausdrücke und Diagramme direkt in der App. Machen Sie Fotos mit der mobilen App und speichern Sie sie in einer Notiz."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
+msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
+msgstr "In der <span class=\"frame-bg frame-bg-yellow\">Presse</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
+msgid "Joplin Cloud"
+msgstr "Joplin Cloud"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
+msgid "Joplin Cloud is based in France. This means your data is protected by strict European Union privacy laws. In addition, Joplin Cloud implements strong end-to-end encryption so that not even us can have access to your data."
+msgstr "Joplin Cloud hat seinen Sitz in Frankreich. Das bedeutet, dass Ihre Daten durch strenge Datenschutzgesetze der Europäischen Union geschützt sind. Darüber hinaus verwendet Joplin Cloud eine starke Ende-zu-Ende-Verschlüsselung, sodass nicht einmal wir Zugriff auf Ihre Daten haben."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
+msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
+msgstr "Joplin ist eine Open-Source-App für Notizen. Halten Sie Ihre Gedanken fest und greifen Sie sicher von jedem Gerät darauf zu."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
+msgid "Joplin Server Business"
+msgstr "Joplin Server Business"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
+msgid "Joplin Server Business is a synchronisation server that you can install on your own infrastructure, so that your data remains private and secure within your business."
+msgstr "Joplin Server Business ist ein Synchronisationsserver, den Sie auf Ihrer eigenen Infrastruktur installieren können, sodass Ihre Daten innerhalb Ihres Unternehmens privat und sicher bleiben."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
+msgid "More about E2EE"
+msgstr "Mehr zu E2EE"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
+msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
+msgstr "Unsere <span class=\"frame-bg frame-bg-blue-lg\">Sponsoren</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
+msgid "Our synchronisation and sharing <span class=\"frame-bg frame-bg-yellow\">solutions</span>"
+msgstr "Unsere <span class=\"frame-bg frame-bg-yellow\">Lösungen</span> für Synchronisation und Zusammenarbeit"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
+msgid "Pay Monthly"
+msgstr "Monatlich zahlen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
+msgid "Pay Yearly"
+msgstr "Jährlich zahlen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
+msgid "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
+msgstr "Speichern Sie <span class=\"frame-bg frame-bg-blue\">Webseiten</span> <br>als Notizen"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
+msgid "Sign up with Joplin Cloud"
+msgstr "Mit Joplin Cloud registrieren"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid "Synchronise and share your notes with our range of plans."
+msgstr "Synchronisieren und teilen Sie Ihre Notizen mit unseren verschiedenen Tarifen."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
+msgid "Thank you for your support!"
+msgstr "Vielen Dank für Ihre Unterstützung!"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
+msgid "The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them."
+msgstr "Die App ist Open Source und Ihre Notizen werden in einem offenen Format gespeichert, sodass Sie jederzeit Zugriff darauf haben. Sie verwendet Ende-zu-Ende-Verschlüsselung (E2EE), um Ihre Notizen zu schützen und sicherzustellen, dass niemand außer Ihnen darauf zugreifen kann."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
+msgid "Try it now"
+msgstr "Jetzt ausprobieren"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
+msgid "Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes."
+msgstr "Verwenden Sie die Web-Clipper-Erweiterung für Chrome und Firefox, um Webseiten zu speichern oder Screenshots als Notizen zu erstellen."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
+msgid "With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them."
+msgstr "Mit Joplin Cloud können Sie Ihre Notizen mit Freunden, Familie oder Kollegen teilen und gemeinsam daran arbeiten."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
+msgstr "Gemeinsam <span class=\"frame-bg frame-bg-yellow\">arbeiten</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
+msgid "You can also publish a note to the internet and share the URL with others."
+msgstr "Sie können eine Notiz auch im Internet veröffentlichen und die URL mit anderen teilen."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
+msgid "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you are"
+msgstr "Ihre Notizen, <span class=\"frame-bg frame-bg-blue-lg\">überall</span>, wo Sie sind"

Assets/WebsiteAssets/locales/fr_FR.po

@@ -1,8 +1,6 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -11,18 +9,235 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
-msgid "Download the app"
-msgstr "Télécharger l'application"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
+msgid "/month"
+msgstr "/mois"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
+msgid "/year"
+msgstr "/an"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
+msgid ""
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
+"synchronise your notes across devices. It also lets you publish notes, and "
+"collaborate on notebooks with your friends, family or colleagues."
+msgstr ""
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> vous permet de "
+"synchroniser vos notes entre vos appareils. Il vous permet également de "
+"publier des notes et de collaborer sur des carnets avec vos amis, votre "
+"famille ou vos collègues."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
+msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
+msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">Personnalisez</span>-la"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
+msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
+msgstr "Notes <span class=\"frame-bg frame-bg-yellow\">multimédia</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
+msgstr "100 % <span class=\"frame-bg frame-bg-yellow-lg\">vos données</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
+msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
+msgstr ""
+"Une alternative <span class=\"frame-bg frame-bg-yellow-lg\">française</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
+msgid ""
+"Access your notes from your computer, phone or tablet by synchronising with "
+"various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
+"available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
+"available!"
+msgstr ""
+"Accédez à vos notes depuis votre ordinateur, téléphone ou tablette en les "
+"synchronisant avec différents services, notamment Joplin Cloud, Dropbox et "
+"OneDrive. L’application est disponible sur Windows, macOS, Linux, Android et "
+"iOS. Une application en ligne de commande est également disponible !"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
+msgid ""
+"Already have a Joplin Cloud account? <a href=\"https://joplincloud.com"
+"\">Login now</a>"
+msgstr ""
+"Vous avez déjà un compte Joplin Cloud ? <a href=\"https://joplincloud.com"
+"\">Connectez-vous maintenant</a>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
+msgid ""
+"Customise the app with plugins, custom themes and multiple text editors "
+"(Rich Text or Markdown). Or create your own scripts and plugins using the "
+"Extension API."
+msgstr ""
+"Personnalisez l’application avec des extensions, des thèmes personnalisés et "
+"plusieurs éditeurs de texte (texte enrichi ou Markdown). Ou créez vos "
+"propres scripts et extensions grâce à l’API d’extension."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
+msgid "Download it now"
+msgstr "Téléchargez maintenant"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
+msgid "Download the app"
+msgstr "Télécharger l'appli"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
+msgid "Find out more"
+msgstr "En savoir plus"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr "Libérez vos <span class=\"frame-bg frame-bg-blue\">notes</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
-msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
-msgstr "Joplin est une application libre de prise de notes. Capturez vos pensées et accédez-y de façon sécurisé depuis n'importe quel appareil."
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
+msgid "Get the clipper"
+msgstr "Obtenir le clipper"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
+msgid ""
+"Images, videos, PDFs and audio files are supported. Create math expressions "
+"and diagrams directly from the app. Take photos with the mobile app and save "
+"them to a note."
+msgstr ""
+"Les images, vidéos, PDF et fichiers audio sont pris en charge. Créez des "
+"expressions mathématiques et des diagrammes directement depuis "
+"l’application. Prenez des photos avec l’application mobile et enregistrez-"
+"les dans une note."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
+msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
+msgstr "Dans la <span class=\"frame-bg frame-bg-yellow\">presse</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
+msgid "Joplin Cloud"
+msgstr "Joplin Cloud"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
+msgid ""
+"Joplin Cloud is based in France. This means your data is protected by strict "
+"European Union privacy laws. In addition, Joplin Cloud implements strong end-"
+"to-end encryption so that not even us can have access to your data."
+msgstr ""
+"Joplin Cloud est basé en France. Cela signifie que vos données sont "
+"protégées par les lois strictes de l’Union européenne en matière de "
+"confidentialité. De plus, Joplin Cloud met en œuvre un chiffrement de bout "
+"en bout robuste afin que même nous ne puissions pas accéder à vos données."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
+msgid ""
+"Joplin is an open source note-taking app. Capture your thoughts and securely "
+"access them from any device."
+msgstr ""
+"Joplin est une application libre de prise de notes. Capturez vos pensées et "
+"accédez-y de façon sécurisée depuis n'importe quel appareil."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
+msgid "Joplin Server Business"
+msgstr "Joplin Server Business"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
+msgid ""
+"Joplin Server Business is a synchronisation server that you can install on "
+"your own infrastructure, so that your data remains private and secure within "
+"your business."
+msgstr ""
+"Joplin Server Business est un serveur de synchronisation que vous pouvez "
+"installer sur votre propre infrastructure, afin que vos données restent "
+"privées et sécurisées au sein de votre entreprise."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
+msgid "More about E2EE"
+msgstr "En savoir plus sur le chiffrement de bout en bout"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
+msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
+msgstr "Nos <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
+msgid ""
+"Our synchronisation and sharing <span class=\"frame-bg frame-bg-yellow"
+"\">solutions</span>"
+msgstr ""
+"Nos <span class=\"frame-bg frame-bg-yellow\">solutions</span> de "
+"synchronisation et de partage"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
+msgid "Pay Monthly"
+msgstr "Payer mensuellement"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
+msgid "Pay Yearly"
+msgstr "Payer annuellement"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
+msgid ""
+"Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
+msgstr ""
+"Enregistrez des <span class=\"frame-bg frame-bg-blue\">pages web</span> "
+"<br>comme notes"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
 msgid "Sign up with Joplin Cloud"
 msgstr "S'inscrire sur Joplin Cloud"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid "Synchronise and share your notes with our range of plans."
+msgstr "Synchronisez et partagez vos notes grâce à notre gamme d’offres."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
+msgid "Thank you for your support!"
+msgstr "Merci pour votre soutien !"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
+msgid ""
+"The app is open source and your notes are saved to an open format, so you'll "
+"always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
+"notes and ensure no-one but yourself can access them."
+msgstr ""
+"L’application est open source et vos notes sont enregistrées dans un format "
+"ouvert, vous aurez donc toujours accès à celles-ci. Elle utilise le "
+"chiffrement de bout en bout (E2EE) pour sécuriser vos notes et garantir que "
+"personne d’autre que vous ne puisse y accéder."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
+msgid "Try it now"
+msgstr "Essayez-la maintenant"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
+msgid ""
+"Use the web clipper extension, available on Chrome and Firefox, to save web "
+"pages or take screenshots as notes."
+msgstr ""
+"Utilisez l’extension Web Clipper, disponible sur Chrome et Firefox, pour "
+"enregistrer des pages web ou des captures d’écran comme notes."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
+msgid ""
+"With Joplin Cloud, share your notes with your friends, family or colleagues "
+"and collaborate on them."
+msgstr ""
+"Avec Joplin Cloud, partagez vos notes avec vos amis, votre famille ou vos "
+"collègues et collaborez dessus."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
+msgstr "Travaillez <span class=\"frame-bg frame-bg-yellow\">ensemble</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
+msgid ""
+"You can also publish a note to the internet and share the URL with others."
+msgstr ""
+"Vous pouvez également publier une note sur Internet et partager son URL avec "
+"d’autres."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
+msgid ""
+"Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
+"are"
+msgstr ""
+"Vos notes, <span class=\"frame-bg frame-bg-blue-lg\">partout</span> où vous "
+"êtes"

Assets/WebsiteAssets/locales/hr_HR.po

@@ -0,0 +1,215 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Milo Ivir <mail@mivirtype.de>\n"
+"Language-Team: \n"
+"Language: hr_HR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 3.6\n"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
+msgid "/month"
+msgstr "/mjesec"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
+msgid "/year"
+msgstr "/godina"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
+msgid ""
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
+"synchronise your notes across devices. It also lets you publish notes, and "
+"collaborate on notebooks with your friends, family or colleagues."
+msgstr ""
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> omogućuje "
+"sinkronizaciju bilješki na različitim uređajima. Omogućuje i objavljivanje "
+"bilješki i suradnju na bilježnicama s prijateljima, obitelji ili kolegama."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
+msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
+msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">Prilagodi</span> uslugu"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
+msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">Multimedijske</span> bilješke"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
+msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
+msgstr "100 % <span class=\"frame-bg frame-bg-yellow-lg\">tvoji podaci</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
+msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
+msgstr ""
+"<span class=\"frame-bg frame-bg-yellow-lg\">Francuska</span> alternativa"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
+msgid ""
+"Access your notes from your computer, phone or tablet by synchronising with "
+"various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
+"available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
+"available!"
+msgstr ""
+"Pristupi svojim bilješkama s računala, mobitela ili tableta sinkronizacijom "
+"s raznim uslugama, uključujući Joplin Cloud, Dropbox i OneDrive. Program je "
+"dostupan za Windows, macOS, Linux, Android i iOS sustave. Dostupan je i "
+"program za terminal!"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid ""
+"Already have a Joplin Cloud account? <a href=\"https://"
+"joplincloud.com\">Login now</a>"
+msgstr ""
+"Već imaš Joplin Cloud račun? <a href=\"https://joplincloud.com\">Prijavi se "
+"sada</a>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
+msgid ""
+"Customise the app with plugins, custom themes and multiple text editors "
+"(Rich Text or Markdown). Or create your own scripts and plugins using the "
+"Extension API."
+msgstr ""
+"Prilagodi program pomoću dodataka, prilagođenih tema i uređivača teksta "
+"(formatirani tekst ili Markdown). Ili izradi vlastita skripta i dodatke "
+"pomoću API-ja za proširenja."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
+msgid "Download it now"
+msgstr "Preuzmi sada"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
+msgid "Download the app"
+msgstr "Preuzmi program"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
+msgid "Find out more"
+msgstr "Saznaj više"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
+msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
+msgstr "Oslobodi svoje <span class=\"frame-bg frame-bg-blue\">bilješke</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
+msgid "Get the clipper"
+msgstr "Nabavi Clipper"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
+msgid ""
+"Images, videos, PDFs and audio files are supported. Create math expressions "
+"and diagrams directly from the app. Take photos with the mobile app and save "
+"them to a note."
+msgstr ""
+"Podržane su slike, videozapisi, PDF-ovi i audio datoteke. Stvori matematičke "
+"izraze i dijagrame izravno iz programa. Snimaj fotografije s programom za "
+"mobitel i spremi ih u bilješku."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
+msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">Recenzije</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
+msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
+msgstr "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">tarife</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
+msgid ""
+"Joplin Cloud is based in France. This means your data is protected by strict "
+"European Union privacy laws. In addition, Joplin Cloud implements strong end-"
+"to-end encryption so that not even us can have access to your data."
+msgstr ""
+"Joplin Cloud ima sjedište u Francuskoj. To znači da su tvoji podaci "
+"zaštićeni strogim zakonima o privatnosti Europske unije. Osim toga, Joplin "
+"Cloud implementira snažno sveobuhvatno šifriranje (end-to-end encryption) "
+"tako da čak ni mi ne možemo pristupiti tvojim podacima."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
+msgid ""
+"Joplin is an open source note-taking app. Capture your thoughts and securely "
+"access them from any device."
+msgstr ""
+"Joplin je program za bilješke otvorenog koda. Zabilježi svoje misli i "
+"sigurno im pristupi s bilo kojeg uređaja."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
+msgid "More about E2EE"
+msgstr "Više o E2EE"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
+msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
+msgstr "Naši <span class=\"frame-bg frame-bg-blue-lg\">sponzori</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
+msgid "Pay Monthly"
+msgstr "Plaćaj mjesečno"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
+msgid "Pay Yearly"
+msgstr "Plaćaj godišnje"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
+msgid ""
+"Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
+msgstr ""
+"Spremaj <span class=\"frame-bg frame-bg-blue\">web stranice</span> <br>kao "
+"bilješke"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
+msgid "Sign up with Joplin Cloud"
+msgstr "Registriraj se na Joplin Cloud"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
+msgid "Thank you for your support!"
+msgstr "Hvala ti na podršci!"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+msgid ""
+"The app is open source and your notes are saved to an open format, so you'll "
+"always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
+"notes and ensure no-one but yourself can access them."
+msgstr ""
+"Program je otvorenog koda i tvoje se bilješke spremaju u otvorenom formatu, "
+"tako da ćeš im uvijek moći pristupiti. Program koristi sveobuhvatno "
+"šifriranje – engl. End-To-End Encryption (E2EE) – kako bi zaštitila tvoje "
+"bilješke i osigurala da im nitko osim tebe ne može pristupiti."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
+msgid "Try it now"
+msgstr "Isprobaj sada"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
+msgid ""
+"Use the web clipper extension, available on Chrome and Firefox, to save web "
+"pages or take screenshots as notes."
+msgstr ""
+"Koristi proširenje Web Clipper, dostupno za Chrome i Firefox, za spremanje "
+"web stranica ili snimanje ekrana kao bilješku."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+msgid ""
+"With Joplin Cloud, share your notes with your friends, family or colleagues "
+"and collaborate on them."
+msgstr ""
+"Joplin Cloud ti omogućuje da dijeliš bilješke s prijateljima, obitelji ili "
+"kolegama te da na njima surađujete."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
+msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">Surađuj</span> s drugima"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
+msgid ""
+"You can also publish a note to the internet and share the URL with others."
+msgstr "Bilješke možeš objaviti i na internetu te dijeliti URL s drugima."
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
+msgid ""
+"Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
+"are"
+msgstr ""
+"Tvoje bilješke, <span class=\"frame-bg frame-bg-blue-lg\">gdje god</span> se "
+"nalaziš"

Assets/WebsiteAssets/locales/zh_CN.po

@@ -9,194 +9,213 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
 msgid "/month"
 msgstr "/月"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
 msgid "/year"
 msgstr "/年"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
 msgid ""
 "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to "
 "synchronise your notes across devices. It also lets you publish notes, and "
 "collaborate on notebooks with your friends, family or colleagues."
 msgstr ""
-"<a href=\"https://joplincloud.com\">Joplin Cloud</a> 允许您在不同的设备上同步"
-"您的笔记。它还可以让您发布笔记，并与您的朋友、家人或同事在笔记本上进行协作。"
+"<a href=\"https://joplincloud.com\">Joplin Cloud</a> 允许您在不同设备之间同步笔记。"
+"它还支持发布笔记，并与朋友、家人或同事协作共享笔记本。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
 msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
-msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">定制</span>它 根据您的需要"
+msgstr "<span class=\"frame-bg frame-bg-yellow-lg\">自定义</span>它"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
 msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">多媒体</span>说明"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">多媒体</span>笔记"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
 msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
-msgstr "百分之百<span class=\"frame-bg frame-bg-yellow-lg\">你的数据</span>"
+msgstr "100% <span class=\"frame-bg frame-bg-yellow-lg\">属于你的数据</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
 msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
-msgstr "一个<span class=\"frame-bg frame-bg-yellow-lg\">法国</span>的替代方案"
+msgstr "一个<span class=\"frame-bg frame-bg-yellow-lg\">法国</span>替代方案"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
 msgid ""
 "Access your notes from your computer, phone or tablet by synchronising with "
 "various services, including Joplin Cloud, Dropbox and OneDrive. The app is "
 "available on Windows, macOS, Linux, Android and iOS. A terminal app is also "
 "available!"
 msgstr ""
-"通过与各种服务同步，包括Joplin Cloud、Dropbox和OneDrive，从你的电脑、手机或平"
-"板电脑访问你的笔记。该应用程序可在Windows、macOS、Linux、Android和iOS上使用。"
-"终端应用也可使用!"
+"通过与包括 Joplin Cloud、Dropbox 和 OneDrive 在内的多种服务同步，"
+"您可以在电脑、手机或平板上访问笔记。该应用支持 Windows、macOS、Linux、Android 和 iOS。"
+"同时还提供终端版本应用！"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
 msgid ""
-"Already have a Joplin Cloud account? <a href=\"https://joplincloud.com"
-"\">Login now</a>"
+"Already have a Joplin Cloud account? <a href=\"https://"
+"joplincloud.com\">Login now</a>"
 msgstr ""
+"已经拥有 Joplin Cloud 账户？<a href=\"https://joplincloud.com\">立即登录</a>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
 msgid ""
 "Customise the app with plugins, custom themes and multiple text editors "
 "(Rich Text or Markdown). Or create your own scripts and plugins using the "
 "Extension API."
 msgstr ""
-"用插件、自定义主题和多个文本编辑器（富文本或马克顿）来定制该应用程序。或者使"
-"用扩展API创建你自己的脚本和插件。"
+"通过插件、自定义主题和多种文本编辑器（富文本或 Markdown）来自定义应用。"
+"您也可以使用扩展 API 创建自己的脚本和插件。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
 msgid "Download it now"
-msgstr "下载该应用程序"
+msgstr "立即下载"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
 msgid "Download the app"
-msgstr "下载该应用程序"
+msgstr "下载应用"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
 msgid "Find out more"
 msgstr "了解更多"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr "释放你的<span class=\"frame-bg frame-bg-blue\">笔记</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
 msgid "Get the clipper"
-msgstr "获取剪子"
+msgstr "获取网页剪藏器"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
 msgid ""
 "Images, videos, PDFs and audio files are supported. Create math expressions "
 "and diagrams directly from the app. Take photos with the mobile app and save "
 "them to a note."
 msgstr ""
-"Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受限"
-"制，以及您的使用数据的完全透明和安全。"
+"支持图片、视频、PDF 和音频文件。可在应用内直接创建数学公式和图表。"
+"还可通过移动端拍照并保存到笔记中。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
 msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
-msgstr ""
+msgstr "媒体<span class=\"frame-bg frame-bg-yellow\">报道</span>"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
-msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
-msgstr "乔普林云<span class=\"frame-bg frame-bg-yellow\">计划</span>"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
+msgid "Joplin Cloud"
+msgstr "Joplin Cloud"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
 msgid ""
 "Joplin Cloud is based in France. This means your data is protected by strict "
 "European Union privacy laws. In addition, Joplin Cloud implements strong end-"
 "to-end encryption so that not even us can have access to your data."
 msgstr ""
-"Joplin Cloud 位于法国。 这意味着您的数据受到严格的欧盟隐私法的保护。 此外，"
-"Joplin Cloud 实施了强大的端到端加密，因此即使是我们也无法访问您的数据。"
+"Joplin Cloud 位于法国，这意味着您的数据受到严格的欧盟隐私法规保护。"
+"此外，Joplin Cloud 采用强大的端到端加密技术，确保连我们也无法访问您的数据。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
 msgid ""
 "Joplin is an open source note-taking app. Capture your thoughts and securely "
 "access them from any device."
 msgstr ""
-"Joplin是一个开源的记事本应用程序。捕捉你的想法并从任何设备上安全地访问它们。"
+"Joplin 是一款开源笔记应用。随时记录想法，并可在任何设备上安全访问。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
-msgid "More about E2EE"
-msgstr "关于E2EE的更多信息"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
+msgid "Joplin Server Business"
+msgstr "Joplin Server 商业版"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
-msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
+msgid ""
+"Joplin Server Business is a synchronisation server that you can install on "
+"your own infrastructure, so that your data remains private and secure within "
+"your business."
 msgstr ""
+"Joplin Server 商业版是一款可部署在您自有基础设施上的同步服务器，"
+"确保您的数据在企业内部保持私密与安全。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
+msgid "More about E2EE"
+msgstr "了解更多关于 E2EE"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
+msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
+msgstr "我们的<span class=\"frame-bg frame-bg-blue-lg\">赞助商</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
+msgid ""
+"Our synchronisation and sharing <span class=\"frame-bg frame-bg-"
+"yellow\">solutions</span>"
+msgstr ""
+"我们的同步与共享<span class=\"frame-bg frame-bg-yellow\">解决方案</span>"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
 msgid "Pay Monthly"
-msgstr "月度"
+msgstr "按月付费"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
 msgid "Pay Yearly"
-msgstr "每年一次"
+msgstr "按年付费"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
 msgid ""
 "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
-msgstr "保存<span class=\"frame-bg frame-bg-blue\">网页</span> <br>作为笔记"
+msgstr "将<span class=\"frame-bg frame-bg-blue\">网页</span><br>保存为笔记"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
 msgid "Sign up with Joplin Cloud"
-msgstr "与乔布林云签约"
+msgstr "注册 Joplin Cloud"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid "Synchronise and share your notes with our range of plans."
+msgstr "通过我们的多种方案同步并共享您的笔记。"
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
 msgid "Thank you for your support!"
-msgstr ""
+msgstr "感谢您的支持！"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
 msgid ""
 "The app is open source and your notes are saved to an open format, so you'll "
 "always have access to them. Uses End-To-End Encryption (E2EE) to secure your "
 "notes and ensure no-one but yourself can access them."
 msgstr ""
-"该应用程序是开源的，你的笔记被保存为开放的格式，所以你将永远可以访问它们。使"
-"用端对端加密（E2EE）来保护你的笔记，确保除了你自己之外没有人可以访问它们。"
+"该应用为开源软件，笔记以开放格式保存，确保您始终可以访问。"
+"采用端到端加密（E2EE）保护您的笔记，确保只有您本人可以访问。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
 msgid "Try it now"
-msgstr "现在就试试吧"
+msgstr "立即体验"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
 msgid ""
 "Use the web clipper extension, available on Chrome and Firefox, to save web "
 "pages or take screenshots as notes."
-msgstr "使用Chrome和Firefox上的web clipper扩展，可以保存网页或截图作为笔记。"
+msgstr ""
+"使用适用于 Chrome 和 Firefox 的网页剪藏扩展，将网页或截图保存为笔记。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
 msgid ""
 "With Joplin Cloud, share your notes with your friends, family or colleagues "
 "and collaborate on them."
-msgstr "通过乔普林云，与你的朋友、家人或同事分享你的笔记，并进行合作。"
+msgstr ""
+"通过 Joplin Cloud，与朋友、家人或同事共享笔记并协作编辑。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
 msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
-msgstr "<span class=\"frame-bg frame-bg-yellow\">一起</span>工作"
+msgstr "<span class=\"frame-bg frame-bg-yellow\">协作</span>工作"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
 msgid ""
 "You can also publish a note to the internet and share the URL with others."
-msgstr "您还可以将笔记发布到 Internet 并与其他人共享 URL。"
+msgstr "您还可以将笔记发布到互联网，并与他人分享链接。"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
 msgid ""
 "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you "
 "are"
 msgstr ""
-"你的笔记<span class=\"frame-bg frame-bg-blue-lg\">你在哪里都可以</span>"
-
-#~ msgid ""
-#~ "Joplin, due to its origin and design, adapts and respects Chinese "
-#~ "standards and rules. This guarantees your unrestricted use and complete "
-#~ "transparency and security of your usage data."
-#~ msgstr ""
-#~ "Joplin，由于其起源和设计，适应并尊重中国的标准和规则。这保证了您的使用不受"
-#~ "限制，以及您的使用数据的完全透明和安全。"
+"无论身在何处，您的笔记都<span class=\"frame-bg frame-bg-blue-lg\">随时可达</span>"

Assets/WebsiteAssets/rss.xml

@@ -1,4 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 28 Apr 2025 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 28 Apr 2025 00:00:00 GMT</pubDate><item><title><![CDATA[What's new in Joplin 3.3]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
+<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Joplin]]></title><description><![CDATA[Joplin, the open source note-taking application]]></description><link>https://joplinapp.org</link><generator>RSS for Node</generator><lastBuildDate>Mon, 23 Feb 2026 00:00:00 GMT</lastBuildDate><atom:link href="https://joplinapp.org/rss.xml" rel="self" type="application/rss+xml"/><pubDate>Mon, 23 Feb 2026 00:00:00 GMT</pubDate><item><title><![CDATA[Introducing our Warrant Canary]]></title><description><![CDATA[<p>We have introduced a publicly signed warrant canary for Joplin.</p>
+<p>A warrant canary is a regularly updated statement confirming that, as of the stated date, the project has not received secret legal orders, gag orders, or demands requiring the introduction of backdoors into the software or its infrastructure.</p>
+<p>The canary is:</p>
+<ul>
+<li>
+<p>Cryptographically signed using a dedicated OpenPGP key</p>
+</li>
+<li>
+<p>Updated every 60 days</p>
+</li>
+<li>
+<p>Published in plain text for independent verification</p>
+</li>
+</ul>
+<p>If the canary is not updated within its stated validity window, it should be considered expired.</p>
+<p>You can view and verify the current canary here:</p>
+<p><a href="https://raw.githubusercontent.com/laurent22/joplin/refs/heads/dev/readme/canary.txt">https://raw.githubusercontent.com/laurent22/joplin/refs/heads/dev/readme/canary.txt</a></p>
+<p>With additional information on how it is generated and managed there:</p>
+<p><a href="https://github.com/laurent22/joplin/blob/dev/readme/canary.md">https://github.com/laurent22/joplin/blob/dev/readme/canary.md</a></p>
+<p>This measure is intended to improve transparency and provide an additional signal to the community. It does not prevent legal orders, but it helps ensure that any material change in our legal status cannot occur silently.</p>
+]]></description><link>https://joplinapp.org/news/20260223-warrant-canary</link><guid isPermaLink="false">20260223-warrant-canary</guid><pubDate>Mon, 23 Feb 2026 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Joplin will come preloaded on the HMD Terra M]]></title><description><![CDATA[<div style="overflow: auto;">
+<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260210-hmd-joplin-logo.png" width="200px" style="float: left; margin-right: 16px; margin-bottom: 16px;"/>
+<p>We’re happy to announce a collaboration with <a href="https://www.hmdsecure.com/">HMD Secure</a>, who will preload Joplin on their upcoming device, the HMD Terra M.</p>
+<p>This partnership brings Joplin to a new class of rugged, professional devices built for instant reliable communication, and reflects a shared focus on reliability, security, and long-term use.</p>
+</div>
+<h2>About HMD Secure<a name="about-hmd-secure" href="#about-hmd-secure" class="heading-anchor">🔗</a></h2>
+<p>HMD Secure Oy is a subsidiary of HMD (Human Mobile Devices), the largest European smartphone manufacturer. Headquartered in Finland, HMD Secure develops rugged, sovereign, and secure solutions for governments, defence, public safety, enterprise, and critical infrastructure.</p>
+<p>Built on a foundation of European R&amp;D and enhanced supply chain traceability and security, HMD Secure offers organisations a trusted platform for sovereignty, resilience, and long-term control.</p>
+<h2>About the HMD Terra M<a name="about-the-hmd-terra-m" href="#about-the-hmd-terra-m" class="heading-anchor">🔗</a></h2>
+<p>The <a href="https://www.hmdsecure.com/hmd-terra-m">HMD Terra M</a> is a compact, ultra-rugged smart feature phone delivered as a fully managed, mission-critical communications solution. Designed for professionals operating in demanding environments, it combines MIL-STD-810H and IP68/IP69K durability with instant Push-to-Talk, programmable PTT and emergency keys, loud high-output audio, and long battery life.</p>
+<p>Built for rapid enterprise deployment, Terra M supports modern connectivity including dual SIM and eSIM, enterprise-grade MDM, and secure applications—enabling organisations to deploy, manage, and scale frontline communications reliably from day one.</p>
+<h2>Why Joplin on the Terra M<a name="why-joplin-on-the-terra-m" href="#why-joplin-on-the-terra-m" class="heading-anchor">🔗</a></h2>
+<p>Joplin’s <strong>offline-first design</strong>, <strong>end-to-end encryption</strong>, and focus on <strong>data ownership</strong> make it a natural fit for a device built to be trusted in the field. With Joplin preloaded, Terra M users can securely capture notes, procedures, and checklists from day one, even in challenging conditions.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260210-hmd-terra-m.jpg" alt="The HMD Terra M phone"></p>
+]]></description><link>https://joplinapp.org/news/20260210-hmd-terra-m</link><guid isPermaLink="false">20260210-hmd-terra-m</guid><pubDate>Tue, 10 Feb 2026 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.5]]></title><description><![CDATA[<h2>Improvements across desktop and mobile<a name="improvements-across-desktop-and-mobile" href="#improvements-across-desktop-and-mobile" class="heading-anchor">🔗</a></h2>
+<h3>More stable and consistent Markdown editing<a name="more-stable-and-consistent-markdown-editing" href="#more-stable-and-consistent-markdown-editing" class="heading-anchor">🔗</a></h3>
+<p>The Markdown editor has been refined to feel more stable and closer to the final rendered view. Headings in the editor now more closely match how they appear when viewing a note, reducing the visual jump between editing and reading. Layout issues have also been addressed so elements like rendered checkboxes and images no longer cause the editor to shift unexpectedly while typing.</p>
+<p>The ABC music notation plugin appeared to be popular but had some limitations. With this new version, ABC is now part of the app, which means it can now work from published notes, and from the Rich Text editor!</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-abc.png" alt="ABC music notation rendered directly in Joplin, showing a short musical phrase displayed from plain-text ABC syntax"></p>
+<h3>Smoother switching between notes<a name="smoother-switching-between-notes" href="#smoother-switching-between-notes" class="heading-anchor">🔗</a></h3>
+<p>Switching between notes is now less disruptive. Joplin restores cursor position and scroll location more reliably, making it easier to move back and forth between notes—especially when working with longer documents or comparing content—without losing your place.</p>
+<h3>Case insensitive tags<a name="case-insensitive-tags" href="#case-insensitive-tags" class="heading-anchor">🔗</a></h3>
+<p>Tags are now treated in a case-insensitive way, which helps prevent duplicate tags caused by differences in capitalisation, while still allowing mixed-case tag names. All this time we were hoping that @dpoulton <a href="https://discourse.joplinapp.org/t/tags-lower-case-only/4220/106">would just get used to lowercase tags</a>, but 5 years later it looks like it's not happening ;) So thank you @mrjo118 for implementing it!</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-lowercase-tags.png" alt="Joplin tag list demonstrating case-insensitive tags, with mixed-case tag names merged into a single tag."></p>
+<h3>More reliable syncing and sharing<a name="more-reliable-syncing-and-sharing" href="#more-reliable-syncing-and-sharing" class="heading-anchor">🔗</a></h3>
+<p>Syncing and sharing have been made more robust in everyday use. Joplin now handles repeated syncs more efficiently, avoids unnecessary data usage, and is better at detecting and syncing all changes, particularly when using WebDAV and S3 sync targets.</p>
+<p>Moreover filesystem synchronisation is now more reliable, in particular when used alongside tools like SyncThing on both mobile and desktop.</p>
+<h3>Accessibility and readability improvements<a name="accessibility-and-readability-improvements" href="#accessibility-and-readability-improvements" class="heading-anchor">🔗</a></h3>
+<p>Accessibility has seen further refinements in this release. Dark mode readability has been improved, common editor elements are clearer, and animations are reduced or disabled when system “reduce motion” settings are enabled, making the app more comfortable to use for a wider range of users. Keyboard navigation has also been improved on the desktop application.</p>
+<h2>Desktop-specific improvements<a name="desktop-specific-improvements" href="#desktop-specific-improvements" class="heading-anchor">🔗</a></h2>
+<h3>Easier profile management<a name="easier-profile-management" href="#easier-profile-management" class="heading-anchor">🔗</a></h3>
+<p>Managing multiple profiles on desktop is now simpler thanks to a new, more user-friendly profile management interface. This removes the need to manually edit configuration files and makes switching between different setups easier and safer.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-profiles.png" alt="Desktop profile management screen in Joplin showing multiple profiles with options to rename or delete them."></p>
+<h3>Significantly improved OneNote import<a name="significantly-improved-onenote-import" href="#significantly-improved-onenote-import" class="heading-anchor">🔗</a></h3>
+<p>Importing content from OneNote is now more reliable and accurate. Support has been expanded to cover more OneNote file formats, and many edge cases have been addressed so imported notes more closely match their original structure and content. This makes migrating from OneNote to Joplin smoother and more trustworthy.</p>
+<h3>Better tools for organising large note collections<a name="better-tools-for-organising-large-note-collections" href="#better-tools-for-organising-large-note-collections" class="heading-anchor">🔗</a></h3>
+<p>Desktop users can now select multiple notebooks at once, making it easier to reorganise notebook structures, move groups of notes, or clean up larger collections without working notebook by notebook.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-multi-select.png" alt="Joplin desktop sidebar with several notebooks selected at the same time for bulk organisation."></p>
+<h3>Polished editing experience on desktop<a name="polished-editing-experience-on-desktop" href="#polished-editing-experience-on-desktop" class="heading-anchor">🔗</a></h3>
+<p>Both the Markdown and Rich Text editors have been further refined. Cursor behaviour is more predictable, visual consistency between editing and viewing has improved, and several layout and rendering issues have been fixed to reduce interruptions while writing.</p>
+<h3>More reliable search and navigation<a name="more-reliable-search-and-navigation" href="#more-reliable-search-and-navigation" class="heading-anchor">🔗</a></h3>
+<p>Search and navigation on desktop have been improved with fixes that ensure search results behave consistently and remain visible when moving between windows or views.</p>
+<h3>Improved math support in WebClipper<a name="improved-math-support-in-webclipper" href="#improved-math-support-in-webclipper" class="heading-anchor">🔗</a></h3>
+<p>The WebClipper is not forgotten in this release - clipping certain math formulas, in particular from Wikipedia but also other websites, has been improved. Additionally, certain scientific articles are now also better handled by the WebClipper.</p>
+<h2>Mobile-specific improvements<a name="mobile-specific-improvements" href="#mobile-specific-improvements" class="heading-anchor">🔗</a></h2>
+<h3>A more powerful Rich Text Editor on mobile<a name="a-more-powerful-rich-text-editor-on-mobile" href="#a-more-powerful-rich-text-editor-on-mobile" class="heading-anchor">🔗</a></h3>
+<p>The mobile Rich Text Editor continues to improve, with new and expanded support for tables, code blocks, and other structured content. These changes make it easier to create and edit more complex notes directly on mobile devices.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-rte1.png" alt="Joplin mobile Rich Text Editor showing table editing controls and an embedded code block inside a note."></p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-rte2.png" alt="Mobile code block editor in Joplin with a Python code snippet displayed in an editable dialog."></p>
+<h3>Easier tag management on mobile<a name="easier-tag-management-on-mobile" href="#easier-tag-management-on-mobile" class="heading-anchor">🔗</a></h3>
+<p>Managing tags on mobile is now more practical. You can rename and delete tags directly from the app, and searching through tags is easier, helping keep large tag lists organised over time.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20260111-mobile-tags.png" alt="Joplin mobile tag management screen showing a tag options menu with rename and delete actions."></p>
+<h3>Improved stability and usability on mobile devices<a name="improved-stability-and-usability-on-mobile-devices" href="#improved-stability-and-usability-on-mobile-devices" class="heading-anchor">🔗</a></h3>
+<p>Several fixes improve overall stability and usability on mobile, particularly on smaller screens. Issues causing UI elements to appear off-screen have been addressed, and the app behaves more consistently in situations that previously caused hangs or visual glitches.</p>
+<h2>Bug fixes and security fixes across platforms<a name="bug-fixes-and-security-fixes-across-platforms" href="#bug-fixes-and-security-fixes-across-platforms" class="heading-anchor">🔗</a></h2>
+<h3>A large number of stability, correctness and security fixes<a name="a-large-number-of-stability-correctness-and-security-fixes" href="#a-large-number-of-stability-correctness-and-security-fixes" class="heading-anchor">🔗</a></h3>
+<p>Joplin 3.5 includes about 114 bug fixes across desktop and mobile, addressing issues in editing, syncing, importing, rendering, and general stability. Many fixes target edge cases that could lead to crashes, inconsistent behaviour, or rare data loss scenarios. Moreover, this version includes several vulnerability fixes to make the applications more secure.</p>
+]]></description><link>https://joplinapp.org/news/20260111-release-3-5</link><guid isPermaLink="false">20260111-release-3-5</guid><pubDate>Sun, 11 Jan 2026 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.4]]></title><description><![CDATA[<p>Joplin 3.4 includes many bug fixes and improvements, with a focus on the mobile app.</p>
+<h2>Mobile<a name="mobile" href="#mobile" class="heading-anchor">🔗</a></h2>
+<h3>Rich Text Editor<a name="rich-text-editor" href="#rich-text-editor" class="heading-anchor">🔗</a></h3>
+<p>The mobile app now includes a beta <a href="https://joplinapp.org/help/apps/rich_text_editor">Rich Text Editor</a>! The new editor renders formatting/math/images within the editor:</p>
+<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-mobile-rte.png" width="400" alt="screenshot: Mobile Rich Text Editor editing the welcome notes. Images, headings, etc are rendering."/>
+<p>To try it, 1) open a note in the default Markdown editor 2) open the note actions menu (the three vertical dots) for the note and 3) click “Edit as Rich Text”.</p>
+<p>Be aware that this editor is still in active development and <a href="https://github.com/laurent22/joplin/issues/12840">has a number of known limitations and issues</a>. The Rich Text editor is based on <a href="https://prosemirror.net/">ProseMirror</a> and will behave differently from the desktop Rich Text Editor in many cases.</p>
+<h3>Support for publishing notes with Joplin Cloud and Server<a name="support-for-publishing-notes-with-joplin-cloud-and-server" href="#support-for-publishing-notes-with-joplin-cloud-and-server" class="heading-anchor">🔗</a></h3>
+<p>It's now possible to <a href="https://joplinapp.org/help/apps/publish_note">publish notes</a> from the mobile app! To do so, open the “Properties” menu for a note, then click “Publish/unpublish”:</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-publish-notes.png" alt="screenshot: A Publish/unpublish note action is shown in the &quot;Note properties&quot; sidebar, just below a &quot;Previous versions&quot; button"></p>
+<p>Next, in the “publish note” dialog, click “Copy shareable link”. Notes can later be unpublished by clicking &quot;Unpublish&quot; in the publication dialog.</p>
+<h3>Viewing note history<a name="viewing-note-history" href="#viewing-note-history" class="heading-anchor">🔗</a></h3>
+<p>It is now possible to view and restore previous note versions from the mobile app. Like the &quot;publish note&quot; feature, previous note versions can be accessed from the note properties menu.</p>
+<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-note-history.png" alt="screenshot: The note history page"></p>
+<p>As on desktop, the note history feature can be configured from the “Note History” tab in settings.</p>
+<h3>Updated tag dialog<a name="updated-tag-dialog" href="#updated-tag-dialog" class="heading-anchor">🔗</a></h3>
+<p>The tag dialog has been redesigned, with a new UI for adding, removing, and creating new tags:<br>
+<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-tag-editor.png" width="500" alt="screenshot: Tag dialog now consists of three sections: Added tags, Add new tags, Actions."/></p>
+<h3>Android: Improved voice typing<a name="android-improved-voice-typing" href="#android-improved-voice-typing" class="heading-anchor">🔗</a></h3>
+<p>The voice typing feature on Android has been updated with <a href="https://github.com/laurent22/joplin/pull/12404">improved silence detection</a> and a new “<a href="https://github.com/laurent22/joplin/pull/12370">custom glossary</a>” setting. Voice typing also now <a href="https://github.com/laurent22/joplin/pull/12352">defaults to a more accurate (but somewhat slower) model</a>.</p>
+<h3>Quickly creating a note from multiple photos<a name="quickly-creating-a-note-from-multiple-photos" href="#quickly-creating-a-note-from-multiple-photos" class="heading-anchor">🔗</a></h3>
+<p>A “scan notebook” action has been added to the “New note” menu:</p>
+<img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20250922-scan-notebook.png" width="500"/>
+<p>This action allows quickly creating a new note with multiple pictures taken from the camera.</p>
+<h2>Desktop<a name="desktop" href="#desktop" class="heading-anchor">🔗</a></h2>
+<h3>More Markdown Editor settings<a name="more-markdown-editor-settings" href="#more-markdown-editor-settings" class="heading-anchor">🔗</a></h3>
+<p>The &quot;Note&quot; tab in settings now includes new settings for the Markdown editor, including:</p>
+<ul>
+<li>An option to render headers, lists, and certain other formatting within the editor.</li>
+<li>An option to render images in the editor.</li>
+</ul>
+<p>When enabled, these settings bring the Markdown editor closer to the Rich Text Editor, without <a href="https://joplinapp.org/help/apps/rich_text_editor">some of the Rich Text Editor's limitations</a>.</p>
+<p>These settings are also available on mobile.</p>
+<h3>Smaller application size and faster startup<a name="smaller-application-size-and-faster-startup" href="#smaller-application-size-and-faster-startup" class="heading-anchor">🔗</a></h3>
+<p>We've made the desktop application roughly 33% smaller! In addition to faster application startup, this means that the desktop app should be faster to download take up less space.</p>
+<table class="table">
+<thead>
+<tr>
+<th>Joplin version</th>
+<th>Previous size (v3.3.13)</th>
+<th>New size (v3.4.12)</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td>Joplin for MacOS (ARM)</td>
+<td>211 MB</td>
+<td>141 MB</td>
+</tr>
+<tr>
+<td>Joplin for Windows (installer)</td>
+<td>321 MB</td>
+<td>219 MB</td>
+</tr>
+<tr>
+<td>Joplin for Windows (portable)</td>
+<td>320 MB</td>
+<td>219 MB</td>
+</tr>
+<tr>
+<td>Joplin for Linux (AppImage)</td>
+<td>219 MB</td>
+<td>147 MB</td>
+</tr>
+</tbody>
+</table>
+<h2>Terminal app<a name="terminal-app" href="#terminal-app" class="heading-anchor">🔗</a></h2>
+<h3>Collapsible folders<a name="collapsible-folders" href="#collapsible-folders" class="heading-anchor">🔗</a></h3>
+<p>The <a href="https://joplinapp.org/help/apps/terminal/">terminal application</a> now supports expanding and collapsing folders by pressing <kbd>z</kbd>. For additional information, see <a href="https://github.com/laurent22/joplin/pull/12718">the original pull request</a>.</p>
+<h3>Managing shared notebooks and published notes<a name="managing-shared-notebooks-and-published-notes" href="#managing-shared-notebooks-and-published-notes" class="heading-anchor">🔗</a></h3>
+<p>New commands have been added to the terminal app, including <code>publish</code>, <code>unpublish</code>, and <code>share</code>. This allows the terminal app to manage shared folders and published notes.</p>
+<h2>Bug fixes<a name="bug-fixes" href="#bug-fixes" class="heading-anchor">🔗</a></h2>
+<p>For the full list of changes, see <a href="https://joplinapp.org/help/about/changelog/desktop/">the desktop changelog</a> and <a href="https://joplinapp.org/help/about/changelog/android/">the mobile changelog</a>.</p>
+]]></description><link>https://joplinapp.org/news/20250922-release-3-4</link><guid isPermaLink="false">20250922-release-3-4</guid><pubDate>Mon, 22 Sep 2025 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[What's new in Joplin 3.3]]></title><description><![CDATA[<h2>Desktop application<a name="desktop-application" href="#desktop-application" class="heading-anchor">🔗</a></h2>
 <h3>Accessibility improvements<a name="accessibility-improvements" href="#accessibility-improvements" class="heading-anchor">🔗</a></h3>
 <p>The Joplin 3.3 release introduces significant accessibility enhancements designed to make the application more inclusive and user-friendly. Users can now benefit from improved keyboard navigation, thanks to newly added shortcuts and clearer labels that streamline interaction across the interface. We've also added a &quot;go to viewer&quot; menu item that moves focus from the note editor to the note viewer. Focus is moved to the location in the viewer corresponding to the location of the cursor in the editor.</p>
 <p>Screen reader support has been bolstered, ensuring elements like the note list and sidebar are easier to toggle and interact with. These updates make the application more usable for individuals relying on assistive technologies.</p>
@@ -378,78 +528,4 @@ sys 0m38.013s</p>
 ]]></description><link>https://joplinapp.org/news/20230508-release-2-10</link><guid isPermaLink="false">20230508-release-2-10</guid><pubDate>Wed, 10 May 2023 12:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.10</twitter-text></item><item><title><![CDATA[Joplin will participate in JdLL 2023!]]></title><description><![CDATA[<p>On 1 and 2 April 2023, we will have a stand for Joplin at the <a href="https://www.jdll.org/">Journées du Logiciel Libre</a> in Lyon, France. The JdLL has been taking place in Lyon for 24 years and is a popular open source conference in France. We had a stand in 2020 and 2021 but that was cancelled due to Covid, so this year is a first for Joplin!</p>
 <p>Admission is free, so don't hesitate to come and meet us, exchange ideas and learn more about Joplin!</p>
 <p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230202-jdll.jpg" alt="Joplin at JdLL 2023"></p>
-]]></description><link>https://joplinapp.org/news/20230302-jdll-2023</link><guid isPermaLink="false">20230302-jdll-2023</guid><pubDate>Thu, 02 Mar 2023 00:00:00 GMT</pubDate><twitter-text></twitter-text></item><item><title><![CDATA[Introducing the "GitHub Actions Raw Log Viewer" extension for Chrome]]></title><description><![CDATA[<p>If you've ever used GitHub Actions, you will find that they provide by default a nice coloured output for the log. It looks good and it's even interactive! (You can click to collapse/expand blocks of text) But unfortunately it doesn't scale to large workflows, like we have for Joplin - the log can freeze and it will take forever to search for something. Indeed searching is done in &quot;real time&quot;... which mostly means it will freeze for a minute or two for each letter you type in the search box. Not great.</p>
-<p>Thankfully GitHub provides an alternative access: the raw logs. This is much better because they will open as plain text, without any styling or JS magic, which means you can use the browser native search and it will be fast.</p>
-<p>But now the problem is that raw logs look like this:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-ga-raw-log.png" alt="Raw log without extension"></p>
-<p>While it's not impossible to read, all colours that would display nicely in a terminal are gone and replaced by <a href="https://en.wikipedia.org/wiki/ANSI_escape_code">ANSI codes</a>. You can find what you need in there but it's not particularly easy.</p>
-<p>This is where the new <strong>GitHub Action Raw Log Viewer</strong> extension for Chrome can help. It will parse your raw log and convert the ANSI codes to proper colours. This results in a much more readable rendering:</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-ga-raw-log-colored.png" alt="Raw log with extension"></p>
-<p>The extension is fast even for very large logs and it's of course easy to search for text since it simply works with your browser built-in search.</p>
-<p>The extension is open source, with the code available here: <a href="https://github.com/laurent22/github-actions-logs-extension">https://github.com/laurent22/github-actions-logs-extension</a></p>
-<p>And to install it, follow this link:</p>
-<p><a href="https://chrome.google.com/webstore/detail/github-action-raw-log-vie/lgejlnoopmcdglhfjblaeldbcfnmjddf"><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20230116-extension-get-it-now.png" alt="Download GitHub Action Raw Log Viewer extension"></a></p>
-]]></description><link>https://joplinapp.org/news/20230116-github-actions-log-viewer</link><guid isPermaLink="false">20230116-github-actions-log-viewer</guid><pubDate>Mon, 16 Jan 2023 00:00:00 GMT</pubDate><twitter-text>Introducing the &quot;GitHub Action Raw Log Viewer&quot; extension for Chrome</twitter-text></item><item><title><![CDATA[Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)]]></title><description><![CDATA[<p>As was <a href="https://discourse.joplinapp.org/t/rfc-switch-to-agpl-license-for-joplin-server/16529">discussed last year</a>, Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0) for the desktop, mobile and CLI applications, as well as the web clipper.</p>
-<p>Any open source or commercial fork of Joplin will have to license any changes they make under AGPL, and share these changes back with the community. This is the main reason we switch to this license. It allows us to continue releasing the project as open source while ensuring that those who benefit commercially (or not) from it share back their changes.</p>
-<h2>What is the GPL license?<a name="what-is-the-gpl-license" href="#what-is-the-gpl-license" class="heading-anchor">🔗</a></h2>
-<p>The AGPL license is based on the GPL license. This is what tldr;Legal has to say about the GPL license:</p>
-<blockquote>
-<p>You may copy, distribute and modify the software as long as you track changes/dates in source files. Any modifications to or software including (via compiler) GPL-licensed code must also be made available under the GPL along with build &amp; install instructions. (<a href="https://tldrlegal.com/license/gnu-general-public-license-v3-(gpl-3)">source</a>)</p>
-</blockquote>
-<h2>What is the AGPL license?<a name="what-is-the-agpl-license" href="#what-is-the-agpl-license" class="heading-anchor">🔗</a></h2>
-<p>This is the license we'll use for Joplin from now on:</p>
-<blockquote>
-<p>The AGPL license differs from the other GNU licenses in that it was built for network software. You can distribute modified versions if you keep track of the changes and the date you made them. As per usual with GNU licenses, you must license derivatives under AGPL. It provides the same restrictions and freedoms as the GPLv3 but with an additional clause which makes it so that source code must be distributed along with web publication. Since web sites and services are never distributed in the traditional sense, the AGPL is the GPL of the web. (<a href="https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)">source</a>)</p>
-</blockquote>
-<h2>What does it change for users?<a name="what-does-it-change-for-users" href="#what-does-it-change-for-users" class="heading-anchor">🔗</a></h2>
-<p>There is no changes for users of Joplin - the apps remain open sources and you can still use them freely.</p>
-<h2>What does it change for developers?<a name="what-does-it-change-for-developers" href="#what-does-it-change-for-developers" class="heading-anchor">🔗</a></h2>
-<p>Any code you develop for Joplin will also remain open source. The only difference is that we'll ask to sign an Individual Contributor License Agreement (CLA) to ensure that the copyright of the entire codebase remains with the Joplin organisation. This is necessary so that if we ever want to change the license again we are able to do so without having to get the agreement of each individual contributor afterwards (which would be nearly impossible).</p>
-<p>This is a bit of an extra constraint but it is hard to avoid. Contributor License Agreements are very common for GPL or AGPL projects. For example Apache, Canonical or Python all require their contributors to sign a CLA.</p>
-<h2>Questions?<a name="questions" href="#questions" class="heading-anchor">🔗</a></h2>
-<p>If you have any questions please let us know. Overall we believe this is a positive improvements for Joplin as it means any work derives from it will also benefit the project.</p>
-]]></description><link>https://joplinapp.org/news/20221221-agpl</link><guid isPermaLink="false">20221221-agpl</guid><pubDate>Wed, 21 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is switching to the GNU Affero General Public License v3 (AGPL-3.0)</twitter-text></item><item><title><![CDATA[What's new in Joplin 2.9]]></title><description><![CDATA[<h2>Proxy support<a name="proxy-support" href="#proxy-support" class="heading-anchor">🔗</a></h2>
-<p>Both the desktop and mobile application now support proxies thanks to the work of Jason Williams. This will allow you to use the apps in particular when you are behind a company proxy.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-proxy-support.png" alt=""></p>
-<h2>New PDF viewer<a name="new-pdf-viewer" href="#new-pdf-viewer" class="heading-anchor">🔗</a></h2>
-<p>The desktop application now features a new PDF viewer thanks to the work of Asrient during GSoC.</p>
-<p>The main advantage for now is that this viewer preserves the last PDF page that was read. In the next version, the viewer will also include a way to annotate PDF files.</p>
-<h2>Multi-language spell checking<a name="multi-language-spell-checking" href="#multi-language-spell-checking" class="heading-anchor">🔗</a></h2>
-<p>The desktop app include a multi-language spell checking features, which allows you, for example, to spell-check notes in your native language and in English.</p>
-<h2>New mobile text editor<a name="new-mobile-text-editor" href="#new-mobile-text-editor" class="heading-anchor">🔗</a></h2>
-<p>Writing formatted notes on mobile has always been cumbersome due to the need to enter special format characters like <code>*</code> or <code>[</code>, etc.</p>
-<p>Thanks to the work of Henry Heino during GSoC, writing notes on the go is now easier thanks to an improved Markdown editor.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-mobile-beta-editor.png" alt=""></p>
-<p>The most visible feature is the addition of a toolbar, which helps input those special characters, like on desktop.</p>
-<p>Moreover Henry made a lot of subtle but useful improvements to the editor, for example to improve the note appearance, to improve list continuation, etc. Search within a note is now also supported as well as spell-checking.</p>
-<p>At a more technical level, Henry also added many test units to ensure that the editor remains robust and reliable.</p>
-<p>To enable the feature, go to the configuration screen and selected &quot;Opt-in to the editor beta&quot;. It is already very stable so we will probably promote it to be the main editor from the next version.</p>
-<h2>Improved alignment of notebook icons<a name="improved-alignment-of-notebook-icons" href="#improved-alignment-of-notebook-icons" class="heading-anchor">🔗</a></h2>
-<p>Previously, when you would assign an icon to a notebook, it would shift the title to the right, but notebook without an icon would not. It means that notebooks with and without an icon would not be vertically aligned.</p>
-<p>To tidy things up, this new version adds a default icons to notebooks without an explicitly assigned icon. This result in the notebook titles being correctly vertically aligned.</p>
-<p>Note that this feature is only enabled if you use custom icons - otherwise it will simply display the notebook titles without any default icons, as before.</p>
-<p><img src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/news/20221216-notebook-icons.png" alt=""></p>
-<h2>Improved handling of file attachments<a name="improved-handling-of-file-attachments" href="#improved-handling-of-file-attachments" class="heading-anchor">🔗</a></h2>
-<p>Self Not Found made a number of small but useful improvements to attachment handling, including increasing the maximum size to 200MB, adding support for attaching multiple files, and fixing issues with synchronising attachments via proxy.</p>
-<h2>Fixed filesystem sync on mobile<a name="fixed-filesystem-sync-on-mobile" href="#fixed-filesystem-sync-on-mobile" class="heading-anchor">🔗</a></h2>
-<p>This was a long and complex change due to the need to support new Android APIs but hopefully that should now be working again, thanks to the work of jd1378.</p>
-<p>So you can now sync again your notes with Syncthing and other file-based synchronisation systems.</p>
-<h2>And more...<a name="and-more" href="#and-more" class="heading-anchor">🔗</a></h2>
-<p>In total this new desktop version includes 36 improvements, bug fixes, and security fixes.</p>
-<p>As always, a lot of work went into the Android and iOS app too, which include 37 improvements, bug fixes, and security fixes.</p>
-<p>See here for the changelogs:</p>
-<ul>
-<li><a href="https://joplinapp.org/help/about/changelog/desktop">Desktop app changelog</a></li>
-<li><a href="https://joplinapp.org/help/about/changelog/android/">Android app changelog</a></li>
-</ul>
-<h2>About the Android version<a name="about-the-android-version" href="#about-the-android-version" class="heading-anchor">🔗</a></h2>
-<p>Unfortunately we cannot publish the Android version because it is based on a framework version that Google does not accept. To upgrade the app a lot of changes are needed and another round of pre-releases, and therefore there will not be a 2.9 version for Google Play. You may however download the official APK directly from there: <a href="https://github.com/laurent22/joplin-android/releases/tag/android-v2.9.8">Android 2.9 Official Release</a></p>
-<p>This is the reality of app stores in general - small developers being imposed never ending new requirements by all-powerful companies, and by the time a version is finally ready we can't even publish it because yet more requirements are in place.</p>
-<p>For the record the current 2.9 app works perfectly fine. It targets Android 11, which is only 2 years old and is still supported (and installed on millions of phones). Google requires us to target Android 12 which only came out last year.</p>
-]]></description><link>https://joplinapp.org/news/20221216-release-2-9</link><guid isPermaLink="false">20221216-release-2-9</guid><pubDate>Fri, 16 Dec 2022 00:00:00 GMT</pubDate><twitter-text>What&apos;s new in Joplin 2.9</twitter-text></item><item><title><![CDATA[Joplin is hiring!]]></title><description><![CDATA[<p>Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device.</p>
-<p>We are looking to hire two JavaScript software developers to work on the desktop, mobile, and server applications. All those are built using modern technologies, including React, React Native and Electron with a strong focus on test units.</p>
-<p>You need to demonstrate some experience with at least some of these technologies, and willing to learn more and touch various different projects.</p>
-<p>You will be part of a small team, so you will have an opportunity for a high-impact role, targeting hundreds of thousands of users.</p>
-<p>If you're interested please contact us at job-AT-joplin.cloud</p>
-<p>No agencies please.</p>
-]]></description><link>https://joplinapp.org/news/20221209-job</link><guid isPermaLink="false">20221209-job</guid><pubDate>Fri, 09 Dec 2022 00:00:00 GMT</pubDate><twitter-text>Joplin is hiring!</twitter-text></item></channel></rss>
+]]></description><link>https://joplinapp.org/news/20230302-jdll-2023</link><guid isPermaLink="false">20230302-jdll-2023</guid><pubDate>Thu, 02 Mar 2023 00:00:00 GMT</pubDate><twitter-text></twitter-text></item></channel></rss>

Assets/WebsiteAssets/templates/front.mustache

@@ -14,6 +14,7 @@
 		<link rel="stylesheet" href="{{{assetUrls.css.fontawesome}}}">
 		{{> openGraphTags}}
 		{{> rssFeedLink}}
+		{{> hreflangTags}}
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"

Assets/WebsiteAssets/templates/main-new.mustache

@@ -26,6 +26,7 @@ https://github.com/laurent22/joplin/blob/dev/{{{sourceMarkdownFile}}}
 		<meta name="theme-color" content="#000000" />
 		{{> openGraphTags}}
 		{{> rssFeedLink}}
+		{{> hreflangTags}}
 		<link
 			rel="stylesheet"
 			href="{{cssBaseUrl}}/bootstrap5.0.2.min.css"

Assets/WebsiteAssets/templates/partials/hreflangTags.mustache

@@ -0,0 +1,4 @@
+{{#availableLocales}}
+<link rel="alternate" hreflang="{{hreflang}}" href="https://joplinapp.org{{#pathPrefix}}/{{pathPrefix}}{{/pathPrefix}}{{currentPath}}" />
+{{/availableLocales}}
+<link rel="alternate" hreflang="x-default" href="https://joplinapp.org{{currentPath}}" />

Assets/WebsiteAssets/templates/partials/navbar.mustache

@@ -13,24 +13,21 @@
 			</div>
 			<div class="col-9 text-right d-none d-md-block">
 				{{> twitterLink}}
+				<a href="{{baseUrl}}/plugins/" class="fw500">Plugins</a>
 				<a href="{{baseUrl}}/news/" class="fw500">News</a>
 				<a href="{{baseUrl}}/help/" class="fw500">Help</a>
 				<a href="{{forumUrl}}" class="fw500">Forum</a>
-				<!-- <a href="{{baseUrl}}/cn/" class="fw500">中文</a> -->
 
-				<!--
 				<div class="dropdown language-switcher">
-					<button class="fw500" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
-						Language
+					<button class="fw500" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+						<i class="fas fa-globe"></i> {{locale.code}}
 					</button>
-					<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-						<li><a class="dropdown-item" href="#">Action</a></li>
-						<li><a class="dropdown-item" href="#">Another action</a></li>
-						<li><a class="dropdown-item" href="#">Something else here</a></li>
+					<ul class="dropdown-menu dropdown-menu-end">
+						{{#availableLocales}}
+							<li><a class="dropdown-item {{#isActive}}active{{/isActive}}" href="{{baseUrl}}/{{pathPrefix}}" onclick="setLocalePreference('{{code}}', this.href); return false;">{{name}}</a></li>
+						{{/availableLocales}}
 					</ul>
 				</div>
-				-->
-
 
 				{{#showJoplinCloudLinks}}
 					{{> joplinCloudButton}}
@@ -39,7 +36,6 @@
 			</div>
 			<div class="col-9 text-right d-block d-md-none navbar-mobile-content">
 				{{> twitterLink}}
-				<!-- <a href="{{baseUrl}}/cn/" class="fw500 chinese-page-link">中文</a> -->
 				{{> joplinCloudButton}}
 				{{> supportButton}}
 
@@ -63,6 +59,7 @@
 						</div>
 
 						<div class="text-center menu-mobile-top">
+							<a href="{{baseUrl}}/plugins/" class="fw500 mobile-menu-link">Plugins</a>
 							<a href="{{baseUrl}}/news/" class="fw500 mobile-menu-link">News</a>
 							<a href="{{baseUrl}}/help/" class="fw500 mobile-menu-link">Help</a>
 							<a href="{{forumUrl}}" class="fw500 mobile-menu-link">Forum</a>
@@ -74,6 +71,13 @@
 							{{/showJoplinCloudLinks}}
 							{{> supportButton}}
 						</div>
+
+						<div class="text-center menu-mobile-language">
+							<p class="fw500 mobile-menu-language-label"><i class="fas fa-globe"></i> Language</p>
+							{{#availableLocales}}
+								<a href="{{baseUrl}}/{{pathPrefix}}" class="fw500 mobile-menu-link mobile-language-link {{#isActive}}active{{/isActive}}" onclick="setLocalePreference('{{code}}', this.href); return false;">{{name}}</a>
+							{{/availableLocales}}
+						</div>
 					</div>
 
 					{{#showToc}}
@@ -81,7 +85,7 @@
 					{{/showToc}}
 
 					{{> socialFeeds}}
-					
+
 					<div>
 						<p class="light-blue mobile-menu-link-bottom text-center">
 							Copyright &copy; 2016-{{yyyy}} Laurent&nbsp;Cozic

Assets/WebsiteAssets/templates/partials/plan.mustache

@@ -1,24 +1,28 @@
-<div class="col-12 col-lg-4 account-type-{{priceMonthly.accountType}}">
+<div class="col-12 col-lg-4 account-type-{{priceMonthly.accountType}} hosting-type-{{hostingType}}">
 	<div class="price-container {{#featured}}price-container-blue{{/featured}}">
-		<div class="price-row">
-			<div class="plan-type">
-				<img src="{{imageBaseUrl}}/{{iconName}}.png"/>&nbsp;{{title}}
+			<div class="price-row">
+				<div class="plan-type">
+					<img src="{{imageBaseUrl}}/{{iconName}}.png"/>&nbsp;{{title}}
+				</div>
+
+				{{#priceMonthly.formattedMonthlyAmount}}
+					<div class="plan-price plan-price-monthly">
+						{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;<span translate>/month</span>{{#footnote}} (*){{/footnote}}</sub>
+					</div>
+
+					<div class="plan-price plan-price-yearly">
+						{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;<span translate>/month</span>{{#footnote}} (*){{/footnote}}</sub>
+					</div>
+				{{/priceMonthly.formattedMonthlyAmount}}
 			</div>
 
-			<div class="plan-price plan-price-monthly">
-				{{priceMonthly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;<span translate>/month</span>{{#footnote}} (*){{/footnote}}</sub>
+			{{#priceYearly.formattedMonthlyAmount}}
+			<div class="plan-price-yearly-per-year">
+				<div>
+					({{priceYearly.formattedAmount}}<sub class="per-year">&nbsp;<span translate>/year</span></sub>)
+				</div>
 			</div>
-
-			<div class="plan-price plan-price-yearly">
-				{{priceYearly.formattedMonthlyAmount}}<sub class="per-month">&nbsp;<span translate>/month</span>{{#footnote}} (*){{/footnote}}</sub>
-			</div>
-		</div>
-
-		<div class="plan-price-yearly-per-year">
-			<div>
-				({{priceYearly.formattedAmount}}<sub class="per-year">&nbsp;<span translate>/year</span></sub>)
-			</div>
-		</div>
+			{{/priceYearly.formattedMonthlyAmount}}
 
 		{{#featureLabelsOn}}
 			<p><i class="fas fa-check feature feature-on"></i>{{.}}</p>
@@ -29,7 +33,11 @@
 		{{/featureLabelsOff}}
 		
 		<p class="text-center subscribe-wrapper">
-			<a id="subscribeButton-{{name}}" href="{{cfaUrl}}" class="button-link btn-white subscribeButton">{{cfaLabel}}</a>
+			<a id="subscribeButton-{{name}}" href="{{cfaUrl}}" class="button-link btn-white subscribeButton cfa-button">{{cfaLabel}}</a>
+
+			{{#learnMoreUrl}}
+				<a id="learnMore-{{name}}" href="{{learnMoreUrl}}" class="button-link btn-white learnMoreButton cfa-button">Learn more</a>
+			{{/learnMoreUrl}}
 		</p>
 
 		{{#footnote}}<sub>(*) {{.}}</sub>{{/footnote}}

Assets/WebsiteAssets/templates/partials/socialFeeds.mustache

@@ -3,9 +3,9 @@
 		<a class="social-link-bluesky" href="https://bsky.app/profile/joplinapp.bsky.social" title="Joplin Bluesky feed"><i class="fa-brands fa-bluesky"></i></a>
 		<a class="social-link-mastodon" href="https://mastodon.social/@joplinapp" title="Joplin Mastodon feed"><i class="fab fa-mastodon"></i></a>
 		<a class="social-link-patreon" href="https://www.patreon.com/joplin" title="Joplin Patreon"><i class="fab fa-patreon"></i></a>
+		<a class="social-link-youtube" href="https://youtube.com/@joplinapp" title="Joplin YouTube channel"><i class="fab fa-youtube"></i></a>
 		<a class="social-link-discord" href="https://discord.gg/VSj7AFHvpq" title="Joplin Discord chat"><i class="fab fa-discord"></i></a>
 		<a class="social-link-linkedin" href="https://www.linkedin.com/company/joplin" title="Joplin LinkedIn Feed"><i class="fab fa-linkedin"></i></a>
-		<a class="social-link-lemmy" href="https://sopuli.xyz/c/joplinapp" title="Joplin Lemmy Community"><i class="fas fa-otter"></i></a>
 		<a class="social-link-github" href="https://github.com/laurent22/joplin/" title="Joplin GitHub repository"><i class="fab fa-github"></i></a>
 	</div>
 </div>

Assets/WebsiteAssets/templates/plans.mustache

@@ -1,23 +1,91 @@
 <div id="plans-section" class="env-{{env}}">
+	<style>
+		.toggle-container {
+			display: flex;
+			border: 2px solid black;
+			border-radius: 100px;
+			overflow: hidden;
+			cursor: pointer;
+			margin-top: 20px;
+			max-width: 600px;
+			margin-left: auto;
+			margin-right: auto;
+		}
+
+		.toggle-option {
+			flex: 1;
+			padding: 10px 20px;
+			text-align: center;
+			transition: background 0.3s, color 0.3s;
+			user-select: none;
+			white-space: nowrap;
+		}
+
+		.active {
+			background: black;
+			color: white;
+		}
+
+		.inactive {
+			background: white;
+			color: black;
+		}
+
+		@media (max-width: 480px) {
+			.toggle-container {
+				flex-direction: column;
+				width: 100%;
+				border-radius: 10px;
+			}
+		}
+	</style>
+
 	<div class="container">
 		<div class="row">
 			<div class="col-12 title-box">
 				<h1 translate class="text-center">
-					Joplin Cloud <span class="frame-bg frame-bg-yellow">plans</span>
+					Our synchronisation and sharing <span class="frame-bg frame-bg-yellow">solutions</span>
 				</h1>
 				<p translate class="text-center sub-title">
-					<a href="https://joplincloud.com">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues.
+					Synchronise and share your notes with our range of plans.
 				</p>
 			</div>
 		</div>
 
+		<div class="toggle-container" id="toggle">
+			<div class="toggle-option active toggle-button-managed">Managed hosting</div>
+			<div class="toggle-option inactive toggle-button-self">Self-hosting</div>
+		</div>
+
 		<noscript>
 			<div class="alert alert-danger alert-env-dev" role="alert" style='text-align: center; margin-top: 10px;'>
 				To use this page please enable JavaScript!
 			</div>
 		</noscript>
 
-		<div style="display: flex; justify-content: center; margin-top: 1.2em">	
+		<div class="row hosting-type-managed">
+			<div class="col-12 title-box">
+				<h1 translate class="text-center">
+					Joplin Cloud
+				</h1>
+				<p translate class="text-center sub-title">
+					<a href="https://joplincloud.com">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues.
+				</p>
+			</div>
+		</div>
+
+		<div class="row hosting-type-self">
+			<div class="col-12 title-box">
+				<h1 translate class="text-center">
+					Joplin Server Business
+				</h1>
+				<p translate class="text-center sub-title">
+					Joplin Server Business is a synchronisation server that you can install on your own infrastructure, so that your data remains private and secure within your business.
+				</p>
+			</div>
+		</div>
+
+		<div style="display: flex; justify-content: center; margin-top: 1.2em" class="hosting-type-managed">	
 			<div class="form-check form-check-inline">
 				<input id="pay-monthly-radio" class="form-check-input" type="radio" name="pay-radio" checked value="monthly">
 				<label translate style="font-weight: bold" class="form-check-label" for="pay-monthly-radio">
@@ -46,7 +114,11 @@
 				{{> plan}}
 			{{/plans.teams}}
 
-			<p translate class="joplin-cloud-login-info">Already have a Joplin Cloud account? <a href="https://joplincloud.com">Login now</a></p>
+			{{#plans.joplinServerBusiness}}
+				{{> plan}}
+			{{/plans.joplinServerBusiness}}
+
+			<p translate class="joplin-cloud-login-info hosting-type-managed">Already have a Joplin Cloud account? <a href="https://joplincloud.com">Login now</a></p>
 		</div>
 
 		<div class="row">
@@ -147,5 +219,29 @@
 				$('.feature-description-' + featureId).toggle(200);
 			});
 		});
+
+		const setHostingType = (type) => {
+			const other = type === 'managed' ? 'self' : 'managed';
+			$('.toggle-button-' + type).addClass('active');
+			$('.toggle-button-' + type).removeClass('inactive');
+			$('.toggle-button-' + other).addClass('inactive');
+			$('.toggle-button-' + other).removeClass('active');
+
+			$('.hosting-type-' + type).show();
+			$('.hosting-type-' + other).hide();
+		}
+
+		$('.toggle-button-managed').click((event) => {
+			event.preventDefault();
+			setHostingType('managed');			
+		});
+
+		$('.toggle-button-self').click((event) => {
+			event.preventDefault();
+			setHostingType('self');
+		});
+
+		const initialHostingType = urlQuery.get('hosting') ? urlQuery.get('hosting') : 'managed';
+		setHostingType(initialHostingType);
 	</script>
 </div>

Assets/WebsiteAssets/website.pot

@@ -2,140 +2,156 @@ msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:13
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:9
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:10
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:14
 msgid "/month"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:19
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/partials/plan.mustache:22
 msgid "/year"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:8
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:71
 msgid "<a href=\"https://joplincloud.com\">Joplin Cloud</a> allows you to synchronise your notes across devices. It also lets you publish notes, and collaborate on notebooks with your friends, family or colleagues."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:205
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:206
 msgid "<span class=\"frame-bg frame-bg-yellow-lg\">Customise</span> it"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:104
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:105
 msgid "<span class=\"frame-bg frame-bg-yellow\">Multimedia</span> notes"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:256
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
 msgid "100% <span class=\"frame-bg frame-bg-yellow-lg\">your data</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:298
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:299
 msgid "A <span class=\"frame-bg frame-bg-yellow-lg\">French</span> Alternative"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:236
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:237
 msgid "Access your notes from your computer, phone or tablet by synchronising with various services, including Joplin Cloud, Dropbox and OneDrive. The app is available on Windows, macOS, Linux, Android and iOS. A terminal app is also available!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:121
 msgid "Already have a Joplin Cloud account? <a href=\"https://joplincloud.com\">Login now</a>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:208
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:209
 msgid "Customise the app with plugins, custom themes and multiple text editors (Rich Text or Markdown). Or create your own scripts and plugins using the Extension API."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:242
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:243
 msgid "Download it now"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:112
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:63
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:113
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:64
 msgid "Download the app"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:213
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:214
 msgid "Find out more"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:54
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:55
 msgid "Free your <span class=\"frame-bg frame-bg-blue\">notes</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:175
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:176
 msgid "Get the clipper"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:107
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:108
 msgid "Images, videos, PDFs and audio files are supported. Create math expressions and diagrams directly from the app. Take photos with the mobile app and save them to a note."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:327
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:328
 msgid "In the <span class=\"frame-bg frame-bg-yellow\">Press</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:5
-msgid "Joplin Cloud <span class=\"frame-bg frame-bg-yellow\">plans</span>"
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:68
+msgid "Joplin Cloud"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:301
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:302
 msgid "Joplin Cloud is based in France. This means your data is protected by strict European Union privacy laws. In addition, Joplin Cloud implements strong end-to-end encryption so that not even us can have access to your data."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:57
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:58
 msgid "Joplin is an open source note-taking app. Capture your thoughts and securely access them from any device."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:262
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:79
+msgid "Joplin Server Business"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:82
+msgid "Joplin Server Business is a synchronisation server that you can install on your own infrastructure, so that your data remains private and secure within your business."
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:263
 msgid "More about E2EE"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:391
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:392
 msgid "Our <span class=\"frame-bg frame-bg-blue-lg\">sponsors</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:23
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:46
+msgid "Our synchronisation and sharing <span class=\"frame-bg frame-bg-yellow\">solutions</span>"
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:91
 msgid "Pay Monthly"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:30
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:98
 msgid "Pay Yearly"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:167
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:168
 msgid "Save <span class=\"frame-bg frame-bg-blue\">web pages</span> <br>as notes"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:65
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:66
 msgid "Sign up with Joplin Cloud"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:394
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/plans.mustache:49
+msgid "Synchronise and share your notes with our range of plans."
+msgstr ""
+
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:395
 msgid "Thank you for your support!"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:257
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:258
 msgid "The app is open source and your notes are saved to an open format, so you'll always have access to them. Uses End-To-End Encryption (E2EE) to secure your notes and ensure no-one but yourself can access them."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:144
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:145
 msgid "Try it now"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:170
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:171
 msgid "Use the web clipper extension, available on Chrome and Firefox, to save web pages or take screenshots as notes."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:139
 msgid "With Joplin Cloud, share your notes with your friends, family or colleagues and collaborate on them."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:137
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:138
 msgid "Work <span class=\"frame-bg frame-bg-yellow\">together</span>"
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:141
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:142
 msgid "You can also publish a note to the internet and share the URL with others."
 msgstr ""
 
-#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:233
+#: /Users/laurent/src/joplin/Assets/WebsiteAssets/templates/front.mustache:234
 msgid "Your notes, <span class=\"frame-bg frame-bg-blue-lg\">everywhere</span> you are"
 msgstr ""

Assets/keys/joplin-canary-signing-key.asc

@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaZWFlBYJKwYBBAHaRw8BAQdAIh3xQbjaS0EC+8WuKXNPjVF/ayq0/2GZlheR
+qj1G3Qe0RUpvcGxpbiBDYW5hcnkgU2lnbmluZyBLZXkgKFdhcnJhbnQgQ2FuYXJ5
+IEtleSkgPGNhbmFyeUBqb3BsaW5hcHAub3JnPoiZBBMWCgBBFiEE+CD4MG3QBaEC
+0YzVlGrp+lkV71MFAmmVhZQCGwMFCQPCZwAFCwkIBwICIgIGFQoJCAsCBBYCAwEC
+HgcCF4AACgkQlGrp+lkV71MZtwD/Ufd4OAcgkl5T6MSB+WDFg8BXvpaBZfNnZkoo
+LrOoqNAA/iqGiiBRoarlus2ATOiWhyXaEpRUQcEeaRhhqHW0BGcCuDgEaZWFlBIK
+KwYBBAGXVQEFAQEHQFORKWRLp4hDYzR8Q5IRyF9AIjoziR+sj4icUdvZx4Z6AwEI
+B4h+BBgWCgAmFiEE+CD4MG3QBaEC0YzVlGrp+lkV71MFAmmVhZQCGwwFCQPCZwAA
+CgkQlGrp+lkV71Nu+AD9Gw4qEmL8WNCNs7idc8CRpGpS2DhasNTV398lbKYzco0B
+ANlMrGlMc0w1KhuFxdU4fF3s/ktUUnjJwosxK94l5/MJ
+=C9VN
+-----END PGP PUBLIC KEY BLOCK-----

CLAUDE.md

@@ -0,0 +1,18 @@
+# Joplin Guidelines
+
+## Quick Reference
+
+- Tabs for indentation
+- Single quotes for strings  
+- Proper TypeScript types (avoid `any`)
+- Comments should be only with `//` and should not contain jsdoc syntax
+- If you duplicate a substantial block of code, add a comment above it noting the duplication and referencing the original location.
+- When creating Jest tests, there should be only one `describe()` statement in the file.
+- Focus on testing essential behaviour and edge cases — avoid adding tests for every minor detail.
+- Avoid duplicating code in tests; when testing the same logic with different inputs, use `test.each` or shared helpers instead of repeating similar test blocks.
+- Do not make white space changes - do not add unnecessary new lines, or spaces to existing code, or wrap existing code.
+
+## Full Documentation
+
+- Coding style: [readme/dev/coding_style.md](readme/dev/coding_style.md)
+- Contributing: [CONTRIBUTING.md](CONTRIBUTING.md)

Dockerfile.server

@@ -2,7 +2,7 @@
 # Build stage
 # =============================================================================
 
-FROM node:18 AS builder
+FROM node:24 AS builder
 
 RUN apt-get update \
     && apt-get install -y \
@@ -58,16 +58,29 @@ RUN --mount=type=cache,target=/build/.yarn/cache --mount=type=cache,target=/buil
 # from a smaller base image.
 # =============================================================================
 
-FROM node:18-slim
+FROM node:24-slim
 
 ARG user=joplin
 RUN useradd --create-home --shell /bin/bash $user
 
+# Install PM2 and set home directory. Setting the PM2 data dir so modules/config persist regardless
+# of user home.
+RUN npm i -g pm2@5.4.3 && mkdir -p /opt/pm2 && chown -R $user:$user /opt/pm2
+ENV PM2_HOME=/opt/pm2
+
 USER $user
 
 COPY --chown=$user:$user --from=builder /build/packages /home/$user/packages
 COPY --chown=$user:$user --from=builder /usr/bin/tini /usr/local/bin/tini
 
+# We download a specific version of the plugin to prevent pm2 from fetching the latest, since it may
+# not have been properly audited (that fact was used to spread malware at some point). Ref:
+# https://github.com/laurent22/joplin/issues/12754
+RUN pm2 install https://registry.npmjs.org/pm2-logrotate/-/pm2-logrotate-3.0.0.tgz \
+	&& pm2 set pm2-logrotate:max_size 100MB \
+	&& pm2 set pm2-logrotate:retain 5 \
+	&& pm2 set pm2-logrotate:compress true
+
 ENV NODE_ENV=production
 ENV RUNNING_IN_DOCKER=1
 EXPOSE ${APP_PORT}

Dockerfile.transcribe

@@ -1,29 +1,27 @@
-FROM node:18-bullseye
+FROM node:24-bookworm
 
 RUN apt-get update \
     && apt-get install -y \
-    ca-certificates curl \
-    python3 tini
-
-## install docker
-RUN install -m 0755 -d /etc/apt/keyrings
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
-RUN chmod a+r /etc/apt/keyrings/docker.asc
-RUN echo \
-    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
-    $(. /etc/os-release && echo bullseye) stable" | \
-    tee /etc/apt/sources.list.d/docker.list > /dev/null
-RUN apt-get update \
-    && apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin \
+    ca-certificates curl wget unzip \
+    python3 tini \
     && rm -rf /var/lib/apt/lists/*
 
 ENV NODE_ENV=production
 
 RUN corepack enable
 
+# Download llama.cpp binary
+WORKDIR /opt/llama
+RUN wget -q https://github.com/ggml-org/llama.cpp/releases/download/b5449/llama-b5449-bin-ubuntu-x64.zip \
+    && unzip llama-b5449-bin-ubuntu-x64.zip \
+    && rm llama-b5449-bin-ubuntu-x64.zip \
+    && chmod +x /opt/llama/build/bin/llama-mtmd-cli
+
+# Create non-root user for security
+RUN groupadd -r transcribe && useradd -r -g transcribe -m transcribe
+
 WORKDIR /app
 
-COPY .yarn/plugins ./.yarn/plugins
 COPY .yarn/releases ./.yarn/releases
 COPY .yarn/patches ./.yarn/patches
 COPY package.json .
@@ -45,7 +43,21 @@ RUN BUILD_SEQUENCIAL=1 yarn install --inline-builds \
     && yarn cache clean \
     && rm -rf .yarn/berry
 
+# Create data directory and set permissions
+RUN mkdir -p /data/images \
+    && chown -R transcribe:transcribe /data
+
 WORKDIR /app/packages/transcribe
 
+# Switch to non-root user
+USER transcribe
+
+# Set environment variables
+ENV HTR_CLI_BINARY_PATH=/opt/llama/build/bin/llama-mtmd-cli
+ENV LD_LIBRARY_PATH=/opt/llama/build/bin
+ENV DATA_DIR=/data
+ENV QUEUE_DRIVER=sqlite
+
 # Start the Node.js application
+ENTRYPOINT ["/usr/bin/tini", "--"]
 CMD ["yarn", "start"]

Joplin_install_and_update.sh

@@ -67,6 +67,45 @@ showHelp() {
   fi
 }
 
+# Accepts two versions in symver (a.b.c).
+# Echos -1 if the first version is less than the second,
+#        0 if they're equal,
+#        1 if the first version is greater than second.
+compareVersions() {
+  V_MAJOR1=$(echo "$1"|cut -d. -f1)
+  V_MAJOR2=$(echo "$2"|cut -d. -f1)
+
+  if [[ $V_MAJOR1 -lt $V_MAJOR2 ]] ; then
+    echo -1
+    return
+  elif [[ $V_MAJOR1 -gt $V_MAJOR2 ]] ; then
+    echo 1
+    return
+  fi
+
+  V_MINOR1=$(echo "$1"|cut -d. -f2)
+  V_MINOR2=$(echo "$2"|cut -d. -f2)
+
+  if [[ $V_MINOR1 -lt $V_MINOR2 ]] ; then
+    echo -1
+    return
+  elif [[ $V_MINOR1 -gt $V_MINOR2 ]] ; then
+    echo 1
+    return
+  fi
+
+  V_PATCH1=$(echo "$1"|cut -d. -f3)
+  V_PATCH2=$(echo "$2"|cut -d. -f3)
+
+  if [[ $V_PATCH1 -lt $V_PATCH2 ]] ; then
+    echo -1
+  elif [[ $V_PATCH1 -gt $V_PATCH2 ]] ; then
+    echo 1
+  else
+    echo 0
+  fi
+}
+
 #-----------------------------------------------------
 # Setup Download Helper: DL
 #-----------------------------------------------------
@@ -159,12 +198,21 @@ else
 fi
 
 # Check if it's in the latest version
-if [[ -e "${INSTALL_DIR}/VERSION" ]] && [[ $(< "${INSTALL_DIR}/VERSION") == "${RELEASE_VERSION}" ]]; then
-  print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
-  ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
+if [[ -e "${INSTALL_DIR}/VERSION" ]]; then
+  CURRENT_VERSION=$(< "${INSTALL_DIR}/VERSION")
+  VERSION_COMPARISON=$(compareVersions "$CURRENT_VERSION" "$RELEASE_VERSION")
+
+  if [[ "$VERSION_COMPARISON" == "0" ]]; then
+    print "${COLOR_GREEN}You already have the latest version${COLOR_RESET} ${RELEASE_VERSION} ${COLOR_GREEN}installed.${COLOR_RESET}"
+    ([[ "$FORCE" == true ]] && print "Forcing installation...") || exit 0
+  elif [[ "$VERSION_COMPARISON" == "1" ]]; then
+    print "${COLOR_YELLOW}You have version ${CURRENT_VERSION} installed, which is newer than the latest published version ${RELEASE_VERSION}.${COLOR_RESET}"
+    print "${COLOR_YELLOW}Skipping installation to avoid downgrade.${COLOR_RESET}"
+  else
+    print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION} installed."
+  fi
 else
-  [[ -e "${INSTALL_DIR}/VERSION" ]] && CURRENT_VERSION=$(< "${INSTALL_DIR}/VERSION")
-  print "The latest version is ${RELEASE_VERSION}, but you have ${CURRENT_VERSION:-no version} installed."
+  print "The latest version is ${RELEASE_VERSION}, but you have no version installed."
 fi
 
 # Check if it's an update or a new install
@@ -236,7 +284,7 @@ if command -v lsb_release &> /dev/null; then
   # without writing the AppImage to a non-user-writable location (without invalidating other security
   # controls). See https://discourse.joplinapp.org/t/possible-future-requirement-for-no-sandbox-flag-for-ubuntu-23-10/.
   HAS_USERNS_RESTRICTIONS=false
-  if [[ "$DISTVER" =~ ^Ubuntu && $DISTMAJOR -ge 23 ]]; then
+  if [[ "$DISTVER" =~ ^(Ubuntu|Tuxedo) && $DISTMAJOR -ge 23 ]]; then
     HAS_USERNS_RESTRICTIONS=true
   fi
 
@@ -258,6 +306,15 @@ fi
 if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.*|.*pantheon.*|.*lxde.*|.*i3.*|.*sway.* ]] || [[ `command -v update-desktop-database` ]]; then
   DATA_HOME=${XDG_DATA_HOME:-~/.local/share}
   DESKTOP_FILE_LOCATION="$DATA_HOME/applications"
+
+  # Only later versions of Joplin default to Wayland
+  IS_WAYLAND_BY_DEFAULT=$(compareVersions "$RELEASE_VERSION" "3.5.6")
+  # Joplin has a different startup WM class on Wayland and X11:
+  STARTUP_WM_CLASS=Joplin
+  if [[ $XDG_SESSION_TYPE != "x11" && $IS_WAYLAND_BY_DEFAULT == "1" ]]; then
+    STARTUP_WM_CLASS=@joplin/app-desktop
+  fi
+
   # Only delete the desktop file if it will be replaced
   rm -f "$DESKTOP_FILE_LOCATION/appimagekit-joplin.desktop"
 
@@ -272,7 +329,9 @@ Name=Joplin
 Comment=Joplin for Desktop
 Exec=env APPIMAGELAUNCHER_DISABLE=TRUE "${INSTALL_DIR}/Joplin.AppImage" ${SANDBOXPARAM} %u
 Icon=joplin
-StartupWMClass=Joplin
+# This will be different between Wayland and X11. On Wayland, the startup
+# WM class is "@joplin/app-desktop". On X11, it's "Joplin".
+StartupWMClass=${STARTUP_WM_CLASS}
 Type=Application
 Categories=Office;
 MimeType=x-scheme-handler/joplin;

README.md

@@ -1,5 +1,5 @@
 <!-- DONATELINKS -->
-[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?business=E8JMYD2LQ8MMA&no_recurring=0&item_name=I+rely+on+donations+to+maintain+and+improve+the+Joplin+open+source+project.+Thank+you+for+your+help+-+it+makes+a+difference%21&currency_code=EUR) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
+[![Donate using PayPal](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/donate/?hosted_button_id=WQCERTSSLCC7U) [![Sponsor on GitHub](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/GitHub-Badge.svg)](https://github.com/sponsors/laurent22/) [![Become a patron](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Donate using IBAN](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/WebsiteAssets/images/badges/Donate-IBAN.svg)](https://joplinapp.org/donate/#donations)
 <!-- DONATELINKS -->
 
 <img width="64" src="https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/LinuxIcons/256x256.png" align="left" style="margin-right:15px"/>
@@ -31,7 +31,7 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 # Sponsors
 
 <!-- SPONSORS-ORG -->
-<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://www.hosting.de/nextcloud/?mtm_campaign=managed-nextcloud&amp;mtm_kwd=joplinapp&amp;mtm_source=joplinapp-webseite&amp;mtm_medium=banner"><img title="Hosting.de" width="256" src="https://joplinapp.org/images/sponsors/HostingDe.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://casinoreviews.net"><img title="Casino Reviews" width="256" src="https://joplinapp.org/images/sponsors/CasinoReviews.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://realgambling.ca/"><img title="RealGambling.ca" width="256" src="https://joplinapp.org/images/sponsors/RealGambling.png" alt="RealGambling.ca"/></a> <a href="https://essaypro.com/"><img title="write an essay online with EssayPro" width="256" src="https://joplinapp.org/images/sponsors/EssayPro.png" alt="write an essay online with EssayPro"/></a> <a href="https://www.slotozilla.com/nz/no-deposit-bonus"><img title="casino without making any upfront cost" width="256" src="https://joplinapp.org/images/sponsors/Slotozilla.png" alt="casino without making any upfront cost"/></a> <a href="https://www.reddit.com/r/tiktokRise/"><img title="Tiktok Rise" width="256" src="https://joplinapp.org/images/sponsors/TiktokRise.jpg" alt="Tiktok Rise"/></a> <a href="https://essaywriter.pro"><img title="write my essay services by EssayWriter" width="256" src="https://joplinapp.org/images/sponsors/EssayWriterPro.png" alt="write my essay services by EssayWriter"/></a> <a href="https://essayservice.com"><img title="quick and reliable service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/EssayService.png" alt="quick and reliable service to write my paper for me"/></a> <a href="https://writepaper.com/"><img title="best service to write my paper for me" width="256" src="https://joplinapp.org/images/sponsors/WritePaper.png" alt="best service to write my paper for me"/></a> <a href="https://paperwriter.com/"><img title="high-quality paper writing service PaperWriter" width="256" src="https://joplinapp.org/images/sponsors/PaperWriter.png" alt="high-quality paper writing service PaperWriter"/></a>
+<a href="https://seirei.ne.jp"><img title="Serei Network" width="256" src="https://joplinapp.org/images/sponsors/SeireiNetwork.png"/></a> <a href="https://citricsheep.com"><img title="Citric Sheep" width="256" src="https://joplinapp.org/images/sponsors/CitricSheep.png"/></a> <a href="https://sorted.travel/?utm_source=joplinapp"><img title="Sorted Travel" width="256" src="https://joplinapp.org/images/sponsors/SortedTravel.png"/></a> <a href="https://celebian.com"><img title="Celebian" width="256" src="https://joplinapp.org/images/sponsors/Celebian.png"/></a> <a href="https://bestkru.com"><img title="BestKru" width="256" src="https://joplinapp.org/images/sponsors/BestKru.png"/></a> <a href="https://www.socialfollowers.uk/buy-tiktok-followers/"><img title="Social Followers" width="256" src="https://joplinapp.org/images/sponsors/SocialFollowers.png"/></a> <a href="https://stormlikes.com/"><img title="Stormlikes" width="256" src="https://joplinapp.org/images/sponsors/Stormlikes.png"/></a> <a href="https://route4me.com"><img title="Route4Me" width="256" src="https://joplinapp.org/images/sponsors/Route4Me.png"/></a> <a href="https://topagency.webflow.io"><img title="WebDesignAgency" width="256" src="https://joplinapp.org/images/sponsors/WebDesignAgency.png" alt="topagency"/></a> <a href="https://essayshark.com"><img title="EssayShark - essay writers for hire" width="256" src="https://joplinapp.org/images/sponsors/EssayShark.png" alt="EssayShark - essay writers for hire"/></a> <a href="https://pokieslab1.com/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/PokiesLab.png" alt="Australian Real Money Pokies"/></a> <a href="https://pokiesman1.net/real-money-pokies/"><img title="Australian Real Money Pokies" width="256" src="https://joplinapp.org/images/sponsors/Pokiesman.png" alt="Australian Real Money Pokies"/></a> <a href="https://socialkings.online"><img title="Boost your reach and buy real followers" width="256" src="https://joplinapp.org/images/sponsors/SocialKings.png" alt="Boost your reach and buy real followers"/></a> <a href="https://essayservice.com/"><img title="For those in need of immediate academic assistance, EssayService offers a fast and reliable service to write my essay for me now, ensuring high-quality results within tight deadlines" width="256" src="https://joplinapp.org/images/sponsors/EssayService.png" alt="For those in need of immediate academic assistance, EssayService offers a fast and reliable service to write my essay for me now, ensuring high-quality results within tight deadlines"/></a> <a href="https://thenationonlineng.net/casino-en-ligne/casino-en-ligne-payant-au-canada/"><img title="casino en ligne le plus payant" width="256" src="https://joplinapp.org/images/sponsors/TheNationOnline.jpg" alt="casino en ligne le plus payant"/></a>
 <!-- SPONSORS-ORG -->
 
 * * *
@@ -39,9 +39,8 @@ Please see the [donation page](https://github.com/laurent22/joplin/blob/dev/read
 <!-- SPONSORS-GITHUB -->
 |       |       |       |       |
 | :---: | :---: | :---: | :---: |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/97193607?s=96&v=4"/></br>[Akhil-CM](https://github.com/Akhil-CM) | <img width="50" src="https://avatars2.githubusercontent.com/u/552452?s=96&v=4"/></br>[andypiper](https://github.com/andypiper) | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/1177810?s=96&v=4"/></br>[felixstorm](https://github.com/felixstorm) | <img width="50" src="https://avatars2.githubusercontent.com/u/8030470?s=96&v=4"/></br>[Galliver7](https://github.com/Galliver7) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) | <img width="50" src="https://avatars2.githubusercontent.com/u/11947658?s=96&v=4"/></br>[KentBrockman](https://github.com/KentBrockman) |
-| <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) | <img width="50" src="https://avatars2.githubusercontent.com/u/1788010?s=96&v=4"/></br>[maxtruxa](https://github.com/maxtruxa) | <img width="50" src="https://avatars2.githubusercontent.com/u/327998?s=96&v=4"/></br>[sif](https://github.com/sif) | <img width="50" src="https://avatars2.githubusercontent.com/u/765564?s=96&v=4"/></br>[taskcruncher](https://github.com/taskcruncher) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/552452?s=96&v=4"/></br>[andypiper](https://github.com/andypiper) | <img width="50" src="https://avatars2.githubusercontent.com/u/215668?s=96&v=4"/></br>[avanderberg](https://github.com/avanderberg) | <img width="50" src="https://avatars2.githubusercontent.com/u/67130?s=96&v=4"/></br>[chr15m](https://github.com/chr15m) | <img width="50" src="https://avatars2.githubusercontent.com/u/1177810?s=96&v=4"/></br>[felixstorm](https://github.com/felixstorm) |
+| <img width="50" src="https://avatars2.githubusercontent.com/u/8030470?s=96&v=4"/></br>[Galliver7](https://github.com/Galliver7) | <img width="50" src="https://avatars2.githubusercontent.com/u/4721118?s=96&v=4"/></br>[GPrimola](https://github.com/GPrimola) | <img width="50" src="https://avatars2.githubusercontent.com/u/64712218?s=96&v=4"/></br>[Hegghammer](https://github.com/Hegghammer) | <img width="50" src="https://avatars2.githubusercontent.com/u/42319182?s=96&v=4"/></br>[marcdw1289](https://github.com/marcdw1289) |
 | <img width="50" src="https://avatars2.githubusercontent.com/u/668977?s=96&v=4"/></br>[ugoertz](https://github.com/ugoertz) |       |       |       |
 <!-- SPONSORS-GITHUB -->
 	
@@ -62,6 +61,14 @@ Name | Description
 
 Please see the guide for information on how to contribute to the development of Joplin: https://github.com/laurent22/joplin/blob/dev/readme/dev/index.md
 
+## Warrant Canary Signing Key
+
+Fingerprint:
+
+F820 F830 6DD0 05A1 02D1  8CD5 946A E9FA 5915 EF53
+
+Public key: https://github.com/laurent22/joplin/raw/dev/Assets/keys/joplin-canary-signing-key.asc
+
 # Contributors
 
 Thank you to everyone who've contributed to Joplin's source code!

SECURITY.md

@@ -6,7 +6,7 @@ Only the latest version is supported with security updates.
 
 ## Reporting a Vulnerability
 
-Please [contact support](https://raw.githubusercontent.com/laurent22/joplin/dev/Assets/AdresseSupport.png) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.
+Please report vulnerabilities [through private vulnerability reporting](https://github.com/laurent22/joplin/security/advisories/new) **with a proof of concept** that shows the security vulnerability. Please do not contact us without this proof of concept, as we cannot fix anything without this.
 
 For general opinions on what makes an app more or less secure, please use the forum.
 

cspell.json

@@ -33,7 +33,7 @@
 		"/packages/app-desktop/build/",
 		"/packages/app-desktop/utils/checkForUpdatesUtilsTestData.ts",
 		"/packages/app-desktop/vendor/",
-		"/packages/app-mobile/android/vendor/",
+		"/packages/whisper-voice-typing/vendor/",
 		"/packages/app-mobile/ios/Pods/",
 		"/packages/app-mobile/lib/rnInjectedJs",
 		"/packages/app-mobile/pluginAssets",
@@ -63,6 +63,7 @@
 		"/readme/_i18n",
 		"/readme/about/changelog/desktop.md",
 		"/readme/licenses.md",
+		"/readme/canary.txt",
 		"/readme/i18n",
 		"cspell.json",
 		"node_modules"

devbox.json

@@ -5,24 +5,19 @@
       "version":   "latest",
       "platforms": ["aarch64-darwin", "x86_64-darwin"],
     },
-    "yarn": "latest",
+    "yarn": "1.22.19",
     "vips.dev": {
       "platforms": ["aarch64-darwin"],
     },
-    "nodejs":     "latest",
+    "nodejs":     "24.11.1",
     "pkg-config": "latest",
-    "darwin.apple_sdk.frameworks.Foundation": { // satisfies missing CoreText/CoreText.h
-      // https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/darwin/apple-sdk/default.nix
-      "version":   "",
-      "platforms": ["aarch64-darwin", "x86_64-darwin"],
-    },
-    "python": "latest",
+    "python": "3.13.3",
     "bat":    "latest",
     "electron": {
       "version":            "latest",
       "excluded_platforms": ["aarch64-darwin", "x86_64-darwin"],
     },
-    "git":    "2.47.2",
+    "git":    "2.51.0",
   },
   "shell": {
     "init_hook": [

docker-compose.db-dev.yml

@@ -16,12 +16,10 @@
 # SLAVE_POSTGRES_PORT=5433
 # SLAVE_POSTGRES_HOST=localhost
 
-version: '2'
-
 services:
 
     postgresql-master:
-        image: 'bitnami/postgresql:16.6.0'
+        image: 'bitnamilegacy/postgresql:17.6.0'
         ports:
             - '5432:5432'
         environment:
@@ -38,7 +36,7 @@ services:
             - POSTGRESQL_EXTRA_FLAGS=-c work_mem=100000 -c log_statement=all
 
     postgresql-slave:
-        image: 'bitnami/postgresql:16.6.0'
+        image: 'bitnamilegacy/postgresql:17.6.0'
         ports:
             - '5433:5432'
         depends_on:

docker-compose.server-dev.yml

@@ -1,8 +1,6 @@
 # This compose file can be used in development to run both the database and app
 # within Docker.
 
-version: '3'
-
 services:
     app:
         build:

docker-compose.server.yml

@@ -15,13 +15,21 @@
 #	- This would typically be mapped to port to 443 (TLS) with a reverse proxy.
 #	- If Joplin Server does not need to be accessible over the internet, the port can be mapped to 22300.
 
-version: '3'
+networks:
+    app-network:
+    transcribe-network:
+    shared-network:
 
 services:
     db:
         image: postgres:16
+        profiles:
+            - full
+            - server
         volumes:
             - ./data/postgres:/var/lib/postgresql/data
+        networks:
+            - app-network
         ports:
             - "5432:5432"
         restart: unless-stopped
@@ -31,10 +39,17 @@ services:
             - POSTGRES_DB=${POSTGRES_DATABASE}
     app:
         image: joplin/server:latest
+        profiles:
+            - full
+            - server
         depends_on:
             - db
+            - transcribe
         ports:
             - "22300:22300"
+        networks:
+            - app-network
+            - shared-network
         restart: unless-stopped
         environment:
             - APP_PORT=22300
@@ -45,3 +60,59 @@ services:
             - POSTGRES_USER=${POSTGRES_USER}
             - POSTGRES_PORT=${POSTGRES_PORT}
             - POSTGRES_HOST=db
+            - TRANSCRIBE_API_KEY=${TRANSCRIBE_API_KEY}
+            - TRANSCRIBE_BASE_URL=http://transcribe:4567
+            - TRANSCRIBE_ENABLED=${TRANSCRIBE_ENABLED}
+    transcribe-db:
+        image: postgres:16
+        profiles:
+            - full
+        volumes:
+            - ./data/transcribe-postgres:/var/lib/postgresql/data
+        networks:
+            - transcribe-network
+        ports:
+            - "${QUEUE_DATABASE_PORT}:5432"
+        restart: unless-stopped
+        environment:
+            - POSTGRES_PASSWORD=${QUEUE_DATABASE_PASSWORD}
+            - POSTGRES_USER=${QUEUE_DATABASE_USER}
+            - POSTGRES_DB=${QUEUE_DATABASE_NAME}
+        command: -p ${QUEUE_DATABASE_PORT}
+    transcribe:
+        image: joplin/transcribe:latest
+        profiles:
+            - full
+        volumes:
+            - ${HTR_CLI_IMAGES_FOLDER}:/app/packages/transcribe/images
+            - ${HTR_CLI_MODELS_FOLDER}:/opt/models:ro
+        depends_on:
+            - transcribe-db
+        ports:
+            - "4567:4567"
+        networks:
+            - transcribe-network
+            - shared-network
+        restart: unless-stopped
+        # Security: limit resources to prevent runaway processes
+        deploy:
+            resources:
+                limits:
+                    memory: 16G
+                    cpus: '4'
+        # Security: read-only root filesystem with only images folder writable
+        read_only: true
+        tmpfs:
+            - /tmp
+        environment:
+            - APP_PORT=4567
+            - DB_CLIENT=pg
+            - QUEUE_DATABASE_NAME=${QUEUE_DATABASE_NAME}
+            - QUEUE_DATABASE_USER=${QUEUE_DATABASE_USER}
+            - QUEUE_DATABASE_PASSWORD=${QUEUE_DATABASE_PASSWORD}
+            - QUEUE_DATABASE_PORT=${QUEUE_DATABASE_PORT}
+            - QUEUE_DATABASE_HOST=transcribe-db
+            - API_KEY=${TRANSCRIBE_API_KEY}
+            - HTR_CLI_IMAGES_FOLDER=/app/packages/transcribe/images
+            - HTR_CLI_MODELS_FOLDER=/opt/models
+

docker-compose.transcribe.yml

@@ -0,0 +1,44 @@
+# Standalone docker-compose for Joplin Transcribe
+#
+# Uses SQLite for the queue (no external database needed).
+# Data is stored in a named volume for proper permissions.
+#
+# Usage:
+#
+#   1. Download models:
+#      mkdir -p ./data/models
+#      wget -O ./data/models/Model-7.6B-Q4_K_M.gguf https://huggingface.co/openbmb/MiniCPM-o-2_6-gguf/resolve/main/Model-7.6B-Q4_K_M.gguf
+#      wget -O ./data/models/mmproj-model-f16.gguf https://huggingface.co/openbmb/MiniCPM-o-2_6-gguf/resolve/main/mmproj-model-f16.gguf
+#
+#   2. Configure:
+#      cp .env-transcribe-sample .env
+#      # Edit .env and set API_KEY
+#
+#   3. Run:
+#      docker compose -f docker-compose.transcribe.yml up
+
+volumes:
+    transcribe-data:
+
+services:
+    transcribe:
+        image: joplin/transcribe:amd64-latest
+        ports:
+            - "4567:4567"
+        volumes:
+            - transcribe-data:/data
+            - ./data/models:/data/models:ro
+        restart: unless-stopped
+        # Security: limit resources to prevent runaway processes
+        deploy:
+            resources:
+                limits:
+                    memory: 16G
+                    cpus: '4'
+        # Security: read-only root filesystem
+        read_only: true
+        tmpfs:
+            - /tmp
+            - /home/transcribe/.cache
+        env_file:
+            - .env

fastlane/metadata/android/hr/full_description.txt

@@ -0,0 +1,13 @@
+<strong>Joplin</strong> je besplatan program otvorenog koda za bilješke i popis zadataka koji može obraditi veliki broj bilješki organizirane u bilježnice. Bilješke se mogu pretraživati, kopirati, označavati i mijenjati izravno iz programa ili iz vlastitog uređivača teksta.
+
+Bilješke su u <a href="https://joplinapp.org/help/apps/markdown">Markdown formatu</a>.
+
+Iz Evernotea izvezene bilješke <a href="https://joplinapp.org/help/apps/import_export">mogu se uvesti</a> u Joplin, uključujući formatirani sadržaj (koji se pretvara u Markdown), resurse (slike, privitke itd.) i potpune metapodatke (geografski podaci mjesta, vrijeme aktualiziranja, vrijeme stvaranja itd.). Mogu se uvesti i obične Markdown datoteke.
+
+Joplin radi ponajprije s lokalnim podacima (offline first), što znači da uvijek imaš sve svoje podatke na mobitelu ili računalu. To osigurava da su tvoje bilješke uvijek dostupne, bez obzira je li imaš internetsku vezu ili ne.</p>
+
+Bilješke se mogu sigurno <a href="https://joplinapp.org/help/apps/sync">sinkronizirati</a> pomoću <a href="https://joplinapp.org/help/apps/sync/e2ee">sveobuhvatnog šifriranja</a> s raznim uslugama u oblaku, uključujući Nextcloud, Dropbox, OneDrive i <a href="https://joplinapp.org/plans/">Joplin Cloud</a>.
+
+Pretraživanje cijelog teksta dostupno je na svim platformama za brzo pronalaženje potrebnih informacija. Program se može prilagoditi pomoću dodataka i tema, a možeš stvoriti i vlastite.
+
+Program je dostupan za Windows, Linux, macOS, Android i iOS sustave. <a href="https://joplinapp.org/help/apps/clipper">Web Clipper</a>, za spremanje web stranica i snimaka ekrana iz tvog preglednika, je također dostupan za <a href="https://addons.mozilla.org/firefox/addon/joplin-web-clipper/">Firefox</a> i <a href="https://chrome.google.com/webstore/detail/joplin-web-clipper/alofnhikmmkdbbbgpnglcpdollgjjfek">Chrome</a>.

fastlane/metadata/android/hr/short_description.txt

@@ -0,0 +1 @@
+Program za bilješke i popis zadataka sa sinkronizacijom između Linuxa, macOS-a, Windowsa i mobitela

jest.config.base.js

@@ -0,0 +1,6 @@
+// This is the base Jest configuration - all
+// jest.config.js files should inherit from it.
+
+module.exports = {
+	watchman: false,
+};

joplin.code-workspace

@@ -16,6 +16,7 @@
 			"./packages/app-cli/**/*.mo": true,
 			"./packages/app-cli/**/build/": true,
 			"./packages/app-cli/**/config.json": true,
+			"**/.watchman-cookie-*": true,
 			"./packages/app-cli/**/linkToLocal.sh": true,
 			"./packages/app-cli/**/node_modules/": true,
 			"./packages/app-cli/**/out.txt": true,

package.json

@@ -38,6 +38,7 @@
     "linter-precommit": "eslint --resolve-plugins-relative-to . --fix --ext .js --ext .jsx --ext .ts --ext .tsx",
     "linter": "eslint --resolve-plugins-relative-to . --fix --quiet --ext .js --ext .jsx --ext .ts --ext .tsx",
     "packageJsonLint": "node ./packages/tools/packageJsonLint.js",
+    "syncFuzzer": "node ./packages/tools/fuzzer/cli.js",
     "postinstall": "husky && gulp build",
     "postPreReleasesToForum": "node ./packages/tools/postPreReleasesToForum",
     "publishAll": "git pull && yarn buildParallel && lerna version --yes --no-private --no-git-tag-version && gulp completePublishAll",
@@ -50,6 +51,8 @@
     "releasePluginGenerator": "node packages/tools/release-plugin-generator.js",
     "releasePluginRepoCli": "node packages/tools/release-plugin-repo-cli.js",
     "releaseServer": "node packages/tools/release-server.js",
+    "releaseTranscribe": "node packages/tools/release-transcribe.js",
+    "saveClaConsentRecords": "node packages/tools/saveClaConsentRecords.js",
     "setupNewRelease": "node ./packages/tools/setupNewRelease",
     "spellcheck": "node packages/tools/spellcheck.js",
     "tagServerLatest": "node packages/tools/tagServerLatest.js",
@@ -57,6 +60,7 @@
     "test": "yarn workspaces foreach --worktree --parallel --verbose --interlaced --jobs 2 run test",
     "tsc": "yarn workspaces foreach --worktree --parallel --verbose --interlaced run tsc",
     "updateIgnored": "node packages/tools/gulp/tasks/updateIgnoredTypeScriptBuildRun.js",
+    "updateCanary": "node ./packages/tools/updateCanary",
     "updateMarkdownDoc": "node ./packages/tools/updateMarkdownDoc",
     "updateNews": "node ./packages/tools/website/updateNews",
     "updatePluginTypes": "./packages/generator-joplin/updateTypes.sh",
@@ -65,41 +69,40 @@
     "watchWebsite": "nodemon --delay 1 --watch Assets/WebsiteAssets --watch packages/tools/website --watch packages/tools/website/utils --watch packages/doc-builder/build --ext md,ts,js,mustache,css,tsx,gif,png,svg --exec \"node packages/tools/website/build.js && http-server --port 8077 ../joplin-website/docs -a localhost\""
   },
   "devDependencies": {
-    "@crowdin/cli": "3",
+    "@crowdin/cli": "4",
     "@joplin/utils": "~2.12",
     "@seiyab/eslint-plugin-react-hooks": "4.5.1-beta.0",
     "@typescript-eslint/eslint-plugin": "6.21.0",
     "@typescript-eslint/parser": "6.21.0",
     "cspell": "5.21.2",
-    "eslint": "8.57.0",
+    "eslint": "8.57.1",
     "eslint-interactive": "10.8.0",
-    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-import": "2.32.0",
     "eslint-plugin-jest": "27.9.0",
-    "eslint-plugin-promise": "6.2.0",
-    "eslint-plugin-react": "7.34.3",
+    "eslint-plugin-promise": "6.6.0",
+    "eslint-plugin-react": "7.37.5",
     "execa": "5.1.1",
-    "fs-extra": "11.2.0",
-    "glob": "10.4.5",
+    "fs-extra": "11.3.2",
+    "glob": "11.0.3",
     "gulp": "4.0.2",
     "husky": "9.1.7",
     "lerna": "3.22.1",
-    "lint-staged": "15.4.3",
-    "madge": "7.0.0",
-    "npm-package-json-lint": "7.1.0",
-    "typescript": "5.4.5"
+    "lint-staged": "16.2.7",
+    "madge": "8.0.0",
+    "npm-package-json-lint": "9.0.0",
+    "typescript": "5.8.3"
   },
   "dependencies": {
     "@types/fs-extra": "11.0.4",
     "eslint-plugin-github": "4.10.2",
     "http-server": "14.1.1",
-    "node-gyp": "9.4.1",
-    "nodemon": "3.1.9"
+    "node-gyp": "11.5.0",
+    "nodemon": "3.1.11"
   },
   "packageManager": "yarn@4.9.2",
   "resolutions": {
     "react-native-camera@4.2.1": "patch:react-native-camera@npm%3A4.2.1#./.yarn/patches/react-native-camera-npm-4.2.1-24b2600a7e.patch",
-    "react-native-vosk@0.1.12": "patch:react-native-vosk@npm%3A0.1.12#./.yarn/patches/react-native-vosk-npm-0.1.12-76b1caaae8.patch",
-    "eslint": "patch:eslint@8.57.0#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
+    "eslint": "patch:eslint@8.57.1#./.yarn/patches/eslint-npm-8.39.0-d92bace04d.patch",
     "app-builder-lib@24.4.0": "patch:app-builder-lib@npm%3A24.4.0#./.yarn/patches/app-builder-lib-npm-24.4.0-05322ff057.patch",
     "nanoid": "patch:nanoid@npm%3A3.3.7#./.yarn/patches/nanoid-npm-3.3.7-98824ba130.patch",
     "pdfjs-dist": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
@@ -114,6 +117,14 @@
     "pdfjs-dist@2.16.105": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@*": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@3.11.174": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
-    "canvas@npm:^2.11.2": "link:./.yarn/joplin-empty-package/"
+    "canvas@npm:^2.11.2": "link:./.yarn/joplin-empty-package/",
+    "node-gyp@npm:^9.0.0": "11.2.0",
+    "depd@npm:^2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
+    "depd@npm:~2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
+    "depd@npm:~1.1.2": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
+    "depd@npm:2.0.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
+    "depd@npm:^1.1.2": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
+    "depd@npm:^1.1.0": "patch:depd@npm%3A2.0.0#~/.yarn/patches/depd-npm-2.0.0-b6c51a4b43.patch",
+    "formidable@npm:^2.0.1": "patch:formidable@npm%3A2.1.2#~/.yarn/patches/formidable-npm-2.1.2-40ba18d67f.patch"
   }
 }

packages/app-cli/app/app-gui.js

@@ -380,6 +380,13 @@ class AppGui {
 		this.widget('noteList').toggleShowIds();
 	}
 
+	toggleFolderCollapse() {
+		const folderList = this.widget('folderList');
+		if (folderList && folderList.toggleFolderCollapse) {
+			folderList.toggleFolderCollapse();
+		}
+	}
+
 	widget(name) {
 		if (name === 'root') return this.rootWidget_;
 		return this.rootWidget_.childByName(name);
@@ -506,6 +513,8 @@ class AppGui {
 			this.toggleNoteMetadata();
 		} else if (cmd === 'toggle_ids') {
 			this.toggleFolderIds();
+		} else if (cmd === 'toggle_folder_collapse') {
+			this.toggleFolderCollapse();
 		} else if (cmd === 'enter_command_line_mode') {
 			const cmd = await this.widget('statusBar').prompt();
 			if (!cmd) return;

packages/app-cli/app/app.ts

@@ -6,19 +6,18 @@ import Folder from '@joplin/lib/models/Folder';
 import BaseItem from '@joplin/lib/models/BaseItem';
 import Note from '@joplin/lib/models/Note';
 import Tag from '@joplin/lib/models/Tag';
-import Setting from '@joplin/lib/models/Setting';
+import Setting, { Env } from '@joplin/lib/models/Setting';
 import { reg } from '@joplin/lib/registry.js';
 import { dirname, fileExtension } from '@joplin/lib/path-utils';
-import { splitCommandString } from '@joplin/utils';
 import { _ } from '@joplin/lib/locale';
 import { pathExists, readFile, readdirSync } from 'fs-extra';
 import RevisionService from '@joplin/lib/services/RevisionService';
 import shim from '@joplin/lib/shim';
 import setupCommand from './setupCommand';
 import { FolderEntity, NoteEntity } from '@joplin/lib/services/database/types';
+import initializeCommandService from './utils/initializeCommandService';
 const { cliUtils } = require('./cli-utils.js');
 const Cache = require('@joplin/lib/Cache');
-const { splitCommandBatch } = require('@joplin/lib/string-utils');
 
 class Application extends BaseApplication {
 
@@ -76,6 +75,12 @@ class Application extends BaseApplication {
 		}
 	}
 
+	public async loadItemOrFail(type: ModelType | 'folderOrNote', pattern: string) {
+		const output = await this.loadItem(type, pattern);
+		if (!output) throw new Error(_('Cannot find "%s".', pattern));
+		return output;
+	}
+
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 	public async loadItems(type: ModelType | 'folderOrNote', pattern: string, options: any = null): Promise<(FolderEntity | NoteEntity)[]> {
 		if (type === 'folderOrNote') {
@@ -215,6 +220,7 @@ class Application extends BaseApplication {
 		return { ...this.commandMetadata_ };
 	}
 
+
 	public hasGui() {
 		return this.gui() && !this.gui().isDummy();
 	}
@@ -325,6 +331,7 @@ class Application extends BaseApplication {
 			{ keys: ['mb'], type: 'prompt', command: 'mkbook ""', cursorPosition: -2 },
 			{ keys: ['yn'], type: 'prompt', command: 'cp $n ""', cursorPosition: -2 },
 			{ keys: ['dn'], type: 'prompt', command: 'mv $n ""', cursorPosition: -2 },
+			{ keys: ['z'], type: 'function', command: 'toggle_folder_collapse' },
 		];
 
 		// Filter the keymap item by command so that items in keymap.json can override
@@ -374,22 +381,6 @@ class Application extends BaseApplication {
 		return output;
 	}
 
-	public async commandList(argv: string[]) {
-		if (argv.length && argv[0] === 'batch') {
-			const commands = [];
-			const commandLines = splitCommandBatch(await readFile(argv[1], 'utf-8'));
-
-			for (const commandLine of commandLines) {
-				if (!commandLine.trim()) continue;
-				const splitted = splitCommandString(commandLine.trim());
-				commands.push(splitted);
-			}
-			return commands;
-		} else {
-			return [argv];
-		}
-	}
-
 	// We need this special case here because by the time the `version` command
 	// runs, the keychain has already been setup.
 	public checkIfKeychainEnabled(argv: string[]) {
@@ -412,22 +403,26 @@ class Application extends BaseApplication {
 
 		this.initRedux();
 
+		// Since the settings need to be loaded before the store is created, it will never
+		// receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
+		// initialised. So we manually call dispatchUpdateAll() to force an update.
+		Setting.dispatchUpdateAll();
+
 		if (!shim.sharpEnabled()) this.logger().warn('Sharp is disabled - certain image-related features will not be available');
 
+		initializeCommandService(this.store(), Setting.value('env') === Env.Dev);
+
 		// If we have some arguments left at this point, it's a command
 		// so execute it.
 		if (argv.length) {
 			this.gui_ = this.dummyGui();
 
-			this.currentFolder_ = await Folder.load(Setting.value('activeFolderId'));
-
+			const initialFolder = await Folder.load(Setting.value('activeFolderId'));
+			await this.switchCurrentFolder(initialFolder);
 			await this.applySettingsSideEffects();
 
 			try {
-				const commands = await this.commandList(argv);
-				for (const command of commands) {
-					await this.execCommand(command);
-				}
+				await this.execCommand(argv);
 			} catch (error) {
 				if (this.showStackTraces_) {
 					console.error(error);
@@ -439,6 +434,7 @@ class Application extends BaseApplication {
 			}
 
 			await Setting.saveAll();
+			await this.database_.close();
 
 			// Need to call exit() explicitly, otherwise Node wait for any timeout to complete
 			// https://stackoverflow.com/questions/18050095
@@ -452,11 +448,6 @@ class Application extends BaseApplication {
 			this.gui_.setLogger(this.logger());
 			await this.gui_.start();
 
-			// Since the settings need to be loaded before the store is created, it will never
-			// receive the SETTING_UPDATE_ALL even, which mean state.settings will not be
-			// initialised. So we manually call dispatchUpdateAll() to force an update.
-			Setting.dispatchUpdateAll();
-
 			// eslint-disable-next-line @typescript-eslint/no-explicit-any -- Old code before rule was applied
 			await refreshFolders((action: any) => this.store().dispatch(action), '');
 

packages/app-cli/app/cli-integration-tests.js

@@ -1,240 +0,0 @@
-'use strict';
-
-/* eslint-disable no-console */
-
-const fs = require('fs-extra');
-const Logger = require('@joplin/utils/Logger').default;
-const { dirname } = require('@joplin/lib/path-utils');
-const { DatabaseDriverNode } = require('@joplin/lib/database-driver-node.js');
-const JoplinDatabase = require('@joplin/lib/JoplinDatabase').default;
-const BaseModel = require('@joplin/lib/BaseModel').default;
-const Folder = require('@joplin/lib/models/Folder').default;
-const Note = require('@joplin/lib/models/Note').default;
-const Setting = require('@joplin/lib/models/Setting').default;
-const { sprintf } = require('sprintf-js');
-const exec = require('child_process').exec;
-
-const baseDir = `${dirname(__dirname)}/tests/cli-integration`;
-const joplinAppPath = `${__dirname}/main.js`;
-
-const logger = new Logger();
-logger.addTarget('console');
-logger.setLevel(Logger.LEVEL_ERROR);
-
-const dbLogger = new Logger();
-dbLogger.addTarget('console');
-dbLogger.setLevel(Logger.LEVEL_INFO);
-
-const db = new JoplinDatabase(new DatabaseDriverNode());
-db.setLogger(dbLogger);
-
-function createClient(id) {
-	return {
-		id: id,
-		profileDir: `${baseDir}/client${id}`,
-	};
-}
-
-const client = createClient(1);
-
-function execCommand(client, command) {
-	const exePath = `node ${joplinAppPath}`;
-	const cmd = `${exePath} --update-geolocation-disabled --env dev --profile ${client.profileDir} ${command}`;
-	logger.info(`${client.id}: ${command}`);
-
-	return new Promise((resolve, reject) => {
-		exec(cmd, (error, stdout, stderr) => {
-			if (error) {
-				logger.error(stderr);
-				reject(error);
-			} else {
-				resolve(stdout.trim());
-			}
-		});
-	});
-}
-
-function assertTrue(v) {
-	if (!v) throw new Error(sprintf('Expected "true", got "%s"."', v));
-	process.stdout.write('.');
-}
-
-function assertFalse(v) {
-	if (v) throw new Error(sprintf('Expected "false", got "%s"."', v));
-	process.stdout.write('.');
-}
-
-function assertEquals(expected, real) {
-	if (expected !== real) throw new Error(sprintf('Expecting "%s", got "%s"', expected, real));
-	process.stdout.write('.');
-}
-
-async function clearDatabase() {
-	await db.transactionExecBatch(['DELETE FROM folders', 'DELETE FROM notes', 'DELETE FROM tags', 'DELETE FROM note_tags', 'DELETE FROM resources', 'DELETE FROM deleted_items']);
-}
-
-const testUnits = {};
-
-testUnits.testFolders = async () => {
-	await execCommand(client, 'mkbook nb1');
-
-	let folders = await Folder.all();
-	assertEquals(1, folders.length);
-	assertEquals('nb1', folders[0].title);
-
-	await execCommand(client, 'mkbook nb1');
-
-	folders = await Folder.all();
-	assertEquals(1, folders.length);
-	assertEquals('nb1', folders[0].title);
-
-	await execCommand(client, 'rm -r -f nb1');
-
-	folders = await Folder.all();
-	assertEquals(0, folders.length);
-};
-
-testUnits.testNotes = async () => {
-	await execCommand(client, 'mkbook nb1');
-	await execCommand(client, 'mknote n1');
-
-	let notes = await Note.all();
-	assertEquals(1, notes.length);
-	assertEquals('n1', notes[0].title);
-
-	await execCommand(client, 'rm -f n1');
-	notes = await Note.all();
-	assertEquals(0, notes.length);
-
-	await execCommand(client, 'mknote n1');
-	await execCommand(client, 'mknote n2');
-
-	notes = await Note.all();
-	assertEquals(2, notes.length);
-
-	await execCommand(client, 'rm -f \'blabla*\'');
-
-	notes = await Note.all();
-	assertEquals(2, notes.length);
-
-	await execCommand(client, 'rm -f \'n*\'');
-
-	notes = await Note.all();
-	assertEquals(0, notes.length);
-};
-
-testUnits.testCat = async () => {
-	await execCommand(client, 'mkbook nb1');
-	await execCommand(client, 'mknote mynote');
-
-	const folder = await Folder.loadByTitle('nb1');
-	const note = await Note.loadFolderNoteByField(folder.id, 'title', 'mynote');
-
-	let r = await execCommand(client, 'cat mynote');
-	assertTrue(r.indexOf('mynote') >= 0);
-	assertFalse(r.indexOf(note.id) >= 0);
-
-	r = await execCommand(client, 'cat -v mynote');
-	assertTrue(r.indexOf(note.id) >= 0);
-};
-
-testUnits.testConfig = async () => {
-	await execCommand(client, 'config editor vim');
-	await Setting.load();
-	assertEquals('vim', Setting.value('editor'));
-
-	await execCommand(client, 'config editor subl');
-	await Setting.load();
-	assertEquals('subl', Setting.value('editor'));
-
-	const r = await execCommand(client, 'config');
-	assertTrue(r.indexOf('editor') >= 0);
-	assertTrue(r.indexOf('subl') >= 0);
-};
-
-testUnits.testCp = async () => {
-	await execCommand(client, 'mkbook nb2');
-	await execCommand(client, 'mkbook nb1');
-	await execCommand(client, 'mknote n1');
-
-	await execCommand(client, 'cp n1');
-
-	const f1 = await Folder.loadByTitle('nb1');
-	const f2 = await Folder.loadByTitle('nb2');
-	let notes = await Note.previews(f1.id);
-
-	assertEquals(2, notes.length);
-
-	await execCommand(client, 'cp n1 nb2');
-	const notesF1 = await Note.previews(f1.id);
-	assertEquals(2, notesF1.length);
-	notes = await Note.previews(f2.id);
-	assertEquals(1, notes.length);
-	assertEquals(notesF1[0].title, notes[0].title);
-};
-
-testUnits.testLs = async () => {
-	await execCommand(client, 'mkbook nb1');
-	await execCommand(client, 'mknote note1');
-	await execCommand(client, 'mknote note2');
-	const r = await execCommand(client, 'ls');
-
-	assertTrue(r.indexOf('note1') >= 0);
-	assertTrue(r.indexOf('note2') >= 0);
-};
-
-testUnits.testMv = async () => {
-	await execCommand(client, 'mkbook nb2');
-	await execCommand(client, 'mkbook nb1');
-	await execCommand(client, 'mknote n1');
-	await execCommand(client, 'mv n1 nb2');
-
-	const f1 = await Folder.loadByTitle('nb1');
-	const f2 = await Folder.loadByTitle('nb2');
-	let notes1 = await Note.previews(f1.id);
-	let notes2 = await Note.previews(f2.id);
-
-	assertEquals(0, notes1.length);
-	assertEquals(1, notes2.length);
-
-	await execCommand(client, 'mknote note1');
-	await execCommand(client, 'mknote note2');
-	await execCommand(client, 'mknote note3');
-	await execCommand(client, 'mknote blabla');
-	await execCommand(client, 'mv \'note*\' nb2');
-
-	notes1 = await Note.previews(f1.id);
-	notes2 = await Note.previews(f2.id);
-
-	assertEquals(1, notes1.length);
-	assertEquals(4, notes2.length);
-};
-
-async function main() {
-	await fs.remove(baseDir);
-
-	logger.info(await execCommand(client, 'version'));
-
-	await db.open({ name: `${client.profileDir}/database.sqlite` });
-	BaseModel.setDb(db);
-	await Setting.load();
-
-	let onlyThisTest = 'testMv';
-	onlyThisTest = '';
-
-	for (const n in testUnits) {
-		if (!testUnits.hasOwnProperty(n)) continue;
-		if (onlyThisTest && n !== onlyThisTest) continue;
-
-		await clearDatabase();
-		const testName = n.substr(4).toLowerCase();
-		process.stdout.write(`${testName}: `);
-		await testUnits[n]();
-		console.info('');
-	}
-}
-
-main(process.argv).catch(error => {
-	console.info('');
-	logger.error(error);
-});