fix https://github.com/rustdesk/rustdesk/issues/15326

2026-06-23 01:13:59 +08:00 · 2026-06-18 12:09:51 +08:00
85 changed files with 307 additions and 1748 deletions
@@ -2,8 +2,6 @@
 rustflags = ["-Ctarget-feature=+crt-static"]
 [target.i686-pc-windows-msvc]
 rustflags = ["-C", "target-feature=+crt-static", "-C", "link-args=/NODEFAULTLIB:MSVCRT"]
-[target.aarch64-pc-windows-msvc]
-rustflags = ["-Ctarget-feature=+crt-static"]
 [target.'cfg(target_os="macos")']
 rustflags = [
    "-C", "link-args=-sectcreate __CGPreLoginApp __cgpreloginapp /dev/null",
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-# Applies the Flutter 3.44-only source/pubspec changes on the fly, in CI only.
-#
-# Windows arm64 needs Flutter >= 3.44 (the first stable release shipping an arm64 Dart SDK +
-# engine), which renamed DialogTheme/TabBarTheme -> *Data and needs newer extended_text/
-# google_fonts. Every other platform is still on Flutter 3.24.5, where the old names/versions
-# are required, so these changes are kept OUT of the committed sources and applied here instead.
-#
-# Used by BOTH the Windows arm64 build (flutter-build.yml) and its dedicated bridge artifact
-# (bridge.yml) so they share an identical 3.44 source state -- the generated *.freezed.dart must
-# compile against the same Flutter/freezed version the arm64 build resolves.
-#
-# Remove this script (and commit the changes) once upstream bumps Flutter across the board.
-#
-# Run from the repository root. sed is used (not a git-apply patch) because the checked-out
-# sources are CRLF on the windows-11-arm runner; the substitutions below are anchor-free and
-# therefore CRLF-safe.
-set -euo pipefail
-
-# ThemeData API renames (Flutter 3.27+):
-sed -i 's/dialogTheme: DialogTheme(/dialogTheme: DialogThemeData(/g' flutter/lib/common.dart
-sed -i 's/tabBarTheme: const TabBarTheme(/tabBarTheme: const TabBarThemeData(/g' flutter/lib/common.dart
-sed -i '/static ThemeData lightTheme = ThemeData(/,/static ThemeData darkTheme = ThemeData(/s/dialogTheme: DialogThemeData(/dialogTheme: DialogThemeData(\
-      backgroundColor: Colors.white,/' flutter/lib/common.dart
-sed -i '/static ThemeData darkTheme = ThemeData(/,/scrollbarTheme: scrollbarThemeDark,/s/dialogTheme: DialogThemeData(/dialogTheme: DialogThemeData(\
-      backgroundColor: Color(0xFF18191E),/' flutter/lib/common.dart
-# Dependency bumps required by the newer Dart/Flutter:
-sed -i 's/extended_text: 14.0.0/extended_text: 15.0.2/' flutter/pubspec.yaml
-sed -i 's/google_fonts: \^6.2.1/google_fonts: ^8.1.0/' flutter/pubspec.yaml
-
-# Fail loudly if any expected string drifted, so we never silently build unpatched:
-grep -qF 'dialogTheme: DialogThemeData(' flutter/lib/common.dart
-grep -qF 'tabBarTheme: const TabBarThemeData(' flutter/lib/common.dart
-grep -qF 'backgroundColor: Colors.white,' flutter/lib/common.dart
-grep -qF 'backgroundColor: Color(0xFF18191E),' flutter/lib/common.dart
-grep -qF 'extended_text: 15.0.2' flutter/pubspec.yaml
-grep -qF 'google_fonts: ^8.1.0' flutter/pubspec.yaml
-
-git --no-pager diff -- flutter/lib/common.dart flutter/pubspec.yaml
@@ -7,6 +7,7 @@ on:

 env:
  CARGO_EXPAND_VERSION: "1.0.95"
+  FLUTTER_VERSION: "3.22.3"
  FLUTTER_RUST_BRIDGE_VERSION: "1.80.1"
  RUST_VERSION: "1.75" # https://github.com/rustdesk/rustdesk/discussions/7503

@@ -17,21 +18,10 @@ jobs:
      fail-fast: false
      matrix:
        job:
-          # Default bridge for every platform still on Flutter 3.24.5 (generated with 3.22.3).
          - {
              target: x86_64-unknown-linux-gnu,
              os: ubuntu-22.04,
              extra-build-args: "",
-              flutter-version: "3.22.3",
-              artifact-name: "bridge-artifact",
-            }
-          # Dedicated bridge for the Windows arm64 build (Flutter 3.44); runs in parallel.
-          - {
-              target: x86_64-unknown-linux-gnu,
-              os: ubuntu-22.04,
-              extra-build-args: "",
-              flutter-version: "3.44.0",
-              artifact-name: "bridge-artifact-flutter-3.44",
            }
    steps:
      - name: Checkout source code
@@ -74,13 +64,13 @@ jobs:
        uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
        with:
          path: /tmp/flutter_rust_bridge
-          key: bridge-${{ matrix.job.flutter-version }}
+          key: vcpkg-${{ matrix.job.arch }}

      - name: Install flutter
        uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
        with:
          channel: "stable"
-          flutter-version: ${{ matrix.job.flutter-version }}
+          flutter-version: ${{ env.FLUTTER_VERSION }}
          cache: true

      - name: Install flutter rust bridge deps
@@ -88,15 +78,7 @@ jobs:
        run: |
          cargo install cargo-expand --version ${{ env.CARGO_EXPAND_VERSION }} --locked
          cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid" --locked
-          if [[ "${{ matrix.job.flutter-version }}" == "3.22.3" ]]; then
-            # Default Flutter 3.22.3: extended_text 14 needs a newer Dart, so downgrade for resolution.
-            sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' flutter/pubspec.yaml
-          else
-            # Flutter 3.44 bridge for Windows arm64: match that build's source/pubspec state so the
-            # generated *.freezed.dart compiles against the same Flutter/freezed it resolves.
-            bash .github/patches/apply_flutter_3.44_source_patches.sh
-          fi
-          pushd flutter && flutter pub get && popd
+          pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get && popd

      - name: Run flutter rust bridge
        run: |
@@ -106,7 +88,7 @@ jobs:
      - name: Upload Artifact
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
-          name: ${{ matrix.job.artifact-name }}
+          name: bridge-artifact
          path: |
            ./src/bridge_generated.rs
            ./src/bridge_generated.io.rs
@@ -81,7 +81,6 @@ jobs:
          # - { target: x86_64-apple-darwin         , os: macos-10.15                   }
          # - { target: x86_64-pc-windows-gnu       , os: windows-2022                  }
          # - { target: x86_64-pc-windows-msvc      , os: windows-2022                  }
-          # - { target: aarch64-pc-windows-msvc     , os: windows-11-arm                }
          - { target: x86_64-unknown-linux-gnu    , os: ubuntu-24.04                  }
          # - { target: x86_64-unknown-linux-musl   , os: ubuntu-20.04, use-cross: true }
    steps:
@@ -27,11 +27,6 @@ env:
  LLVM_VERSION: "15.0.6"
  FLUTTER_VERSION: "3.24.5"
  ANDROID_FLUTTER_VERSION: "3.24.5"
-  # Windows arm64 only: the first stable Flutter to ship a native arm64 Windows Dart SDK +
-  # engine is 3.44. Every other platform stays on FLUTTER_VERSION (3.24.5) until Windows 7
-  # support is restored after the upstream-wide Flutter bump. The arm64 job patches the few
-  # 3.44-only source/pubspec changes on the fly (see "Patch RustDesk sources for Flutter 3.44").
-  FLUTTER_WINDOWS_ARM_VERSION: "3.44.0"
  # for arm64 linux because official Dart SDK does not work
  FLUTTER_ELINUX_VERSION: "3.16.9"
  TAG_NAME: "${{ inputs.upload-tag }}"
@@ -58,24 +53,14 @@ jobs:

  build-RustDeskTempTopMostWindow:
    uses: ./.github/workflows/third-party-RustDeskTempTopMostWindow.yml
-    strategy:
-      fail-fast: false
-      matrix:
-        job:
-          - {
-              target: windows-2022,
-              platform: x64,
-            }
-          - {
-              target: windows-11-arm,
-              platform: ARM64,
-            }
    with:
      upload-artifact: ${{ inputs.upload-artifact }}
-      target: ${{ matrix.job.target }}
+      target: windows-2022
      configuration: Release
-      platform: ${{ matrix.job.platform }}
+      platform: x64
      target_version: Windows10
+    strategy:
+      fail-fast: false

  build-for-windows-flutter:
    name: ${{ matrix.job.target }}
@@ -91,20 +76,9 @@ jobs:
              target: x86_64-pc-windows-msvc,
              os: windows-2022,
              arch: x86_64,
-              flutter-arch: x64,
              vcpkg-triplet: x64-windows-static,
-              build-args: "--vram",
-            }
-          - {
-              target: aarch64-pc-windows-msvc,
-              os: windows-11-arm,
-              arch: aarch64,
-              flutter-arch: arm64,
-              vcpkg-triplet: arm64-windows-static,
-              # vram is x86/x64-only (NVENC needs CUDA, Intel MediaSDK needs __rdtsc);
-              # no NV/Intel/AMD hardware exists on Windows-on-ARM, so vram stays disabled here.
-              build-args: "",
            }
+          # - { target: aarch64-pc-windows-msvc, os: windows-2022, arch: aarch64 }
    steps:
      - name: Export GitHub Actions cache environment variables
        uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
@@ -121,91 +95,36 @@ jobs:
      - name: Restore bridge files
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
-          # arm64 is on Flutter 3.44, so it needs the bridge generated with the same Flutter
-          # (its *.freezed.dart must match the freezed the arm64 build resolves). x64 and every
-          # other platform keep the default 3.22.3-generated bridge.
-          name: ${{ matrix.job.arch == 'aarch64' && 'bridge-artifact-flutter-3.44' || 'bridge-artifact' }}
+          name: bridge-artifact
          path: ./

      - name: Install LLVM and Clang
-        uses: KyleMayes/install-llvm-action@ebc0426251bc40c7cd31162802432c68818ab8f0 # v2.0.9
+        uses: KyleMayes/install-llvm-action@1a3da29f56261a1e1f937ec88f0856a9b8321d7e # v1
        with:
          version: ${{ env.LLVM_VERSION }}

      - name: Install flutter
-        id: flutter
-        # arm64 builds with FLUTTER_WINDOWS_ARM_VERSION (>=3.44); x64 stays on FLUTTER_VERSION.
-        # subosito only ships an x64 Windows SDK (Flutter's release manifest lists x64 only),
-        # so it installs x64 on both arches. The arm64 runner re-bootstraps Dart to arm64 in
-        # the next step.
        uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225  # v2.12.0; https://github.com/subosito/flutter-action/issues/277
        with:
          channel: "stable"
-          flutter-version: ${{ matrix.job.arch == 'aarch64' && env.FLUTTER_WINDOWS_ARM_VERSION || env.FLUTTER_VERSION }}
-          architecture: x64
-
-      - name: Force arm64 Dart SDK + engine
-        # The x64 SDK subosito installs bundles an x64 Dart with a matching engine-dart-sdk.stamp,
-        # so update_dart_sdk.ps1 short-circuits (stamp matches -> return) and keeps x64 Dart;
-        # `flutter build windows` then targets the Dart VM's arch = x64, even on this arm64 host.
-        # On this native-arm64 runner (PROCESSOR_ARCHITECTURE=ARM64), deleting the stamp and
-        # re-running update_dart_sdk.ps1 pulls the arm64 Dart (available since Flutter 3.44.0).
-        # https://github.com/flutter/flutter/issues/186730#issuecomment-4573214964
-        if: ${{ matrix.job.arch == 'aarch64' }}
-        run: |
-          $flutterRoot = "${{ steps.flutter.outputs['CACHE-PATH'] }}"
-          Write-Host "PROCESSOR_ARCHITECTURE=$env:PROCESSOR_ARCHITECTURE"
-          Write-Host "Flutter root: $flutterRoot"
-          Remove-Item -Force "$flutterRoot\bin\cache\engine-dart-sdk.stamp" -ErrorAction SilentlyContinue
-          & "$flutterRoot\bin\internal\update_dart_sdk.ps1"
-          # Confirm the Dart we ended up with is arm64 ("on windows_arm64"); fail loudly if not.
-          $dartVer = & "$flutterRoot\bin\dart.bat" --version 2>&1 | Out-String
-          Write-Host $dartVer
-          if ($dartVer -notmatch "windows_arm64") {
-            Write-Error "Expected an arm64 Dart SDK but got: $dartVer"
-            exit 1
-          }
-          & "$flutterRoot\bin\flutter.bat" precache --windows
-          # Fail fast if precache pulled the wrong-arch Windows engine: an arm64 Dart should
-          # fetch windows-arm64 engine artifacts. Bailing here saves the ~25min Rust build.
-          $engineDir = "$flutterRoot\bin\cache\artifacts\engine"
-          Write-Host "Engine artifacts present:"
-          Get-ChildItem $engineDir -Directory | Select-Object -ExpandProperty Name | Write-Host
-          if (-not (Test-Path "$engineDir\windows-arm64-release")) {
-            Write-Error "Expected windows-arm64-release engine artifacts but they are missing (wrong-arch SDK)."
-            exit 1
-          }
+          flutter-version: ${{ env.FLUTTER_VERSION }}

      # https://github.com/flutter/flutter/issues/155685
-      # x64 only: arm64 uses the stock native arm64 Windows engine, and the rustdesk/engine
-      # windows-x64-release.zip is built for the 3.24-era x64 engine (matches FLUTTER_VERSION).
      - name: Replace engine with rustdesk custom flutter engine
-        if: ${{ matrix.job.arch == 'x86_64' }}
        run: |
          flutter doctor -v
          flutter precache --windows
          Invoke-WebRequest -Uri https://github.com/rustdesk/engine/releases/download/main/windows-x64-release.zip -OutFile windows-x64-release.zip
          Expand-Archive -Path windows-x64-release.zip -DestinationPath windows-x64-release
-          mv -Force windows-x64-release/*  C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
+          mv -Force windows-x64-release/*  C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/

      - name: Patch flutter
-        # x64 stays on Flutter 3.24.5, which needs the dropdown filter patch.
-        # arm64 is on Flutter 3.44 (patched separately below) and does not use this patch.
-        if: ${{ matrix.job.arch == 'x86_64' }}
        shell: bash
        run: |
          cp .github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff $(dirname $(dirname $(which flutter)))
          cd $(dirname $(dirname $(which flutter)))
          [[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply flutter_3.24.4_dropdown_menu_enableFilter.diff

-      - name: Patch RustDesk sources for Flutter 3.44 (arm64)
-        # arm64 is the only target on Flutter 3.44; apply its source/pubspec deltas on the fly
-        # (shared with the 3.44 bridge job) so the committed sources stay on Flutter 3.24.5.
-        # `flutter build` then runs `pub get`, regenerating pubspec.lock for the bumped deps.
-        if: ${{ matrix.job.arch == 'aarch64' }}
-        shell: bash
-        run: bash .github/patches/apply_flutter_3.44_source_patches.sh
-
      - name: Install Rust toolchain
        uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
        with:
@@ -244,19 +163,11 @@ jobs:
          head -n 100 "${VCPKG_ROOT}/buildtrees/ffmpeg/build-${{ matrix.job.vcpkg-triplet }}-rel-out.log" || true
        shell: bash

-      - name: Set SODIUM_LIB_DIR (arm64)
-        # libsodium-sys ships no arm64 Windows prebuilt lib; point it at the vcpkg-built one
-        # (only for arm64 — leaving it unset lets x64 use the crate's bundled lib).
-        if: ${{ matrix.job.arch == 'aarch64' }}
-        shell: bash
-        run: echo "SODIUM_LIB_DIR=$VCPKG_ROOT/installed/${{ matrix.job.vcpkg-triplet }}/lib" >> "$GITHUB_ENV"
-
      - name: Build rustdesk
        run: |
          # Windows: build RustDesk
-          # --hwcodec is shared by all Windows targets; per-target extras (e.g. --vram) come from the matrix
-          python3 .\build.py --portable --flutter --skip-portable-pack --hwcodec ${{ matrix.job.build-args }}
-          mv ./flutter/build/windows/${{ matrix.job.flutter-arch }}/runner/Release ./rustdesk
+          python3 .\build.py --portable --hwcodec --flutter --vram --skip-portable-pack
+          mv ./flutter/build/windows/x64/runner/Release ./rustdesk

          # Download usbmmidd_v2.zip and extract it to ./rustdesk
          Invoke-WebRequest -Uri https://github.com/rustdesk-org/rdev/releases/download/usbmmidd_v2/usbmmidd_v2.zip -OutFile usbmmidd_v2.zip
@@ -312,7 +223,7 @@ jobs:
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        if: ${{ inputs.upload-artifact }}
        with:
-          name: ${{ matrix.job.arch == 'aarch64' && 'topmostwindow-artifacts-ARM64' || 'topmostwindow-artifacts-x64' }}
+          name: topmostwindow-artifacts
          path: "./rustdesk"

      - name: Upload unsigned
@@ -345,18 +256,13 @@ jobs:
        uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2

      - name: Build msi
-        # Builds the MSI for the matrix arch. res/msi (WiX v4 + native CustomActions) carries
-        # both x64 and ARM64 platform configs; WcaUtil/DUtil ship arm64 libs. msbuild platform
-        # is x64 / ARM64; the produced Package.msi is globbed since its bin/<platform>/ dir varies.
        if: env.UPLOAD_ARTIFACT == 'true'
        run: |
          pushd ./res/msi
          python preprocess.py --arp -d ../../rustdesk
          nuget restore msi.sln
-          $msiPlatform = if ('${{ matrix.job.arch }}' -eq 'aarch64') { 'ARM64' } else { 'x64' }
-          msbuild msi.sln -p:Configuration=Release -p:Platform=$msiPlatform /p:TargetVersion=Windows10
-          $msi = Get-ChildItem ./Package/bin/*/Release/en-us/Package.msi | Select-Object -First 1
-          mv $msi.FullName ../../SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.msi
+          msbuild msi.sln -p:Configuration=Release -p:Platform=x64 /p:TargetVersion=Windows10
+          mv ./Package/bin/x64/Release/en-us/Package.msi ../../SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.msi
          sha256sum ../../SignOutput/rustdesk-*.msi

      - name: Sign rustdesk self-extracted file
@@ -45,15 +45,16 @@ jobs:
        run: |
          git clone https://github.com/rustdesk-org/RustDeskTempTopMostWindow RustDeskTempTopMostWindow

+        # Build. commit 53b548a5398624f7149a382000397993542ad796 is tag v0.3
      - name: Build the project
        run: |
-          cd RustDeskTempTopMostWindow && git checkout ecd8d6a139eee76845ea66423fb739af450fda90
+          cd RustDeskTempTopMostWindow && git checkout 53b548a5398624f7149a382000397993542ad796
          msbuild ${{ env.project_path }} -p:Configuration=${{ inputs.configuration }} -p:Platform=${{ inputs.platform }} /p:TargetVersion=${{ inputs.target_version }}

      - name: Archive build artifacts
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        if: ${{ inputs.upload-artifact }}
        with:
-            name: topmostwindow-artifacts-${{ inputs.platform }}
+            name: topmostwindow-artifacts
            path: |
              ./${{ env.build_output_dir }}/WindowInjection.dll
@@ -1324,7 +1324,7 @@ dependencies = [
 [[package]]
 name = "clipboard-master"
 version = "4.0.0-beta.6"
-source = "git+https://github.com/rustdesk-org/clipboard-master#7762d74e38db37cfeb6ded88c964b9cdbddfb6db"
+source = "git+https://github.com/rustdesk-org/clipboard-master#ddc39f00a6211959489ae683aa6ae6eedf03a809"
 dependencies = [
 "objc",
 "objc-foundation",
@@ -2329,7 +2329,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
 dependencies = [
- "libloading 0.7.4",
+ "libloading 0.8.4",
 ]

 [[package]]
@@ -2694,7 +2694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
 "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -4494,7 +4494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
 "cfg-if 1.0.0",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@@ -4695,7 +4695,7 @@ dependencies = [
 [[package]]
 name = "magnum-opus"
 version = "0.4.0"
-source = "git+https://github.com/rustdesk-org/magnum-opus#588c6e1f9ed50c3a01fa64f3bd3e7cdb0378a114"
+source = "git+https://github.com/rustdesk-org/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256"
 dependencies = [
 "bindgen 0.59.2",
 "pkg-config",
@@ -6673,7 +6673,7 @@ dependencies = [
 "once_cell",
 "socket2 0.5.10",
 "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -6920,7 +6920,7 @@ dependencies = [
 [[package]]
 name = "rdev"
 version = "0.5.0-2"
-source = "git+https://github.com/rustdesk-org/rdev#871bf1c856d6a30af2f56ab8848396a025140855"
+source = "git+https://github.com/rustdesk-org/rdev#f9b60b1dd0f3300a1b797d7a74c116683cd232c8"
 dependencies = [
 "cocoa 0.24.1",
 "core-foundation 0.9.4",
@@ -7457,7 +7457,7 @@ dependencies = [
 "errno",
 "libc",
 "linux-raw-sys 0.11.0",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -7514,7 +7514,7 @@ dependencies = [
 "security-framework 3.5.1",
 "security-framework-sys",
 "webpki-root-certs",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -9733,9 +9733,9 @@ dependencies = [

 [[package]]
 name = "wayland-protocols-wlr"
-version = "0.3.9"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
 dependencies = [
 "bitflags 2.9.1",
 "wayland-backend",
@@ -10838,15 +10838,16 @@ dependencies = [

 [[package]]
 name = "wl-clipboard-rs"
-version = "0.9.3"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9651471a32e87d96ef3a127715382b2d11cc7c8bb9822ded8a7cc94072eb0a3"
+checksum = "4de22eebb1d1e2bad2d970086e96da0e12cde0b411321e5b0f7b2a1f876aa26f"
 dependencies = [
 "libc",
 "log",
 "os_pipe",
- "rustix 1.1.2",
- "thiserror 2.0.17",
+ "rustix 0.38.34",
+ "tempfile",
+ "thiserror 1.0.61",
 "tree_magic_mini",
 "wayland-backend",
 "wayland-client",
@@ -17,8 +17,7 @@ osx = platform.platform().startswith(
 hbb_name = 'rustdesk' + ('.exe' if windows else '')
 exe_path = 'target/release/' + hbb_name
 if windows:
-    win_arch = 'arm64' if platform.machine().lower() in ('arm64', 'aarch64') else 'x64'
-    flutter_build_dir = f'build/windows/{win_arch}/runner/Release/'
+    flutter_build_dir = 'build/windows/x64/runner/Release/'
 elif osx:
    flutter_build_dir = 'build/macos/Build/Products/Release/'
 else:
@@ -411,12 +410,7 @@ def build_flutter_dmg(version, features):
    system2(
        "cp target/release/liblibrustdesk.dylib target/release/librustdesk.dylib")
    os.chdir('flutter')
-    # cargo builds a single-arch dylib for the host; restrict Xcode to the same arch
-    # so the universal-by-default ARCHS_STANDARD doesn't try to link a missing slice.
-    # FLUTTER_XCODE_* env vars are forwarded to xcodebuild as build settings.
-    mac_arch = 'arm64' if platform.machine().lower() in ('arm64', 'aarch64') else 'x86_64'
-    system2(
-        f'FLUTTER_XCODE_ARCHS={mac_arch} FLUTTER_XCODE_ONLY_ACTIVE_ARCH=YES flutter build macos --release')
+    system2('flutter build macos --release')
    system2('cp -rf ../target/release/service ./build/macos/Build/Products/Release/RustDesk.app/Contents/MacOS/')
    '''
    system2(
@@ -512,7 +506,6 @@ def main():
                'target\\release\\rustdesk.exe')
        else:
            print('Not signed')
-        os.makedirs(res_dir, exist_ok=True)
        system2(
            f'cp -rf target/release/RustDesk.exe {res_dir}')
        os.chdir('libs/portable')
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
-  <g fill="#000000" fill-rule="evenodd">
-    <rect x="4" y="6" width="24" height="16" rx="3"/>
-    <rect x="14.5" y="22" width="3" height="2"/>
-    <rect x="9.5" y="24" width="13" height="2.5" rx="1.25"/>
-  </g>
-</svg>
@@ -72,24 +72,10 @@ Widget waylandKeyboardScopeChip(BuildContext context, String text) {
  );
 }

-bool _isWindowsMode1PrivacyImpl(String privacyModeImpl) {
-  return privacyModeImpl == kPrivacyModeImplMag ||
-      privacyModeImpl == kPrivacyModeImplExcludeFromCapture;
-}
-
-// macOS privacy mode blacks out all online displays. Windows Mode 1 also
-// covers every local monitor with privacy overlay windows, so remote display
-// switching does not weaken local privacy protection.
-//
-// Keep this separate from the capture backend capability. The legacy Windows
-// magnifier capturer is not reliable for multi-monitor capture; WebRTC's
-// screen_capturer_win_magnifier also disables it when SM_CMONITORS != 1:
-// https://webrtc.googlesource.com/src/+/1845922d5a1bf9c27deeffb4a8c8daea124434c1/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
-bool allowDisplaySwitchInPrivacyMode(PeerInfo pi, String privacyModeImpl) {
-  return pi.platform == kPeerPlatformMacOS ||
-      (pi.platform == kPeerPlatformWindows &&
-          _isWindowsMode1PrivacyImpl(privacyModeImpl) &&
-          versionCmp(pi.version, '1.4.8') >= 0);
+// macOS privacy mode blacks out all online displays, so switching the remote
+// display does not weaken the local privacy protection.
+bool allowDisplaySwitchInPrivacyMode(PeerInfo pi) {
+  return pi.platform == kPeerPlatformMacOS;
 }

 class TTextMenu {
@@ -978,8 +964,7 @@ Future<List<TToggleMenu>> toolbarDisplayToggle(

  final privacyModeState = PrivacyModeState.find(id);
  if (pi.isSupportMultiDisplay &&
-      (privacyModeState.isEmpty ||
-          allowDisplaySwitchInPrivacyMode(pi, privacyModeState.value)) &&
+      (privacyModeState.isEmpty || allowDisplaySwitchInPrivacyMode(pi)) &&
      pi.displaysCount.value > 1 &&
      bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') {
    final value =
@@ -1063,20 +1048,7 @@ List<TToggleMenu> toolbarPrivacyMode(
    return []; // No permission and not active, hide options.
  }

-  bool checkDisplayAllowedForPrivacyMode(String targetImplKey, bool turnOn) {
-    if (!turnOn ||
-        allowDisplaySwitchInPrivacyMode(pi, targetImplKey) ||
-        (ffiModel.pi.currentDisplay == 0 &&
-            !bind.sessionIsMultiUiSession(sessionId: sessionId))) {
-      return true;
-    }
-    msgBox(sessionId, 'custom-nook-nocancel-hasclose', 'info',
-        'Please switch to Display 1 first', '', ffi.dialogManager);
-    return false;
-  }
-
-  getDefaultMenu(Future<void> Function(SessionID sid, String opt) toggleFunc,
-      String targetImplKey) {
+  getDefaultMenu(Future<void> Function(SessionID sid, String opt) toggleFunc) {
    final enabled = !ffiModel.viewOnly &&
        (hasPrivacyModePermission || privacyModeState.isNotEmpty);
    return TToggleMenu(
@@ -1084,7 +1056,16 @@ List<TToggleMenu> toolbarPrivacyMode(
        onChanged: enabled
            ? (value) {
                if (value == null) return;
-                if (!checkDisplayAllowedForPrivacyMode(targetImplKey, value)) {
+                if (!allowDisplaySwitchInPrivacyMode(pi) &&
+                    ffiModel.pi.currentDisplay != 0 &&
+                    ffiModel.pi.currentDisplay != kAllDisplayValue) {
+                  msgBox(
+                      sessionId,
+                      'custom-nook-nocancel-hasclose',
+                      'info',
+                      'Please switch to Display 1 first',
+                      '',
+                      ffi.dialogManager);
                  return;
                }
                final option = 'privacy-mode';
@@ -1102,7 +1083,7 @@ List<TToggleMenu> toolbarPrivacyMode(
      getDefaultMenu((sid, opt) async {
        bind.sessionToggleOption(sessionId: sid, value: opt);
        togglePrivacyModeTime = DateTime.now();
-      }, kPrivacyModeImplMag)
+      })
    ];
  }
  if (privacyModeImpls.isEmpty) {
@@ -1116,7 +1097,7 @@ List<TToggleMenu> toolbarPrivacyMode(
        bind.sessionTogglePrivacyMode(
            sessionId: sid, implKey: implKey, on: privacyModeState.isEmpty);
        togglePrivacyModeTime = DateTime.now();
-      }, implKey)
+      })
    ];
  } else {
    final visibleImpls = hasPrivacyModePermission
@@ -1137,9 +1118,6 @@ List<TToggleMenu> toolbarPrivacyMode(
              ? (value) {
                  if (value == null) return;
                  if (value && !hasPrivacyModePermission) return;
-                  if (!checkDisplayAllowedForPrivacyMode(implKey, value)) {
-                    return;
-                  }
                  togglePrivacyModeTime = DateTime.now();
                  bind.sessionTogglePrivacyMode(
                      sessionId: sessionId, implKey: implKey, on: value);
@@ -29,10 +29,6 @@ const String kPlatformAdditionsHasFileClipboard = "has_file_clipboard";
 const String kPlatformAdditionsSupportedPrivacyModeImpl =
    "supported_privacy_mode_impl";

-const String kPrivacyModeImplMag = 'privacy_mode_impl_mag';
-const String kPrivacyModeImplExcludeFromCapture =
-    'privacy_mode_impl_exclude_from_capture';
-
 const String kPeerPlatformWindows = "Windows";
 const String kPeerPlatformLinux = "Linux";
 const String kPeerPlatformMacOS = "Mac OS";
@@ -174,8 +170,6 @@ const String kOptionShowVirtualMouse = "show-virtual-mouse";
 const String kOptionVirtualMouseScale = "virtual-mouse-scale";
 const String kOptionShowVirtualJoystick = "show-virtual-joystick";
 const String kOptionAllowAskForNoteAtEndOfConnection = "allow-ask-for-note";
-const String kOptionAllowMonitorSwitchMainToolbar = "allow-monitor-switch-main-toolbar";
-const String kOptionAllowMonitorSwitchMinToolbar = "allow-monitor-switch-min-toolbar";
 const String kOptionEnableShowTerminalExtraKeys = "enable-show-terminal-extra-keys";

 // network options
@@ -407,7 +407,6 @@ class _GeneralState extends State<_General> {
  final RxBool serviceStop =
      isWeb ? RxBool(false) : Get.find<RxBool>(tag: 'stop-service');
  RxBool serviceBtnEnabled = true.obs;
-  final GlobalKey _minToolbarOptionKey = GlobalKey();

  @override
  Widget build(BuildContext context) {
@@ -606,47 +605,6 @@ class _GeneralState extends State<_General> {
        },
      ));
    }
-    children.add(_OptionCheckBox(
-      context,
-      'Show monitor switch button on the main toolbar',
-      kOptionAllowMonitorSwitchMainToolbar,
-      isServer: false,
-      update: (enabled) async {
-        if (!enabled) {
-          await mainSetLocalBoolOption(
-              kOptionAllowMonitorSwitchMinToolbar, false);
-        }
-        if (mounted) setState(() {});
-        reloadAllWindows();
-        if (enabled) {
-          WidgetsBinding.instance.addPostFrameCallback((_) {
-            final ctx = _minToolbarOptionKey.currentContext;
-            if (ctx != null) {
-              Scrollable.ensureVisible(
-                ctx,
-                alignment: 0.5,
-                duration: const Duration(milliseconds: 250),
-                curve: Curves.easeInOut,
-              );
-            }
-          });
-        }
-      },
-    ));
-    if (mainGetLocalBoolOptionSync(kOptionAllowMonitorSwitchMainToolbar)) {
-      children.add(KeyedSubtree(
-        key: _minToolbarOptionKey,
-        child: _OptionCheckBox(
-          context,
-          'Show on the minimized toolbar',
-          kOptionAllowMonitorSwitchMinToolbar,
-          isServer: false,
-          update: (_) {
-            reloadAllWindows();
-          },
-        ).marginOnly(left: _kCheckBoxLeftMargin * 3),
-      ));
-    }
    return _Card(title: 'Other', children: children);
  }

@@ -779,7 +779,6 @@ class _RemoteToolbarState extends State<RemoteToolbar> {
          borderRadius: borderRadius,
          child: _DraggableShowHide(
            id: widget.id,
-            ffi: widget.ffi,
            sessionId: widget.ffi.sessionId,
            dragging: _dragging,
            fraction: _fraction,
@@ -806,25 +805,13 @@ class _RemoteToolbarState extends State<RemoteToolbar> {
      BuildContext context, _ToolbarEdge edge, bool isHorizontal) {
    final List<Widget> toolbarItems = [];
    toolbarItems.add(_PinMenu(state: widget.state));
-    toolbarItems.add(Obx(() {
-      final privacyModeState = PrivacyModeState.find(widget.id);
-      if ((privacyModeState.isEmpty ||
-              allowDisplaySwitchInPrivacyMode(pi, privacyModeState.value)) &&
-          pi.displaysCount.value > 1 &&
-          mainGetLocalBoolOptionSync(kOptionAllowMonitorSwitchMainToolbar)) {
-        return _MainMonitorSwitchButton(id: widget.id, ffi: widget.ffi);
-      } else {
-        return const Offstage();
-      }
-    }));
    if (!isWebDesktop) {
      toolbarItems.add(_MobileActionMenu(ffi: widget.ffi));
    }

    toolbarItems.add(Obx(() {
-      final privacyModeState = PrivacyModeState.find(widget.id);
-      if ((privacyModeState.isEmpty ||
-              allowDisplaySwitchInPrivacyMode(pi, privacyModeState.value)) &&
+      if ((PrivacyModeState.find(widget.id).isEmpty ||
+              allowDisplaySwitchInPrivacyMode(pi)) &&
          pi.displaysCount.value > 1) {
        return _MonitorMenu(
            id: widget.id,
@@ -977,88 +964,6 @@ class _MobileActionMenu extends StatelessWidget {
  }
 }

-class _MonitorCycle {
-  final String id;
-  final FFI ffi;
-  const _MonitorCycle(this.id, this.ffi);
-
-  PeerInfo get _pi => ffi.ffiModel.pi;
-  int get total => _pi.displays.length;
-  int get _current => CurrentDisplayState.find(id).value;
-  bool get _inRange => _current >= 0 && _current < total;
-
-  String get label => _inRange ? '${_current + 1}' : '*';
-  String get tooltip => '${translate('Switch display')} ($label/$total)';
-
-  void next() {
-    final t = total;
-    if (t < 2) return;
-    final from = _inRange ? _current : -1;
-    final target = (from + 1) % t;
-    final isChooseDisplayToOpenInNewWindow = _pi.isSupportMultiDisplay &&
-        bind.sessionGetDisplaysAsIndividualWindows(sessionId: ffi.sessionId) ==
-            'Y';
-    if (isChooseDisplayToOpenInNewWindow) {
-      openMonitorInNewTabOrWindow(target, ffi.id, _pi);
-    } else {
-      openMonitorInTheSameTab(target, ffi, _pi, updateCursorPos: false);
-    }
-  }
-}
-
-class _MainMonitorSwitchButton extends StatelessWidget {
-  final String id;
-  final FFI ffi;
-
-  const _MainMonitorSwitchButton({
-    Key? key,
-    required this.id,
-    required this.ffi,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    final cycle = _MonitorCycle(id, ffi);
-    return Obx(() {
-      if (cycle.total < 2) return const Offstage();
-      final label = cycle.label;
-
-      return _IconMenuButton(
-        tooltip: cycle.tooltip,
-        color: _ToolbarTheme.blueColor,
-        hoverColor: _ToolbarTheme.hoverBlueColor,
-        onPressed: cycle.next,
-        icon: SizedBox(
-          width: _ToolbarTheme.buttonSize,
-          height: _ToolbarTheme.buttonSize,
-          child: Stack(
-            alignment: const Alignment(0, -0.125),
-            children: [
-              SvgPicture.asset(
-                'assets/display_switcher.svg',
-                colorFilter:
-                    const ColorFilter.mode(Colors.white, BlendMode.srcIn),
-                width: _ToolbarTheme.buttonSize,
-                height: _ToolbarTheme.buttonSize,
-              ),
-              Text(
-                label,
-                textAlign: TextAlign.center,
-                style: const TextStyle(
-                  color: Colors.black,
-                  fontSize: 11,
-                  height: 1,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-    });
-  }
-}
-
 class _MonitorMenu extends StatelessWidget {
  final String id;
  final FFI ffi;
@@ -1167,8 +1072,8 @@ class _MonitorMenu extends StatelessWidget {
            tooltip: isMulti
                ? ''
                : isAllMonitors
-                    ? 'All monitors'
-                    : '#{${i + 1}} monitor',
+                    ? 'all monitors'
+                    : '#${i + 1} monitor',
            hMargin: isMulti ? null : 6,
            vMargin: isMulti ? null : 12,
            topLevel: false,
@@ -2852,7 +2757,7 @@ class _IconMenuButtonState extends State<_IconMenuButton> {
        horizontal: widget.hMargin ?? _ToolbarTheme.buttonHMargin,
        vertical: widget.vMargin ?? _ToolbarTheme.buttonVMargin);
    button = Tooltip(
-      message: translate(widget.tooltip),
+      message: widget.tooltip,
      child: button,
    );
    if (widget.topLevel) {
@@ -3065,7 +2970,6 @@ class RdoMenuButton<T> extends StatelessWidget {

 class _DraggableShowHide extends StatefulWidget {
  final String id;
-  final FFI ffi;
  final SessionID sessionId;
  final RxDouble fraction;
  final Rx<_ToolbarEdge> edge;
@@ -3089,7 +2993,6 @@ class _DraggableShowHide extends StatefulWidget {
  const _DraggableShowHide({
    Key? key,
    required this.id,
-    required this.ffi,
    required this.sessionId,
    required this.fraction,
    required this.edge,
@@ -3346,9 +3249,6 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
      mainAxisSize: MainAxisSize.min,
      children: [
        _buildDraggable(context),
-        Obx(() => collapse.isTrue
-            ? _MinimizedMonitorSwitchButton(id: widget.id, ffi: widget.ffi)
-            : const Offstage()),
        Obx(() => buttonWrapper(
              () {
                widget.setFullscreen(!isFullscreen.value);
@@ -3509,73 +3409,3 @@ class EdgeThicknessControl extends StatelessWidget {
    return slider;
  }
 }
-
-class _MinimizedMonitorSwitchButton extends StatelessWidget {
-  final String id;
-  final FFI ffi;
-
-  const _MinimizedMonitorSwitchButton({
-    Key? key,
-    required this.id,
-    required this.ffi,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    const double iconSize = 20;
-    final cycle = _MonitorCycle(id, ffi);
-
-    return Obx(() {
-      final label = cycle.label;
-      if (!mainGetLocalBoolOptionSync(kOptionAllowMonitorSwitchMainToolbar) ||
-          !mainGetLocalBoolOptionSync(kOptionAllowMonitorSwitchMinToolbar)) {
-        return const Offstage();
-      }
-      if (cycle.total < 2) return const Offstage();
-      final privacyModeState = PrivacyModeState.find(id);
-      if (privacyModeState.isNotEmpty &&
-          !allowDisplaySwitchInPrivacyMode(
-              ffi.ffiModel.pi, privacyModeState.value)) {
-        return const Offstage();
-      }
-
-      return Tooltip(
-        message: cycle.tooltip,
-        child: TextButton(
-          onPressed: cycle.next,
-          style: ButtonStyle(
-            minimumSize: MaterialStateProperty.all(const Size(0, 0)),
-            padding: MaterialStateProperty.all(EdgeInsets.zero),
-            backgroundColor: MaterialStateProperty.resolveWith((states) {
-              if (states.contains(MaterialState.hovered)) {
-                return _ToolbarTheme.blueColor.withOpacity(0.15);
-              }
-              return null;
-            }),
-          ),
-          child: Stack(
-            alignment: const Alignment(0, -0.125),
-            children: [
-              SvgPicture.asset(
-                'assets/display_switcher.svg',
-                colorFilter:
-                    ColorFilter.mode(_ToolbarTheme.blueColor, BlendMode.srcIn),
-                width: iconSize,
-                height: iconSize,
-              ),
-              Text(
-                label,
-                style: const TextStyle(
-                  color: Colors.white,
-                  fontSize: 9,
-                  height: 1,
-                  fontWeight: FontWeight.bold,
-                ),
-              ),
-            ],
-          ),
-        ),
-      );
-    });
-  }
-}
@@ -1220,11 +1220,7 @@ void showOptions(
  if (image != null) {
    displays.add(Padding(padding: const EdgeInsets.only(top: 8), child: image));
  }
-  final privacyModeState = PrivacyModeState.find(id);
-  if (pi.displays.length > 1 &&
-      pi.currentDisplay != kAllDisplayValue &&
-      (privacyModeState.isEmpty ||
-          allowDisplaySwitchInPrivacyMode(pi, privacyModeState.value))) {
+  if (pi.displays.length > 1 && pi.currentDisplay != kAllDisplayValue) {
    final cur = pi.currentDisplay;
    final children = <Widget>[];
    final isDarkTheme = MyTheme.currentThemeMode() == ThemeMode.dark;
@@ -1278,6 +1274,8 @@ void showOptions(
      await toolbarDisplayToggle(context, id, gFFI);

  List<TToggleMenu> privacyModeList = [];
+  // privacy mode
+  final privacyModeState = PrivacyModeState.find(id);
  if ((gFFI.ffiModel.pi.features.privacyMode && gFFI.ffiModel.keyboard) ||
      privacyModeState.isNotEmpty) {
    privacyModeList = toolbarPrivacyMode(privacyModeState, context, id, gFFI);
@@ -1307,8 +1307,7 @@ class InputModel {
    }
    if (isPhysicalMouse.value) {
      if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) {
-        final canvasPosition = _pointerPositionForRemoteCanvas(e);
-        handleMouse(_getMouseEvent(e, _kMouseEventMove), canvasPosition,
+        handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position,
            edgeScroll: useEdgeScroll);
      }
    }
@@ -1549,8 +1548,7 @@ class InputModel {
        _relativeMouse
            .sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventDown));
      } else {
-        final canvasPosition = _pointerPositionForRemoteCanvas(e);
-        handleMouse(_getMouseEvent(e, _kMouseEventDown), canvasPosition);
+        handleMouse(_getMouseEvent(e, _kMouseEventDown), e.position);
      }
    }
  }
@@ -1572,8 +1570,7 @@ class InputModel {
        _relativeMouse
            .sendRelativeMouseButton(_getMouseEvent(e, _kMouseEventUp));
      } else {
-        final canvasPosition = _pointerPositionForRemoteCanvas(e);
-        handleMouse(_getMouseEvent(e, _kMouseEventUp), canvasPosition);
+        handleMouse(_getMouseEvent(e, _kMouseEventUp), e.position);
      }
    }
  }
@@ -1595,40 +1592,12 @@ class InputModel {
    }
    if (isPhysicalMouse.value) {
      if (!_relativeMouse.handleRelativeMouseMove(e.localPosition)) {
-        final canvasPosition = _pointerPositionForRemoteCanvas(e);
-        handleMouse(_getMouseEvent(e, _kMouseEventMove), canvasPosition,
+        handleMouse(_getMouseEvent(e, _kMouseEventMove), e.position,
            edgeScroll: useEdgeScroll);
      }
    }
  }

-  /// Convert pointer coordinates into the visible remote canvas space.
-  ///
-  /// On mobile, the remote page body is wrapped in `SafeArea`, but the pointer
-  /// listener that feeds these events sits outside that subtree. As a result,
-  /// `event.localPosition` still includes the top/left safe-area inset.
-  ///
-  /// When the keyboard-visible path shows `KeyHelpTools`, the remote canvas is
-  /// also shifted downward by `CanvasModel.getAdjustY()`. The downstream mouse
-  /// mapping logic expects coordinates relative to the visible canvas area, so
-  /// we subtract both the mobile safe-area padding and the current canvas
-  /// adjustment before passing the position into mouse mapping.
-  ///
-  /// Desktop and web desktop continue to use the global position directly
-  /// because their pointer mapping is window-based.
-  Offset _pointerPositionForRemoteCanvas(PointerEvent event) {
-    if (isDesktop || isWebDesktop) {
-      return event.position;
-    }
-    final mediaData = MediaQueryData.fromView(
-        WidgetsBinding.instance.platformDispatcher.views.first);
-    final adjustY = parent.target?.canvasModel.getAdjustY() ?? 0.0;
-    return Offset(
-      event.localPosition.dx - mediaData.padding.left,
-      event.localPosition.dy - mediaData.padding.top - adjustY,
-    );
-  }
-
  static Future<Rect?> fillRemoteCoordsAndGetCurFrame(
      List<RemoteWindowCoords> remoteWindowCoords) async {
    final coords =
@@ -7,7 +7,8 @@ use fuser::MountOption;
 use hbb_common::{config::APP_NAME, log};
 use parking_lot::Mutex;
 use std::{
-    path::PathBuf,
+    io,
+    path::{Path, PathBuf},
    sync::{mpsc::Sender, Arc},
    time::Duration,
 };
@@ -53,8 +54,16 @@ pub fn init_fuse_context(is_client: bool) -> Result<(), CliprdrError> {
    } else {
        FUSE_CONTEXT_SERVER.lock()
    };
-    if fuse_context_lock.is_some() {
-        return Ok(());
+    if let Some(ctx) = fuse_context_lock.as_ref() {
+        if is_mount_point_healthy(&ctx.mount_point) {
+            return Ok(());
+        }
+        log::warn!(
+            "clipboard FUSE mount {} is disconnected, remounting",
+            ctx.mount_point.display()
+        );
+        let stale_context = fuse_context_lock.take();
+        drop(stale_context);
    }
    let mount_point = if is_client {
        FUSE_MOUNT_POINT_CLIENT.clone()
@@ -159,35 +168,100 @@ struct FuseContext {
 }

 // this function must be called after the main IPC is up
-fn prepare_fuse_mount_point(mount_point: &PathBuf) {
+fn prepare_fuse_mount_point(mount_point: &Path) {
    use std::{
        fs::{self, Permissions},
        os::unix::prelude::PermissionsExt,
    };

-    fs::create_dir(mount_point).ok();
-    fs::set_permissions(mount_point, Permissions::from_mode(0o777)).ok();
+    if let Some(parent) = mount_point.parent() {
+        if let Err(e) = fs::create_dir_all(parent) {
+            log::warn!("failed to create FUSE mount parent {:?}: {:?}", parent, e);
+        }
+    }

-    if let Err(e) = std::process::Command::new("umount")
-        .arg(mount_point)
-        .status()
-    {
-        log::warn!("umount {:?} may fail: {:?}", mount_point, e);
+    unmount_fuse_mount_point(mount_point);
+
+    if let Err(e) = fs::create_dir_all(mount_point) {
+        log::warn!(
+            "failed to create FUSE mount point {:?}: {:?}",
+            mount_point,
+            e
+        );
+    }
+    if let Err(e) = fs::set_permissions(mount_point, Permissions::from_mode(0o777)) {
+        log::warn!(
+            "failed to set FUSE mount point permissions {:?}: {:?}",
+            mount_point,
+            e
+        );
    }
 }

-fn uninit_fuse_context_(is_client: bool) {
-    if is_client {
-        let _ = FUSE_CONTEXT_CLIENT.lock().take();
-    } else {
-        let _ = FUSE_CONTEXT_SERVER.lock().take();
+fn is_mount_point_healthy(mount_point: &Path) -> bool {
+    is_mount_point_healthy_result(std::fs::metadata(mount_point))
+}
+
+fn is_mount_point_healthy_result<T>(result: io::Result<T>) -> bool {
+    match result {
+        Ok(_) => true,
+        Err(e) => {
+            e.raw_os_error() != Some(libc::ENOTCONN) && e.kind() != io::ErrorKind::NotFound
+        }
    }
 }

+fn unmount_fuse_mount_point(mount_point: &Path) {
+    if run_unmount_command("umount", &["-l"], mount_point) {
+        return;
+    }
+    if run_unmount_command("fusermount3", &["-uz"], mount_point) {
+        return;
+    }
+    run_unmount_command("fusermount", &["-uz"], mount_point);
+}
+
+fn run_unmount_command(program: &str, args: &[&str], mount_point: &Path) -> bool {
+    match std::process::Command::new(program)
+        .args(args)
+        .arg(mount_point)
+        .status()
+    {
+        Ok(status) if status.success() => {}
+        Ok(status) => {
+            log::debug!(
+                "{} {:?} exited with status {:?}",
+                program,
+                mount_point,
+                status.code()
+            );
+            return false;
+        }
+        Err(e) => {
+            log::debug!("failed to run {} for {:?}: {:?}", program, mount_point, e);
+            return false;
+        }
+    }
+    true
+}
+
+fn uninit_fuse_context_(is_client: bool) {
+    let mut fuse_context_lock = if is_client {
+        FUSE_CONTEXT_CLIENT.lock()
+    } else {
+        FUSE_CONTEXT_SERVER.lock()
+    };
+    let ctx = fuse_context_lock.take();
+    drop(ctx);
+}
+
 impl Drop for FuseContext {
    fn drop(&mut self) {
-        self.session.lock().take().map(|s| s.join());
        log::info!("unmounting clipboard FUSE from {}", self.mount_point.display());
+        unmount_fuse_mount_point(&self.mount_point);
+        if let Some(session) = self.session.lock().take() {
+            session.join();
+        }
    }
 }

@@ -223,3 +297,30 @@ impl FuseContext {
            .collect())
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::{fs, io};
+
+    #[test]
+    fn reports_disconnected_fuse_mount_as_unhealthy() {
+        let err = io::Error::from_raw_os_error(libc::ENOTCONN);
+
+        assert!(!is_mount_point_healthy_result::<()>(Err(err)));
+    }
+
+    #[test]
+    fn reports_existing_directory_mount_point_as_healthy() {
+        let mount_point = std::env::temp_dir().join(format!(
+            "rustdesk-fuse-mount-health-test-{}",
+            std::process::id()
+        ));
+        let _ = fs::remove_dir_all(&mount_point);
+        fs::create_dir(&mount_point).unwrap();
+
+        assert!(is_mount_point_healthy(&mount_point));
+
+        let _ = fs::remove_dir_all(&mount_point);
+    }
+}
@@ -113,11 +113,11 @@ pub enum MouseButton {

    /// Scroll up button
    ScrollUp,
-    /// Scroll down button
+    /// Left right button
    ScrollDown,
-    /// Scroll left button
+    /// Left right button
    ScrollLeft,
-    /// Scroll right button
+    /// Left right button
    ScrollRight,
 }

@@ -223,7 +223,7 @@ impl KeyboardControllable for Enigo {
            // Windows uses uft-16 encoding. We need to check
            // for variable length characters. As such some
            // characters can be 32 bit long and those are
-            // encoded in so-called high and low surrogates
+            // encoded in such called hight and low surrogates
            // each 16 bit wide that needs to be send after
            // another to the SendInput function without
            // being interrupted by "keyup"
@@ -47,7 +47,7 @@ fn link_vcpkg(mut path: PathBuf, name: &str) -> PathBuf {
            format!("{}-{}", target_arch, target_os)
        }
    } else if target_os == "windows" {
-        format!("{}-windows-static", target_arch)
+        "x64-windows-static".to_owned()
    } else {
        format!("{}-{}", target_arch, target_os)
    };
@@ -52,33 +52,6 @@ lazy_static::lazy_static! {
    static ref MAG_BUFFER: Mutex<(bool, Vec<u8>)> =  Default::default();
 }

-fn find_windows(cls: &str, name: &str) -> Result<Vec<HWND>> {
-    let name_c = CString::new(name)?;
-    let cls_c = if cls.is_empty() {
-        None
-    } else {
-        Some(CString::new(cls)?)
-    };
-    let mut hwnds = Vec::new();
-    unsafe {
-        let mut after = NULL as _;
-        loop {
-            let hwnd = FindWindowExA(
-                NULL as _,
-                after,
-                cls_c.as_ref().map_or(NULL as _, |c| c.as_ptr()),
-                name_c.as_ptr(),
-            );
-            if hwnd.is_null() {
-                break;
-            }
-            hwnds.push(hwnd);
-            after = hwnd;
-        }
-    }
-    Ok(hwnds)
-}
-
 pub type REFWICPixelFormatGUID = *const GUID;
 pub type WICPixelFormatGUID = GUID;

@@ -274,8 +247,6 @@ pub struct CapturerMag {
    rect: RECT,
    width: usize,
    height: usize,
-    excluded_window_target: Option<(String, String)>,
-    excluded_windows: Vec<HWND>,
 }

 impl Drop for CapturerMag {
@@ -290,10 +261,6 @@ impl CapturerMag {
        MagInterface::new().is_ok()
    }

-    // This captures through the legacy Windows Magnification API. Do not infer
-    // multi-monitor capture support from privacy overlay coverage: WebRTC also
-    // disables its magnifier capturer when SM_CMONITORS != 1.
-    // https://webrtc.googlesource.com/src/+/1845922d5a1bf9c27deeffb4a8c8daea124434c1/modules/desktop_capture/win/screen_capturer_win_magnifier.cc
    pub(crate) fn new(origin: (i32, i32), width: usize, height: usize) -> Result<Self> {
        unsafe {
            let x = GetSystemMetrics(SM_XVIRTUALSCREEN);
@@ -338,8 +305,6 @@ impl CapturerMag {
            },
            width,
            height,
-            excluded_window_target: None,
-            excluded_windows: Vec::new(),
        };

        unsafe {
@@ -471,41 +436,19 @@ impl CapturerMag {
    }

    pub(crate) fn exclude(&mut self, cls: &str, name: &str) -> Result<bool> {
-        let mut hwnds = find_windows(cls, name)?;
-        hwnds.sort_unstable_by_key(|hwnd| *hwnd as usize);
-        self.excluded_window_target = Some((cls.to_owned(), name.to_owned()));
-        if hwnds.is_empty() {
-            self.excluded_windows.clear();
-            return Ok(false);
-        }
-
-        self.exclude_windows(&mut hwnds)?;
-        self.excluded_windows = hwnds;
-        Ok(true)
-    }
-
-    fn refresh_excluded_windows(&mut self) -> Result<()> {
-        let Some((cls, name)) = self.excluded_window_target.as_ref() else {
-            return Ok(());
-        };
-        let mut hwnds = find_windows(cls, name)?;
-        hwnds.sort_unstable_by_key(|hwnd| *hwnd as usize);
-        // This runs from frame() because refreshed privacy overlays get new
-        // HWNDs. It is only used on the legacy magnifier backend while privacy
-        // mode is active; if it shows up as hot-path cost, throttle this check.
-        // Keep the previous filter list while privacy windows are being recreated.
-        if hwnds.is_empty() || hwnds == self.excluded_windows {
-            return Ok(());
-        }
-
-        self.exclude_windows(&mut hwnds)?;
-        self.excluded_windows = hwnds;
-        Ok(())
-    }
-
-    fn exclude_windows(&mut self, hwnds: &mut [HWND]) -> Result<bool> {
-        let count = hwnds.len() as _;
+        let name_c = CString::new(name)?;
        unsafe {
+            let mut hwnd = if cls.len() == 0 {
+                FindWindowExA(NULL as _, NULL as _, NULL as _, name_c.as_ptr())
+            } else {
+                let cls_c = CString::new(cls).unwrap();
+                FindWindowExA(NULL as _, NULL as _, cls_c.as_ptr(), name_c.as_ptr())
+            };
+
+            if hwnd.is_null() {
+                return Ok(false);
+            }
+
            if let Some(set_window_filter_list_func) =
                self.mag_interface.set_window_filter_list_func
            {
@@ -513,15 +456,16 @@ impl CapturerMag {
                    == set_window_filter_list_func(
                        self.magnifier_window,
                        MW_FILTERMODE_EXCLUDE,
-                        count,
-                        hwnds.as_mut_ptr(),
+                        1,
+                        &mut hwnd,
                    )
                {
                    return Err(Error::new(
                        ErrorKind::Other,
                        format!(
-                            "Failed MagSetWindowFilterList for {} windows, error {}",
-                            count,
+                            "Failed MagSetWindowFilterList for cls {} name {}, error {}",
+                            cls,
+                            name,
                            Error::last_os_error()
                        ),
                    ));
@@ -552,7 +496,6 @@ impl CapturerMag {
    }

    pub(crate) fn frame(&mut self, data: &mut Vec<u8>) -> Result<()> {
-        self.refresh_excluded_windows()?;
        Self::clear_data();

        unsafe {
@@ -7,10 +7,6 @@
      <Configuration>Release</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <Keyword>Win32Proj</Keyword>
@@ -26,12 +22,6 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
  </ImportGroup>
@@ -40,9 +30,6 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@@ -66,28 +53,6 @@
      <ModuleDefinitionFile>CustomActions.def</ModuleDefinitionFile>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;EXAMPLECADLL_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>msi.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableUAC>false</EnableUAC>
-      <ModuleDefinitionFile>CustomActions.def</ModuleDefinitionFile>
-    </Link>
-  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="Common.h" />
    <ClInclude Include="framework.h" />
@@ -100,7 +65,6 @@
    <ClCompile Include="FirewallRules.cpp" />
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="ReadConfig.cpp" />
    <ClCompile Include="RemotePrinter.cpp" />
@@ -3,7 +3,7 @@
    <IncludeSearchPaths>
    </IncludeSearchPaths>
    <Configurations>Release</Configurations>
-    <Platforms>x64;ARM64</Platforms>
+    <Platforms>x64</Platforms>
  </PropertyGroup>
  <ItemGroup>
    <Content Include="Includes.wxi" />
@@ -10,17 +10,12 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Release|x64 = Release|x64
-		Release|ARM64 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F403A403-CEFF-4399-B51C-CC646C8E98CF}.Release|x64.ActiveCfg = Release|x64
 		{F403A403-CEFF-4399-B51C-CC646C8E98CF}.Release|x64.Build.0 = Release|x64
-		{F403A403-CEFF-4399-B51C-CC646C8E98CF}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F403A403-CEFF-4399-B51C-CC646C8E98CF}.Release|ARM64.Build.0 = Release|ARM64
 		{6B3647E0-B4A3-46AE-8757-A22EE51C1DAC}.Release|x64.ActiveCfg = Release|x64
 		{6B3647E0-B4A3-46AE-8757-A22EE51C1DAC}.Release|x64.Build.0 = Release|x64
-		{6B3647E0-B4A3-46AE-8757-A22EE51C1DAC}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6B3647E0-B4A3-46AE-8757-A22EE51C1DAC}.Release|ARM64.Build.0 = Release|ARM64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -45,7 +45,7 @@ pre_start()
  return 0
 }

-# When logging out from the interactive shell, the execution sequence is:
+# When loging out from the interactive shell, the execution sequence is:
 #
 # IF ~/.bash_logout exists THEN
 #     execute ~/.bash_logout
@@ -130,18 +130,14 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
 --cc=cl \
 --enable-gpl \
 --enable-d3d11va \
--enable-hwaccel=h264_d3d11va \
--enable-hwaccel=hevc_d3d11va \
--enable-hwaccel=h264_d3d11va2 \
--enable-hwaccel=hevc_d3d11va2 \
-")
-
-    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
-        string(APPEND OPTIONS "\
 --enable-cuda \
 --enable-ffnvcodec \
 --enable-hwaccel=h264_nvdec \
 --enable-hwaccel=hevc_nvdec \
+--enable-hwaccel=h264_d3d11va \
+--enable-hwaccel=hevc_d3d11va \
+--enable-hwaccel=h264_d3d11va2 \
+--enable-hwaccel=hevc_d3d11va2 \
 --enable-amf \
 --enable-encoder=h264_amf \
 --enable-encoder=hevc_amf \
@@ -151,7 +147,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
 --enable-encoder=h264_qsv \
 --enable-encoder=hevc_qsv \
 ")
-    endif()

    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
        set(LIB_MACHINE_ARG /machine:x86)
@@ -159,9 +154,6 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
        set(LIB_MACHINE_ARG /machine:x64)
        string(APPEND OPTIONS " --arch=x86_64")
-    elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")
-        set(LIB_MACHINE_ARG /machine:arm64)
-        string(APPEND OPTIONS " --arch=aarch64 --enable-cross-compile")
    else()
        message(FATAL_ERROR "Unsupported target architecture")
    endif()
@@ -868,7 +868,6 @@ pub mod clipboard_listener {
            .unwrap()
            .insert(name.clone(), tx);

-        cleanup_stale_listener(&mut listener_lock);
        if listener_lock.handle.is_none() {
            log::info!("Start clipboard listener thread");
            let handler = Handler {
@@ -894,24 +893,6 @@ pub mod clipboard_listener {
        Ok(())
    }

-    fn cleanup_stale_listener(listener: &mut ClipboardListener) {
-        if !listener
-            .handle
-            .as_ref()
-            .map(|(_, h)| h.is_finished())
-            .unwrap_or(false)
-        {
-            return;
-        }
-        if let Some((shutdown, h)) = listener.handle.take() {
-            log::warn!("Cleaning up stale clipboard listener handle");
-            if let Err(e) = h.join() {
-                log::error!("Clipboard listener thread panicked during stale cleanup: {:?}", e);
-            }
-            drop(shutdown);
-        }
-    }
-
    pub fn unsubscribe(name: &str) {
        log::info!("Unsubscribe clipboard listener: {}", name);
        let mut listener_lock = CLIPBOARD_LISTENER.lock().unwrap();
@@ -1245,49 +1245,11 @@ pub fn legacy_keyboard_mode(event: &Event, mut key_event: KeyEvent) -> Vec<KeyEv

 #[inline]
 pub fn map_keyboard_mode(_peer: &str, event: &Event, key_event: KeyEvent) -> Vec<KeyEvent> {
-    if let Some(evt) = windows_peer_special_key(_peer, event) {
-        return vec![evt];
-    }
-
    _map_keyboard_mode(_peer, event, key_event)
        .map(|e| vec![e])
        .unwrap_or_default()
 }

-fn windows_peer_special_key(peer: &str, event: &Event) -> Option<KeyEvent> {
-    if peer != OS_LOWER_WINDOWS {
-        return None;
-    }
-
-    let (key, down) = match event.event_type {
-        EventType::KeyPress(key) => (key, true),
-        EventType::KeyRelease(key) => (key, false),
-        _ => return None,
-    };
-
-    // Handle only `Pause` for Windows peers for now.
-    // Windows has no normal scan code for `Pause`, so send it as a legacy control key.
-    #[cfg(target_os = "windows")]
-    let is_pause = {
-        // The Windows scan code can look like `NumLock`; VK_PAUSE distinguishes it.
-        let pause_vk_code = rdev::win_code_from_key(Key::Pause);
-        key == Key::Pause || pause_vk_code == Some(event.platform_code as _)
-    };
-    #[cfg(not(target_os = "windows"))]
-    let is_pause = key == Key::Pause;
-    if !is_pause {
-        return None;
-    }
-
-    let mut key_event = KeyEvent::new();
-    key_event.mode = KeyboardMode::Legacy.into();
-    key_event.down = down;
-    key_event.set_control_key(ControlKey::Pause);
-    let (alt, ctrl, shift, command) = client::get_modifiers_state(false, false, false, false);
-    client::legacy_modifiers(&mut key_event, alt, ctrl, shift, command);
-    Some(key_event)
-}
-
 fn _map_keyboard_mode(_peer: &str, event: &Event, mut key_event: KeyEvent) -> Option<KeyEvent> {
    match event.event_type {
        EventType::KeyPress(..) => {
@@ -1459,11 +1421,6 @@ fn is_press(event: &Event) -> bool {
 pub fn translate_keyboard_mode(peer: &str, event: &Event, key_event: KeyEvent) -> Vec<KeyEvent> {
    let mut events: Vec<KeyEvent> = Vec::new();

-    if let Some(evt) = windows_peer_special_key(peer, event) {
-        events.push(evt);
-        return events;
-    }
-
    if let Some(unicode_info) = &event.unicode {
        if unicode_info.is_dead {
            #[cfg(target_os = "macos")]
@@ -103,29 +103,15 @@ pub const LANGS: &[(&str, &str)] = &[
    ("gu", "ગુજરાતી"),
 ];

-pub(crate) fn cjk_ui_unavailable() -> bool {
-    cfg!(all(
-        target_os = "linux",
-        target_arch = "aarch64",
-        feature = "flutter"
-    ))
+#[cfg(not(any(target_os = "android", target_os = "ios")))]
+pub fn translate(name: String) -> String {
+    let locale = sys_locale::get_locale().unwrap_or_default();
+    translate_locale(name, &locale)
 }

-pub(crate) fn is_cjk_lang(lang_or_locale: &str) -> bool {
-    let lang = lang_or_locale
-        .split(|c| c == '-' || c == '_')
-        .next()
-        .unwrap_or_default()
-        .to_lowercase();
-    matches!(lang.as_str(), "zh" | "ja" | "ko")
-}
-
-fn resolve_lang(saved_lang: &str, locale: &str, cjk_fallback: bool) -> String {
+pub fn translate_locale(name: String, locale: &str) -> String {
    let locale = locale.to_lowercase();
-    let mut lang = saved_lang.to_lowercase();
-    if cjk_fallback && is_cjk_lang(&lang) {
-        return "en".to_owned();
-    }
+    let mut lang = hbb_common::config::LocalConfig::get_option("lang").to_lowercase();
    if lang.is_empty() {
        // zh_CN on Linux, zh-Hans-CN on mac, zh_CN_#Hans on Android
        if locale.starts_with("zh") {
@@ -145,25 +131,7 @@ fn resolve_lang(saved_lang: &str, locale: &str, cjk_fallback: bool) -> String {
            .unwrap_or_default()
            .to_owned();
    }
-    if cjk_fallback && is_cjk_lang(&lang) {
-        "en".to_owned()
-    } else {
-        lang
-    }
-}
-
-#[cfg(not(any(target_os = "android", target_os = "ios")))]
-pub fn translate(name: String) -> String {
-    let locale = sys_locale::get_locale().unwrap_or_default();
-    translate_locale(name, &locale)
-}
-
-pub fn translate_locale(name: String, locale: &str) -> String {
-    let lang = resolve_lang(
-        &hbb_common::config::LocalConfig::get_option("lang"),
-        locale,
-        cjk_ui_unavailable(),
-    );
+    let lang = lang.to_lowercase();
    let m = match lang.as_str() {
        "fr" => fr::T.deref(),
        "zh-cn" => cn::T.deref(),
@@ -307,32 +275,4 @@ mod test {
            ("{} times {4} makes {8}".to_string(), Some("2".to_string()))
        );
    }
-
-    #[test]
-    fn test_resolve_lang_forces_english_for_saved_cjk_when_target_disables_cjk() {
-        use super::resolve_lang as f;
-
-        assert_eq!(f("zh-cn", "en-US", true), "en");
-        assert_eq!(f("zh-tw", "en-US", true), "en");
-        assert_eq!(f("ja", "en-US", true), "en");
-        assert_eq!(f("ko", "en-US", true), "en");
-    }
-
-    #[test]
-    fn test_resolve_lang_forces_english_for_cjk_locale_when_target_disables_cjk() {
-        use super::resolve_lang as f;
-
-        assert_eq!(f("", "zh_CN", true), "en");
-        assert_eq!(f("", "ja-JP", true), "en");
-        assert_eq!(f("", "ko_KR", true), "en");
-    }
-
-    #[test]
-    fn test_resolve_lang_preserves_cjk_when_target_allows_cjk() {
-        use super::resolve_lang as f;
-
-        assert_eq!(f("zh-cn", "en-US", false), "zh-cn");
-        assert_eq!(f("", "zh_TW", false), "zh-tw");
-        assert_eq!(f("", "ja-JP", false), "ja");
-    }
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "إعادة تعيين اختيار إدخال لوحة المفاتيح"),
        ("remember-wayland-keyboard-choice-tip", "لا تسأل مرة أخرى لهذا الكمبيوتر البعيد"),
        ("Why this happens", "سبب حدوث ذلك"),
-        ("Switch display", "تبديل الشاشة"),
-        ("Show monitor switch button on the main toolbar", "إظهار زر تبديل الشاشة على شريط الأدوات الرئيسي"),
-        ("Show on the minimized toolbar", "الإظهار على شريط الأدوات المُصغّر"),
-        ("All monitors", "جميع الشاشات"),
-        ("#{} monitor", "الشاشة رقم {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Скінуць выбар уводу з клавіятуры"),
        ("remember-wayland-keyboard-choice-tip", "Не пытацца зноў для гэтага аддаленага кампутара"),
        ("Why this happens", "Чаму гэта адбываецца"),
-        ("Switch display", "Пераключыць дысплэй"),
-        ("Show monitor switch button on the main toolbar", "Паказваць кнопку пераключэння манітора на галоўнай панэлі інструментаў"),
-        ("Show on the minimized toolbar", "Паказваць на згорнутай панэлі інструментаў"),
-        ("All monitors", "Усе манітори"),
-        ("#{} monitor", "Манітор {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Нулиране на избора за въвеждане от клавиатура"),
        ("remember-wayland-keyboard-choice-tip", "Не питай отново за този отдалечен компютър"),
        ("Why this happens", "Защо се случва това"),
-        ("Switch display", "Превключване на дисплея"),
-        ("Show monitor switch button on the main toolbar", "Показване на бутона за превключване на монитора в главната лента с инструменти"),
-        ("Show on the minimized toolbar", "Показване в минимизираната лента с инструменти"),
-        ("All monitors", "Всички монитори"),
-        ("#{} monitor", "Монитор {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Restableix l'opció d'entrada de teclat"),
        ("remember-wayland-keyboard-choice-tip", "No tornis a preguntar-ho per a aquest equip remot"),
        ("Why this happens", "Per què passa això"),
-        ("Switch display", "Canvia de pantalla"),
-        ("Show monitor switch button on the main toolbar", "Mostra el botó de canvi de monitor a la barra d’eines principal"),
-        ("Show on the minimized toolbar", "Mostra a la barra d’eines minimitzada"),
-        ("All monitors", "Tots els monitors"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "重置键盘输入选择"),
        ("remember-wayland-keyboard-choice-tip", "以后对这台远程电脑不再询问"),
        ("Why this happens", "了解原因"),
-        ("Switch display", "切换显示器"),
-        ("Show monitor switch button on the main toolbar", "在主工具栏上显示显示器切换按钮"),
-        ("Show on the minimized toolbar", "在最小化工具栏上显示"),
-        ("All monitors", "所有显示器"),
-        ("#{} monitor", "{}号显示器"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Resetovat volbu vstupu z klávesnice"),
        ("remember-wayland-keyboard-choice-tip", "Pro tento vzdálený počítač se již neptat"),
        ("Why this happens", "Proč k tomu dochází"),
-        ("Switch display", "Přepnout obrazovku"),
-        ("Show monitor switch button on the main toolbar", "Zobrazit tlačítko přepnutí monitoru na hlavním panelu nástrojů"),
-        ("Show on the minimized toolbar", "Zobrazit na minimalizovaném panelu nástrojů"),
-        ("All monitors", "Všechny monitory"),
-        ("#{} monitor", "Monitor č. {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Nulstil valg for tastaturinput"),
        ("remember-wayland-keyboard-choice-tip", "Spørg ikke igen for denne fjerncomputer"),
        ("Why this happens", "Hvorfor dette sker"),
-        ("Switch display", "Skift skærm"),
-        ("Show monitor switch button on the main toolbar", "Vis knap til skærmskift på hovedværktøjslinjen"),
-        ("Show on the minimized toolbar", "Vis på den minimerede værktøjslinje"),
-        ("All monitors", "Alle skærme"),
-        ("#{} monitor", "Skærm {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Auswahl der Tastatureingabe zurücksetzen"),
        ("remember-wayland-keyboard-choice-tip", "Für diesen entfernten Computer nicht erneut fragen"),
        ("Why this happens", "Warum dies passiert"),
-        ("Switch display", "Anzeige wechseln"),
-        ("Show monitor switch button on the main toolbar", "Schaltfläche zum Monitorwechsel in der Haupt-Symbolleiste anzeigen"),
-        ("Show on the minimized toolbar", "In der minimierten Symbolleiste anzeigen"),
-        ("All monitors", "Alle Bildschirme"),
-        ("#{} monitor", "Bildschirm {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Επαναφορά επιλογής εισαγωγής από πληκτρολόγιο"),
        ("remember-wayland-keyboard-choice-tip", "Να μην ερωτηθώ ξανά για αυτόν τον απομακρυσμένο υπολογιστή"),
        ("Why this happens", "Γιατί συμβαίνει αυτό"),
-        ("Switch display", "Εναλλαγή οθόνης"),
-        ("Show monitor switch button on the main toolbar", "Εμφάνιση κουμπιού εναλλαγής οθόνης στην κύρια γραμμή εργαλείων"),
-        ("Show on the minimized toolbar", "Εμφάνιση στην ελαχιστοποιημένη γραμμή εργαλείων"),
-        ("All monitors", "Όλες οι οθόνες"),
-        ("#{} monitor", "Οθόνη {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Restarigi la elekton de klavara enigo"),
        ("remember-wayland-keyboard-choice-tip", "Ne demandi denove por ĉi tiu fora komputilo"),
        ("Why this happens", "Kial ĉi tio okazas"),
-        ("Switch display", "Ŝalti ekranon"),
-        ("Show monitor switch button on the main toolbar", "Montri ekran-ŝaltan butonon en la ĉefa ilobreto"),
-        ("Show on the minimized toolbar", "Montri en la minimumigita ilobreto"),
-        ("All monitors", "Ĉiuj monitoroj"),
-        ("#{} monitor", "Monitoro {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Restablecer la opción de entrada del teclado"),
        ("remember-wayland-keyboard-choice-tip", "No volver a preguntar para este equipo remoto"),
        ("Why this happens", "Por qué ocurre esto"),
-        ("Switch display", "Cambiar de pantalla"),
-        ("Show monitor switch button on the main toolbar", "Mostrar el botón de cambio de monitor en la barra de herramientas principal"),
-        ("Show on the minimized toolbar", "Mostrar en la barra de herramientas minimizada"),
-        ("All monitors", "Todos los monitores"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Lähtesta klaviatuurisisestuse valik"),
        ("remember-wayland-keyboard-choice-tip", "Ära küsi selle kaugarvuti puhul uuesti"),
        ("Why this happens", "Miks see juhtub"),
-        ("Switch display", "Vaheta kuva"),
-        ("Show monitor switch button on the main toolbar", "Näita monitori vahetamise nuppu peamisel tööriistaribal"),
-        ("Show on the minimized toolbar", "Näita minimeeritud tööriistaribal"),
-        ("All monitors", "Kõik kuvarid"),
-        ("#{} monitor", "Kuvar {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Berrezarri teklatuko sarreraren aukera"),
        ("remember-wayland-keyboard-choice-tip", "Ez galdetu berriro urruneko ordenagailu honetarako"),
        ("Why this happens", "Zergatik gertatzen den hau"),
-        ("Switch display", "Aldatu pantaila"),
-        ("Show monitor switch button on the main toolbar", "Erakutsi monitorea aldatzeko botoia tresna-barra nagusian"),
-        ("Show on the minimized toolbar", "Erakutsi minimizatutako tresna-barran"),
-        ("All monitors", "Monitore guztiak"),
-        ("#{} monitor", "{}. monitorea"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "بازنشانی انتخاب ورودی صفحه کلید"),
        ("remember-wayland-keyboard-choice-tip", "برای این رایانه از راه دور دوباره نپرس"),
        ("Why this happens", "چرا این اتفاق می‌افتد"),
-        ("Switch display", "تعویض نمایشگر"),
-        ("Show monitor switch button on the main toolbar", "نمایش دکمه تعویض نمایشگر در نوار ابزار اصلی"),
-        ("Show on the minimized toolbar", "نمایش در نوار ابزار کوچک‌شده"),
-        ("All monitors", "همه نمایشگرها"),
-        ("#{} monitor", "نمایشگر {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Nollaa näppäimistösyötteen valinta"),
        ("remember-wayland-keyboard-choice-tip", "Älä kysy uudelleen tältä etätietokoneelta"),
        ("Why this happens", "Miksi näin tapahtuu"),
-        ("Switch display", "Vaihda näyttöä"),
-        ("Show monitor switch button on the main toolbar", "Näytä näytön vaihtopainike päätyökalurivillä"),
-        ("Show on the minimized toolbar", "Näytä pienennetyssä työkalurivissä"),
-        ("All monitors", "Kaikki näytöt"),
-        ("#{} monitor", "Näyttö {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Réinitialiser le choix de la saisie au clavier"),
        ("remember-wayland-keyboard-choice-tip", "Ne plus demander pour cet appareil distant"),
        ("Why this happens", "Pourquoi cela se produit"),
-        ("Switch display", "Changer d’écran"),
-        ("Show monitor switch button on the main toolbar", "Afficher le bouton de changement d’écran dans la barre d’outils principale"),
-        ("Show on the minimized toolbar", "Afficher dans la barre d’outils réduite"),
-        ("All monitors", "Tous les moniteurs"),
-        ("#{} monitor", "Moniteur {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "კლავიატურის შეყვანის არჩევანის ჩამოყრა"),
        ("remember-wayland-keyboard-choice-tip", "აღარ მკითხო ამ დისტანციური კომპიუტერისთვის"),
        ("Why this happens", "რატომ ხდება ეს"),
-        ("Switch display", "ეკრანის გადართვა"),
-        ("Show monitor switch button on the main toolbar", "მონიტორის გადართვის ღილაკის ჩვენება მთავარ ხელსაწყოთა ზოლზე"),
-        ("Show on the minimized toolbar", "ჩვენება ჩაკეცილ ხელსაწყოთა ზოლზე"),
-        ("All monitors", "ყველა მონიტორი"),
-        ("#{} monitor", "მონიტორი {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "કીબોર્ડ ઇનપુટ પસંદગી રિસેટ કરો"),
        ("remember-wayland-keyboard-choice-tip", "આ રિમોટ કમ્પ્યુટર માટે ફરીથી પૂછશો નહીં"),
        ("Why this happens", "આવું શા માટે થાય છે"),
-        ("Switch display", "ડિસ્પ્લે બદલો"),
-        ("Show monitor switch button on the main toolbar", "મુખ્ય ટૂલબાર પર મોનિટર સ્વિચ બટન બતાવો"),
-        ("Show on the minimized toolbar", "ન્યૂનતમ કરેલા ટૂલબાર પર બતાવો"),
-        ("All monitors", "બધા મોનિટર"),
-        ("#{} monitor", "મોનિટર {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "אפס את בחירת קלט המקלדת"),
        ("remember-wayland-keyboard-choice-tip", "אל תשאל שוב עבור מחשב מרוחק זה"),
        ("Why this happens", "מדוע זה קורה"),
-        ("Switch display", "החלפת צג"),
-        ("Show monitor switch button on the main toolbar", "הצגת לחצן החלפת צג בסרגל הכלים הראשי"),
-        ("Show on the minimized toolbar", "הצגה בסרגל הכלים הממוזער"),
-        ("All monitors", "כל המסכים"),
-        ("#{} monitor", "מסך {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "कीबोर्ड इनपुट चयन रीसेट करें"),
        ("remember-wayland-keyboard-choice-tip", "इस रिमोट कंप्यूटर के लिए दोबारा न पूछें"),
        ("Why this happens", "ऐसा क्यों होता है"),
-        ("Switch display", "डिस्प्ले बदलें"),
-        ("Show monitor switch button on the main toolbar", "मुख्य टूलबार पर मॉनिटर स्विच बटन दिखाएं"),
-        ("Show on the minimized toolbar", "न्यूनतम किए गए टूलबार पर दिखाएं"),
-        ("All monitors", "सभी मॉनिटर"),
-        ("#{} monitor", "मॉनिटर {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Poništi izbor unosa tipkovnicom"),
        ("remember-wayland-keyboard-choice-tip", "Ne pitaj ponovno za ovo udaljeno računalo"),
        ("Why this happens", "Zašto se ovo događa"),
-        ("Switch display", "Promijeni zaslon"),
-        ("Show monitor switch button on the main toolbar", "Prikaži gumb za prebacivanje monitora na glavnoj alatnoj traci"),
-        ("Show on the minimized toolbar", "Prikaži na minimiziranoj alatnoj traci"),
-        ("All monitors", "Svi monitori"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Billentyűzetbevitel választásának visszaállítása"),
        ("remember-wayland-keyboard-choice-tip", "Ne kérdezze meg újra ennél a távoli számítógépnél"),
        ("Why this happens", "Miért történik ez"),
-        ("Switch display", "Kijelző váltása"),
-        ("Show monitor switch button on the main toolbar", "Monitorváltó gomb megjelenítése a fő eszköztáron"),
-        ("Show on the minimized toolbar", "Megjelenítés a kis méretű eszköztáron"),
-        ("All monitors", "Minden monitor"),
-        ("#{} monitor", "{}. monitor"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Setel ulang pilihan masukan keyboard"),
        ("remember-wayland-keyboard-choice-tip", "Jangan tanya lagi untuk komputer jarak jauh ini"),
        ("Why this happens", "Mengapa ini terjadi"),
-        ("Switch display", "Ganti tampilan"),
-        ("Show monitor switch button on the main toolbar", "Tampilkan tombol pengalih monitor di bilah alat utama"),
-        ("Show on the minimized toolbar", "Tampilkan di bilah alat yang diperkecil"),
-        ("All monitors", "Semua monitor"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Ripristina scelta input da tastiera"),
        ("remember-wayland-keyboard-choice-tip", "Non chiedere più per questo computer remoto"),
        ("Why this happens", "Perché accade questo"),
-        ("Switch display", "Cambia schermo"),
-        ("Show monitor switch button on the main toolbar", "Visualizza nella barra strumenti principale il pulsante per il cambio schermo"),
-        ("Show on the minimized toolbar", "Visualizza nella barra strumenti ridotta a icona"),
-        ("All monitors", "Tutti gli schermi"),
-        ("#{} monitor", "Schermo {}"),
    ].iter().cloned().collect();
 }
@@ -197,9 +197,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Please enter the folder name", "フォルダー名を入力してください"),
        ("Fix it", "修復する"),
        ("Warning", "警告"),
-        ("Login screen using Wayland is not supported", "Wayland を使用したログイン画面は対応していません"),
+        ("Login screen using Wayland is not supported", "Wayland を使用したログインスクリーンはサポートされていません"),
        ("Reboot required", "再起動が必要です"),
-        ("Unsupported display server", "非対応のディスプレイサーバー"),
+        ("Unsupported display server", "サポートされていないディスプレイサーバー"),
        ("x11 expected", "X11 が必要です"),
        ("Port", "ポート"),
        ("Settings", "設定"),
@@ -268,11 +268,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Share screen", "画面を共有"),
        ("Chat", "チャット"),
        ("Total", "合計"),
-        ("items", "個の項目"),
+        ("items", "個のアイテム"),
        ("Selected", "選択済み"),
-        ("Screen Capture", "画面をキャプチャ"),
+        ("Screen Capture", "画面キャプチャ"),
        ("Input Control", "入力操作"),
-        ("Audio Capture", "オーディオをキャプチャ"),
+        ("Audio Capture", "音声キャプチャ"),
        ("Do you accept?", "許可しますか？"),
        ("Open System Setting", "システム設定を開く"),
        ("How to get Android input permission?", "Android の入力権限を取得するには？"),
@@ -281,7 +281,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("android_new_connection_tip", "新しい操作リクエストが届きました。この端末を操作しようとしています。"),
        ("android_service_will_start_tip", "「画面キャプチャ」を有効にするとサービスが自動的に開始され、他の端末がこの端末への接続をリクエストできるようになります。"),
        ("android_stop_service_tip", "サービスを停止すると、自動的に現在のセッションがすべて閉じられます。"),
-        ("android_version_audio_tip", "使用している Android はオーディオキャプチャに対応していません。Android 10 以降に更新してください。"),
+        ("android_version_audio_tip", "現在の Android バージョンでは音声キャプチャはサポートされていません。Android 10 以降に更新してください。"),
        ("android_start_service_tip", "「サービスを開始」をタップするか、「画面キャプチャ」の許可を有効にすると、画面共有サービスが開始されます。"),
        ("android_permission_may_not_change_tip", "権限の変更は現在のセッションには適用されません。再接続後に適用されます。"),
        ("Account", "アカウント"),
@@ -292,7 +292,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Failed", "失敗"),
        ("Succeeded", "成功"),
        ("Someone turns on privacy mode, exit", "プライバシーモードがオンになりました。終了します。"),
-        ("Unsupported", "対応していません"),
+        ("Unsupported", "サポートされていません"),
        ("Peer denied", "リモートホストに拒否されました"),
        ("Please install plugins", "プラグインをインストールしてください"),
        ("Peer exit", "リモートホストが退出しました"),
@@ -376,10 +376,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Confirm before closing multiple tabs", "複数のタブを閉じる前に確認する"),
        ("Keyboard Settings", "キーボードの設定"),
        ("Full Access", "フルアクセス"),
-        ("Screen Share", "画面を共有"),
+        ("Screen Share", "画面共有"),
        ("ubuntu-21-04-required", "Wayland を使用するには、Ubuntu 21.04 以降のバージョンが必要です。"),
        ("wayland-requires-higher-linux-version", "Wayland を使用するには、より新しい Linux ディストリビューションが必要です。 X11 デスクトップを試すか、OS を変更してください。"),
-        ("xdp-portal-unavailable", "Wayland の画面キャプチャに失敗しました。XDG デスクトップポータルがクラッシュしたか、利用できない可能性があります。`systemctl --user restart xdg-desktop-portal` で再起動してみてください。"),
+        ("xdp-portal-unavailable", "Wayland の画面キャプチャに失敗しました。XDG Desktop Portal がクラッシュしたか、利用できない可能性があります。`systemctl --user restart xdg-desktop-portal` で再起動してみてください。"),
        ("JumpLink", "表示"),
        ("Please Select the screen to be shared(Operate on the peer side).", "共有する画面を選択してください(リモートコンピューターが操作します)"),
        ("Show RustDesk", "RustDesk を表示"),
@@ -397,7 +397,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Request access to your device", "デバイスへのアクセス要求"),
        ("Hide connection management window", "接続管理画面を隠す"),
        ("hide_cm_tip", "パスワードによるセッションを許可し、固定パスワードを使用する場合にのみ、管理画面の非表示を許可する。"),
-        ("wayland_experiment_tip", "Wayland の対応は試験的なものです。無人アクセスを使用する場合はX11デスクトップをご利用ください。"),
+        ("wayland_experiment_tip", "Wayland のサポートは試験的なものです。無人アクセスを使用する場合はX11デスクトップをご利用ください。"),
        ("Right click to select tabs", "右クリックでタブを選択"),
        ("Skipped", "スキップ"),
        ("Add to address book", "アドレス帳に追加"),
@@ -568,7 +568,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("input_source_1_tip", "入力ソース 1"),
        ("input_source_2_tip", "入力ソース 2"),
        ("Swap control-command key", "ctrl と command キーを入れ替える"),
-        ("swap-left-right-mouse", "マウスクリックを入れ替える"),
+        ("swap-left-right-mouse", "マウスのクリックを入れ替える"),
        ("2FA code", "二要素認証コード"),
        ("More", "詳細"),
        ("enable-2fa-title", "二要素認証を有効化する"),
@@ -601,10 +601,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("default_proxy_tip", "既定のプロトコルとポートは Socks5 と 1080 です。"),
        ("no_audio_input_device_tip", "オーディオ入力デバイスが見つかりません。"),
        ("Incoming", "受信"),
-        ("Outgoing", "送信"),
-        ("Clear Wayland screen selection", "Wayland の画面選択を消去"),
-        ("clear_Wayland_screen_selection_tip", "画面選択を消去後、共有画面を再び選択できます。"),
-        ("confirm_clear_Wayland_screen_selection_tip", "本当に Wayland の画面選択を消去しますか？"),
+        ("Outgoing", "発信"),
+        ("Clear Wayland screen selection", "Wayland の画面選択をクリア"),
+        ("clear_Wayland_screen_selection_tip", "画面選択をクリア後、共有画面を再び選択できます。"),
+        ("confirm_clear_Wayland_screen_selection_tip", "本当に Wayland の画面選択をクリアしますか？"),
        ("android_new_voice_call_tip", "新しい音声通話リクエストを受信しました。承認すると音声通話に切り替わります。"),
        ("texture_render_tip", "テクスチャレンダリングを使用し、画像をより滑らかに描画します。レンダリングの問題が発生した場合は無効にしてみてください。"),
        ("Use texture rendering", "テクスチャレンダリングを使用する"),
@@ -643,7 +643,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("one-way-file-transfer-tip", "コントロールをされる側では一方向のファイル転送が有効になります。"),
        ("Authentication Required", "認証が必要です"),
        ("Authenticate", "認証"),
-        ("web_id_input_tip", "同じサーバー内の ID を入力できます。Web クライアントでは IP アドレスによる直接アクセスに対応していません。\n別のサーバー上のデバイスにアクセスする場合は、サーバーアドレス (<id>@<server_address>?key=<key_value>) を入力してください。\n 例: 9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=\nパブリックサーバー上のデバイスにアクセスする場合は、「<id>@public」と入力してください。パブリックサーバーはキーは不要です。"),
+        ("web_id_input_tip", "同じサーバー内の ID を入力できます。Web クライアントでは直接 IP アドレスによるアクセスはサポートされていません。\n別のサーバー上のデバイスにアクセスする場合は、サーバーアドレス (<id>@<server_address>?key=<key_value>) を入力してください。\n 例: 9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=\nパブリックサーバー上のデバイスにアクセスする場合は、「<id>@public」と入力してください。パブリックサーバーはキーは不要です。"),
        ("Download", "ダウンロード"),
        ("Upload folder", "フォルダーをアップロード"),
        ("Upload files", "ファイルをアップロード"),
@@ -674,7 +674,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("dont-show-again-tip", "今後は表示しない"),
        ("Take screenshot", "スクリーンショットを撮影"),
        ("Taking screenshot", "スクリーンショットを撮影中"),
-        ("screenshot-merged-screen-not-supported-tip", "複数のディスプレイのスクリーンショットの結合は、現在非対応です。単一のディスプレイに切り替えてもう一度お試しください。"),
+        ("screenshot-merged-screen-not-supported-tip", "複数のディスプレイのスクリーンショットの結合は、現在サポートされていません。単一のディスプレイに切り替えてもう一度お試しください。"),
        ("screenshot-action-tip", "スクリーンショットを続行する方法を選択してください。"),
        ("Save as", "保存先"),
        ("Copy to clipboard", "クリップボードにコピー"),
@@ -685,7 +685,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("download-new-version-failed-tip", "ダウンロードに失敗しました。もう一度お試しいただくか、「ダウンロード」ボタンをクリックしてリリースページからダウンロードし、手動でアップグレードしてください。"),
        ("Auto update", "ソフトウェアの自動更新を行う"),
        ("update-failed-check-msi-tip", "インストール方法の確認に失敗しました。「ダウンロード」ボタンをクリックしてリリースページからダウンロードし、手動でアップグレードしてください。"),
-        ("websocket_tip", "WebSocket を使用する場合、リレー接続のみ対応しています。"),
+        ("websocket_tip", "WebSocket を使用する場合、リレー接続のみがサポートされます。"),
        ("Use WebSocket", "WebSocket を使用する"),
        ("Trackpad speed", "トラックパッドの速度"),
        ("Default trackpad speed", "既定のトラックパッドの速度"),
@@ -695,7 +695,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("View camera", "カメラを表示"),
        ("Enable camera", "カメラを有効化する"),
        ("No cameras", "カメラなし"),
-        ("view_camera_unsupported_tip", "リモートデバイスはカメラの表示に対応していません"),
+        ("view_camera_unsupported_tip", "リモートデバイスはカメラの表示をサポートしていません。"),
        ("Terminal", "ターミナル"),
        ("Enable terminal", "ターミナルを有効化する"),
        ("New tab", "新しいタブ"),
@@ -706,7 +706,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Incorrect username or password.", "ユーザー名またはパスワードが正しくありません。"),
        ("The user is not an administrator.", "このユーザーは管理者ではありません。"),
        ("Failed to check if the user is an administrator.", "ユーザーが管理者であるかどうかを確認できませんでした。"),
-        ("Supported only in the installed version.", "インストールされたバージョンでのみ対応しています。"),
+        ("Supported only in the installed version.", "インストールされたバージョンでのみサポートされます。"),
        ("elevation_username_tip", "ユーザー名またはドメインのユーザー名を入力してください。"),
        ("Preparing for installation ...", "インストールの準備中です..."),
        ("Show my cursor", "自分のカーソルを表示する"),
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "キーボード入力の選択をリセット"),
        ("remember-wayland-keyboard-choice-tip", "このリモートコンピューターでは今後確認しない"),
        ("Why this happens", "この問題が起こる理由"),
-        ("Switch display", "ディスプレイを切り替え"),
-        ("Show monitor switch button on the main toolbar", "メインツールバーにモニター切り替えボタンを表示"),
-        ("Show on the minimized toolbar", "最小化したツールバーに表示"),
-        ("All monitors", "すべてのディスプレイ"),
-        ("#{} monitor", "ディスプレイ {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "키보드 입력 선택 초기화"),
        ("remember-wayland-keyboard-choice-tip", "이 원격 컴퓨터에 대해 다시 묻지 않기"),
        ("Why this happens", "이런 현상이 발생하는 이유"),
-        ("Switch display", "디스플레이 전환"),
-        ("Show monitor switch button on the main toolbar", "기본 도구 모음에 모니터 전환 버튼 표시"),
-        ("Show on the minimized toolbar", "최소화된 도구 모음에 표시"),
-        ("All monitors", "모든 모니터"),
-        ("#{} monitor", "{}번 모니터"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Пернетақта еңгізу таңдауын қалпына келтіру"),
        ("remember-wayland-keyboard-choice-tip", "Осы қашықтағы компьютер үшін қайта сұрамау"),
        ("Why this happens", "Бұл неге болады"),
-        ("Switch display", "Дисплейді ауыстыру"),
-        ("Show monitor switch button on the main toolbar", "Негізгі құралдар тақтасында мониторды ауыстыру түймесін көрсету"),
-        ("Show on the minimized toolbar", "Кішірейтілген құралдар тақтасында көрсету"),
-        ("All monitors", "Барлық мониторлар"),
-        ("#{} monitor", "Монитор {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Atstatyti klaviatūros įvesties pasirinkimą"),
        ("remember-wayland-keyboard-choice-tip", "Daugiau neklausti dėl šio nuotolinio kompiuterio"),
        ("Why this happens", "Kodėl taip nutinka"),
-        ("Switch display", "Perjungti ekraną"),
-        ("Show monitor switch button on the main toolbar", "Rodyti monitoriaus perjungimo mygtuką pagrindinėje įrankių juostoje"),
-        ("Show on the minimized toolbar", "Rodyti sumažintoje įrankių juostoje"),
-        ("All monitors", "Visi monitoriai"),
-        ("#{} monitor", "Monitorius {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Atiestatīt tastatūras ievades izvēli"),
        ("remember-wayland-keyboard-choice-tip", "Vairs nejautāt par šo attālo datoru"),
        ("Why this happens", "Kāpēc tas notiek"),
-        ("Switch display", "Pārslēgt displeju"),
-        ("Show monitor switch button on the main toolbar", "Rādīt monitora pārslēgšanas pogu galvenajā rīkjoslā"),
-        ("Show on the minimized toolbar", "Rādīt minimizētajā rīkjoslā"),
-        ("All monitors", "Visi monitori"),
-        ("#{} monitor", "Monitors {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "കീബോർഡ് ഇൻപുട്ട് തിരഞ്ഞെടുപ്പ് റീസെറ്റ് ചെയ്യുക"),
        ("remember-wayland-keyboard-choice-tip", "ഈ റിമോട്ട് കമ്പ്യൂട്ടറിനായി ഇനി ചോദിക്കരുത്"),
        ("Why this happens", "ഇത് എന്തുകൊണ്ട് സംഭവിക്കുന്നു"),
-        ("Switch display", "ഡിസ്പ്ലേ മാറ്റുക"),
-        ("Show monitor switch button on the main toolbar", "പ്രധാന ടൂൾബാറിൽ മോണിറ്റർ സ്വിച്ച് ബട്ടൺ കാണിക്കുക"),
-        ("Show on the minimized toolbar", "ചെറുതാക്കിയ ടൂൾബാറിൽ കാണിക്കുക"),
-        ("All monitors", "എല്ലാ മോണിറ്ററുകളും"),
-        ("#{} monitor", "മോണിറ്റർ {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Tilbakestill valg for tastaturinndata"),
        ("remember-wayland-keyboard-choice-tip", "Ikke spør igjen for denne eksterne datamaskinen"),
        ("Why this happens", "Hvorfor dette skjer"),
-        ("Switch display", "Bytt skjerm"),
-        ("Show monitor switch button on the main toolbar", "Vis knapp for skjermbytte på hovedverktøylinjen"),
-        ("Show on the minimized toolbar", "Vis på den minimerte verktøylinjen"),
-        ("All monitors", "Alle skjermer"),
-        ("#{} monitor", "Skjerm {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Keuze voor toetsenbordinvoer opnieuw instellen"),
        ("remember-wayland-keyboard-choice-tip", "Niet meer vragen voor deze externe computer"),
        ("Why this happens", "Waarom dit gebeurt"),
-        ("Switch display", "Beeldscherm wisselen"),
-        ("Show monitor switch button on the main toolbar", "Knop voor monitorwisseling weergeven op de hoofdwerkbalk"),
-        ("Show on the minimized toolbar", "Weergeven op de geminimaliseerde werkbalk"),
-        ("All monitors", "Alle monitoren"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Zresetuj wybór dotyczący wprowadzania z klawiatury"),
        ("remember-wayland-keyboard-choice-tip", "Nie pytaj ponownie dla tego zdalnego komputera"),
        ("Why this happens", "Dlaczego tak się dzieje"),
-        ("Switch display", "Przełącz ekran"),
-        ("Show monitor switch button on the main toolbar", "Pokaż przycisk przełączania monitora na głównym pasku narzędzi"),
-        ("Show on the minimized toolbar", "Pokaż na zminimalizowanym pasku narzędzi"),
-        ("All monitors", "Wszystkie ekrany"),
-        ("#{} monitor", "Ekran {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Repor escolha de entrada de teclado"),
        ("remember-wayland-keyboard-choice-tip", "Não voltar a perguntar para este computador remoto"),
        ("Why this happens", "Porque é que isto acontece"),
-        ("Switch display", "Trocar de ecrã"),
-        ("Show monitor switch button on the main toolbar", "Mostrar o botão de troca de monitor na barra de ferramentas principal"),
-        ("Show on the minimized toolbar", "Mostrar na barra de ferramentas minimizada"),
-        ("All monitors", "Todos os monitores"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -16,18 +16,18 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Control Remote Desktop", "Controle um Computador Remoto"),
        ("Transfer file", "Transferir arquivos"),
        ("Connect", "Conectar"),
-        ("Recent sessions", "Sessões recentes"),
-        ("Address book", "Lista de endereços"),
+        ("Recent sessions", "Sessões Recentes"),
+        ("Address book", "Lista de Endereços"),
        ("Confirmation", "Confirmação"),
        ("TCP tunneling", "Tunelamento TCP"),
        ("Remove", "Remover"),
-        ("Refresh random password", "Gerar nova senha aleatória"),
-        ("Set your own password", "Definir sua própria senha"),
+        ("Refresh random password", "Atualizar senha aleatória"),
+        ("Set your own password", "Configure sua própria senha"),
        ("Enable keyboard/mouse", "Habilitar teclado/mouse"),
        ("Enable clipboard", "Habilitar área de transferência"),
        ("Enable file transfer", "Habilitar transferência de arquivos"),
        ("Enable TCP tunneling", "Habilitar tunelamento TCP"),
-        ("IP Whitelisting", "Lista de IPs Permitidos"),
+        ("IP Whitelisting", "Lista de IPs Confiáveis"),
        ("ID/Relay Server", "Servidor ID/Relay"),
        ("Import server config", "Importar Configuração do Servidor"),
        ("Export Server Config", "Exportar Configuração do Servidor"),
@@ -320,12 +320,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Exit Fullscreen", "Sair da Tela Cheia"),
        ("Fullscreen", "Tela Cheia"),
        ("Mobile Actions", "Ações móveis"),
-        ("Select Monitor", "Selecionar tela"),
+        ("Select Monitor", "Selecionar monitor"),
        ("Control Actions", "Controlar ações"),
        ("Display Settings", "Configurações de exibição"),
        ("Ratio", "Proporção"),
        ("Image Quality", "Qualidade de imagem"),
-        ("Scroll Style", "Estilo de rolagem"),
+        ("Scroll Style", "Estilo de Rolagem"),
        ("Show Toolbar", "Mostrar barra de ferramentas"),
        ("Hide Toolbar", "Ocultar barra de ferramentas"),
        ("Direct Connection", "Conexão Direta"),
@@ -353,7 +353,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Disconnect all devices?", "Desconectar todos os dispositivos?"),
        ("Clear", "Limpar"),
        ("Audio Input Device", "Dispositivo de entrada de áudio"),
-        ("Use IP Whitelisting", "Utilizar lista de IPs permitidos"),
+        ("Use IP Whitelisting", "Utilizar lista de IPs confiáveis"),
        ("Network", "Rede"),
        ("Pin Toolbar", "Fixar barra de ferramentas"),
        ("Unpin Toolbar", "Desafixar barra de ferramentas"),
@@ -463,7 +463,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Empty Password", "Senha Vazia"),
        ("Me", "Eu"),
        ("identical_file_tip", "Este arquivo é idêntico ao do parceiro."),
-        ("show_monitors_tip", "Mostrar telas na barra de ferramentas"),
+        ("show_monitors_tip", "Mostrar monitores na barra de ferramentas"),
        ("View Mode", "Modo de visualização"),
        ("login_linux_tip", "Você precisa fazer login na conta Linux remota para habilitar uma sessão de desktop X"),
        ("verify_rustdesk_password_tip", "Verifique a senha do RustDesk"),
@@ -674,7 +674,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("dont-show-again-tip", "Não mostrar novamente"),
        ("Take screenshot", "Capturar tela"),
        ("Taking screenshot", "Capturando tela"),
-        ("screenshot-merged-screen-not-supported-tip", "A captura de tela de múltiplas telas não é suportada no momento. Por favor, alterne para uma única tela e tente novamente."),
+        ("screenshot-merged-screen-not-supported-tip", "Mesclar a captura de tela de múltiplos monitores não é suportada no momento. Por favor, alterne para um único monitor e tente novamente."),
        ("screenshot-action-tip", "Por favor, selecione como deseja continuar com a captura de tela."),
        ("Save as", "Salvar como"),
        ("Copy to clipboard", "Copiar para área de transferência"),
@@ -694,7 +694,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Enable UDP hole punching", "Habilitar UDP hole punching"),
        ("View camera", "Visualizar câmera"),
        ("Enable camera", "Habilitar câmera"),
-        ("No cameras", "Nenhuma câmera"),
+        ("No cameras", "Nenhuma câmeras"),
        ("view_camera_unsupported_tip", "O dispositivo remoto não suporta visualização da câmera."),
        ("Terminal", "Terminal"),
        ("Enable terminal", "Habilitar terminal"),
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Redefinir escolha de entrada do teclado"),
        ("remember-wayland-keyboard-choice-tip", "Não perguntar novamente para este computador remoto"),
        ("Why this happens", "Por que isso acontece"),
-        ("Switch display", "Trocar de tela"),
-        ("Show monitor switch button on the main toolbar", "Mostrar botão de troca de tela na barra de ferramentas"),
-        ("Show on the minimized toolbar", "Mostrar na barra de ferramentas minimizada"),
-        ("All monitors", "Todas as telas"),
-        ("#{} monitor", "Tela {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Resetează alegerea pentru introducerea de la tastatură"),
        ("remember-wayland-keyboard-choice-tip", "Nu mai întreba pentru acest computer la distanță"),
        ("Why this happens", "De ce se întâmplă acest lucru"),
-        ("Switch display", "Comută afișajul"),
-        ("Show monitor switch button on the main toolbar", "Afișează butonul de comutare a monitorului în bara de instrumente principală"),
-        ("Show on the minimized toolbar", "Afișează în bara de instrumente minimizată"),
-        ("All monitors", "Toate monitoarele"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Сбросить выбор для ввода с клавиатуры"),
        ("remember-wayland-keyboard-choice-tip", "Больше не спрашивать для этого удалённого компьютера"),
        ("Why this happens", "Почему это происходит"),
-        ("Switch display", "Переключить дисплей"),
-        ("Show monitor switch button on the main toolbar", "Показывать кнопку переключения монитора на главной панели инструментов"),
-        ("Show on the minimized toolbar", "Показывать на свёрнутой панели инструментов"),
-        ("All monitors", "Все мониторы"),
-        ("#{} monitor", "Монитор {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Reseta s'isseberada de s'insertada cun su tecladu"),
        ("remember-wayland-keyboard-choice-tip", "No torres a preguntare pro custu elaboradore remotu"),
        ("Why this happens", "Pro ite custu càpitat"),
-        ("Switch display", "Càmbia ischermu"),
-        ("Show monitor switch button on the main toolbar", "Mustra su butone de càmbiu de monitor in sa barra de aina printzipale"),
-        ("Show on the minimized toolbar", "Mustra in sa barra de aina minimizada"),
-        ("All monitors", "Totu sos ischermos"),
-        ("#{} monitor", "Ischermu {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Obnoviť voľbu vstupu z klávesnice"),
        ("remember-wayland-keyboard-choice-tip", "Nepýtať sa znova pre tento vzdialený počítač"),
        ("Why this happens", "Prečo sa to deje"),
-        ("Switch display", "Prepnúť obrazovku"),
-        ("Show monitor switch button on the main toolbar", "Zobraziť tlačidlo prepnutia monitora na hlavnom paneli nástrojov"),
-        ("Show on the minimized toolbar", "Zobraziť na minimalizovanom paneli nástrojov"),
-        ("All monitors", "Všetky monitory"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Ponastavi izbiro vnosa s tipkovnice"),
        ("remember-wayland-keyboard-choice-tip", "Za ta oddaljeni računalnik ne vprašaj več"),
        ("Why this happens", "Zakaj se to dogaja"),
-        ("Switch display", "Preklopi zaslon"),
-        ("Show monitor switch button on the main toolbar", "Pokaži gumb za preklop monitorja v glavni orodni vrstici"),
-        ("Show on the minimized toolbar", "Pokaži v pomanjšani orodni vrstici"),
-        ("All monitors", "Vsi zasloni"),
-        ("#{} monitor", "Zaslon {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Rivendos zgjedhjen e hyrjes nga tastiera"),
        ("remember-wayland-keyboard-choice-tip", "Mos pyet më për këtë kompjuter në distancë"),
        ("Why this happens", "Pse ndodh kjo"),
-        ("Switch display", "Ndërro ekranin"),
-        ("Show monitor switch button on the main toolbar", "Shfaq butonin e ndërrimit të monitorit te shiriti kryesor i veglave"),
-        ("Show on the minimized toolbar", "Shfaq te shiriti i minimizuar i veglave"),
-        ("All monitors", "Të gjithë monitorët"),
-        ("#{} monitor", "Monitori {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Resetuj izbor unosa sa tastature"),
        ("remember-wayland-keyboard-choice-tip", "Ne pitaj ponovo za ovaj udaljeni računar"),
        ("Why this happens", "Zašto se ovo dešava"),
-        ("Switch display", "Промени екран"),
-        ("Show monitor switch button on the main toolbar", "Прикажи дугме за пребацивање монитора на главној траци са алаткама"),
-        ("Show on the minimized toolbar", "Прикажи на умањеној траци са алаткама"),
-        ("All monitors", "Svi monitori"),
-        ("#{} monitor", "Monitor {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Återställ val av tangentbordsinmatning"),
        ("remember-wayland-keyboard-choice-tip", "Fråga inte igen för den här fjärrdatorn"),
        ("Why this happens", "Varför detta händer"),
-        ("Switch display", "Växla skärm"),
-        ("Show monitor switch button on the main toolbar", "Visa knapp för skärmväxling i huvudverktygsfältet"),
-        ("Show on the minimized toolbar", "Visa i det minimerade verktygsfältet"),
-        ("All monitors", "Alla skärmar"),
-        ("#{} monitor", "Skärm {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "விசைப்பலகை உள்ளீட்டுத் தேர்வை மீட்டமை"),
        ("remember-wayland-keyboard-choice-tip", "இந்தத் தொலை கணினிக்கு மீண்டும் கேட்க வேண்டாம்"),
        ("Why this happens", "இது ஏன் நிகழ்கிறது"),
-        ("Switch display", "திரையை மாற்று"),
-        ("Show monitor switch button on the main toolbar", "முதன்மை கருவிப்பட்டையில் திரை மாற்று பொத்தானைக் காட்டு"),
-        ("Show on the minimized toolbar", "சிறிதாக்கப்பட்ட கருவிப்பட்டையில் காட்டு"),
-        ("All monitors", "அனைத்து மானிட்டர்களும்"),
-        ("#{} monitor", "மானிட்டர் {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", ""),
        ("remember-wayland-keyboard-choice-tip", ""),
        ("Why this happens", ""),
-        ("Switch display", ""),
-        ("Show monitor switch button on the main toolbar", ""),
-        ("Show on the minimized toolbar", ""),
-        ("All monitors", ""),
-        ("#{} monitor", ""),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "รีเซ็ตตัวเลือกการป้อนข้อมูลจากคีย์บอร์ด"),
        ("remember-wayland-keyboard-choice-tip", "ไม่ต้องถามอีกสำหรับคอมพิวเตอร์ปลายทางนี้"),
        ("Why this happens", "เหตุใดจึงเกิดขึ้น"),
-        ("Switch display", "สลับจอแสดงผล"),
-        ("Show monitor switch button on the main toolbar", "แสดงปุ่มสลับจอภาพบนแถบเครื่องมือหลัก"),
-        ("Show on the minimized toolbar", "แสดงบนแถบเครื่องมือที่ย่อเล็กสุด"),
-        ("All monitors", "จอภาพทั้งหมด"),
-        ("#{} monitor", "จอภาพ {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Klavye girişi seçimini sıfırla"),
        ("remember-wayland-keyboard-choice-tip", "Bu uzak bilgisayar için bir daha sorma"),
        ("Why this happens", "Bunun nedeni"),
-        ("Switch display", "Ekranı değiştir"),
-        ("Show monitor switch button on the main toolbar", "Ana araç çubuğunda monitör değiştirme düğmesini göster"),
-        ("Show on the minimized toolbar", "Simge durumuna küçültülmüş araç çubuğunda göster"),
-        ("All monitors", "Tüm monitörler"),
-        ("#{} monitor", "Monitör {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "重設鍵盤輸入選擇"),
        ("remember-wayland-keyboard-choice-tip", "不要再為此遠端電腦詢問"),
        ("Why this happens", "發生原因"),
-        ("Switch display", "切換螢幕"),
-        ("Show monitor switch button on the main toolbar", "在主工具列上顯示螢幕切換按鈕"),
-        ("Show on the minimized toolbar", "在最小化工具列上顯示"),
-        ("All monitors", "所有顯示器"),
-        ("#{} monitor", "{}號顯示器"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Скинути вибір щодо введення з клавіатури"),
        ("remember-wayland-keyboard-choice-tip", "Більше не запитувати для цього віддаленого комп'ютера"),
        ("Why this happens", "Чому це відбувається"),
-        ("Switch display", "Перемкнути дисплей"),
-        ("Show monitor switch button on the main toolbar", "Показувати кнопку перемикання монітора на головній панелі інструментів"),
-        ("Show on the minimized toolbar", "Показувати на згорнутій панелі інструментів"),
-        ("All monitors", "Усі монітори"),
-        ("#{} monitor", "Монітор {}"),
    ].iter().cloned().collect();
 }
@@ -758,10 +758,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("wayland-keyboard-input-reset-choice-tip", "Đặt lại lựa chọn nhập bàn phím"),
        ("remember-wayland-keyboard-choice-tip", "Không hỏi lại cho máy tính từ xa này"),
        ("Why this happens", "Tại sao điều này xảy ra"),
-        ("Switch display", "Chuyển màn hình"),
-        ("Show monitor switch button on the main toolbar", "Hiển thị nút chuyển đổi màn hình trên thanh công cụ chính"),
-        ("Show on the minimized toolbar", "Hiển thị trên thanh công cụ thu nhỏ"),
-        ("All monitors", "Tất cả màn hình"),
-        ("#{} monitor", "Màn hình {}"),
    ].iter().cloned().collect();
 }
@@ -51,7 +51,6 @@ fn check_desktop_manager() {
 pub fn start_xdesktop() {
    debug_assert!(crate::is_server());
    std::thread::spawn(|| {
-        DesktopManager::recover_orphaned_session();
        *DESKTOP_MANAGER.lock().unwrap() = Some(DesktopManager::new());

        let interval = time::Duration::from_millis(super::SERVICE_INTERVAL);
@@ -463,15 +462,10 @@ impl DesktopManager {
        let (child_xorg, child_wm) = Self::start_x11(uid, gid, username, display_num, &envs)?;
        is_child_running.store(true, Ordering::SeqCst);

-        // capture the logind session scope (from a live child) for teardown and crash
-        // recovery, see reap_session_scope and recover_orphaned_session.
-        let scope_dir = Self::session_scope_dir(child_xorg.id());
-        Self::save_orphaned_marker(&scope_dir, display_num);
-
        log::info!("Start xorg and wm done, notify and wait xtop x11");
        allow_err!(tx_res.send("".to_owned()));

-        Self::wait_stop_x11(child_xorg, child_wm, scope_dir, display_num);
+        Self::wait_stop_x11(child_xorg, child_wm);
        log::info!("Wait x11 stop done");
        Ok(())
    }
@@ -671,282 +665,7 @@ impl DesktopManager {
        }
    }

-    // resolve the "session-<id>.scope" directory pam_systemd put the x session in, read
-    // from a live child pid. cgroup v2 mounts every cgroup under /sys/fs/cgroup, v1/hybrid
-    // keeps the scope under the systemd controller mount; pick by the controller field and
-    // confirm the cgroup is real. empty if there is no such scope (e.g. no logind).
-    fn session_scope_dir(pid: u32) -> String {
-        let path = format!("/proc/{}/cgroup", pid);
-        let content = match std::fs::read_to_string(&path) {
-            Ok(c) => c,
-            Err(e) => {
-                log::warn!("Failed to read {} to find session scope: {}", path, e);
-                return "".to_owned();
-            }
-        };
-        for line in content.lines() {
-            // "<hierarchy>:<controllers>:<path>"; v2 unified is "0::<path>", the v1
-            // systemd hierarchy is "<n>:name=systemd:<path>".
-            let mut fields = line.splitn(3, ':');
-            let (controllers, cgroup) = match (fields.next(), fields.next(), fields.next()) {
-                (Some(_), Some(c), Some(p)) => (c, p),
-                _ => continue,
-            };
-            let scope = match Self::session_scope(cgroup) {
-                Some(s) => s,
-                None => continue,
-            };
-            let mount = if controllers.is_empty() {
-                "/sys/fs/cgroup"
-            } else if controllers.split(',').any(|c| c == "name=systemd") {
-                "/sys/fs/cgroup/systemd"
-            } else {
-                continue;
-            };
-            let dir = format!("{}{}", mount, scope);
-            if Path::new(&format!("{}/cgroup.procs", dir)).exists() {
-                return dir;
-            }
-        }
-        "".to_owned()
-    }
-
-    // the "/.../session-<id>.scope" prefix of a cgroup path, dropping any nested child
-    // cgroup below it so a descendant scope does not get mistaken for the session.
-    fn session_scope(cgroup: &str) -> Option<String> {
-        let mut scope = String::new();
-        for comp in cgroup.split('/').filter(|c| !c.is_empty()) {
-            scope.push('/');
-            scope.push_str(comp);
-            if comp.starts_with("session-") && comp.ends_with(".scope") {
-                return Some(scope);
-            }
-        }
-        None
-    }
-
-    // on teardown reap the whole session scope subtree, not just the xorg + wm pids:
-    // the per-session pipewire and other desktop children otherwise outlive them and
-    // hold the logind session in "closing", leaking sockets + displays on reconnect
-    // (rustdesk/rustdesk#15183). SIGTERM first so pipewire unlinks its sockets, then
-    // SIGKILL stragglers; skip our own pid (pam put the service in the scope too).
-    fn reap_session_scope(scope_dir: &str) {
-        if scope_dir.is_empty() {
-            return;
-        }
-        let me = std::process::id();
-        // spare the --server's own children and any descendants of them sharing this scope
-        // (see pid_is_spared); only the desktop session's leftovers are reaped.
-        let spared: Vec<u32> = crate::server::CHILD_PROCESS
-            .lock()
-            .unwrap()
-            .iter()
-            .map(|c| c.id())
-            .collect();
-        for sig in [hbb_common::libc::SIGTERM, hbb_common::libc::SIGKILL] {
-            let mut pids = Vec::new();
-            Self::collect_scope_pids(Path::new(scope_dir), &mut pids);
-            let mut any = false;
-            for pid in pids {
-                if pid == me || Self::pid_is_spared(pid, &spared, me) {
-                    continue;
-                }
-                any = true;
-                log::info!("Reaping leftover session process {} (signal {})", pid, sig);
-                unsafe {
-                    if hbb_common::libc::kill(pid as hbb_common::libc::pid_t, sig) != 0 {
-                        let err = std::io::Error::last_os_error();
-                        // ESRCH = it already exited (or did between snapshot and now).
-                        if err.raw_os_error() != Some(hbb_common::libc::ESRCH) {
-                            log::warn!("Failed to signal session process {}: {}", pid, err);
-                        }
-                    }
-                }
-            }
-            if !any {
-                break;
-            }
-            if sig == hbb_common::libc::SIGTERM {
-                std::thread::sleep(Duration::from_millis(300));
-            }
-        }
-    }
-
-    // a tracked --server child (the sudo wrapper run_as_user spawns) or any descendant of
-    // one: with use_pty sudo runs --cm-no-ui under a monitor with its own pid, so walk the
-    // parent chain (stopping at the --server) to spare the worker, not just the wrapper.
-    fn pid_is_spared(pid: u32, spared: &[u32], me: u32) -> bool {
-        let mut cur = pid;
-        for _ in 0..32 {
-            if spared.contains(&cur) {
-                return true;
-            }
-            if cur <= 1 || cur == me {
-                return false;
-            }
-            match Self::parent_pid(cur) {
-                Some(ppid) => cur = ppid,
-                None => return false,
-            }
-        }
-        false
-    }
-
-    fn parent_pid(pid: u32) -> Option<u32> {
-        // /proc/<pid>/stat is "pid (comm) state ppid ..."; comm can contain spaces and ')',
-        // so read the fields after the last ')'.
-        let stat = std::fs::read_to_string(format!("/proc/{}/stat", pid)).ok()?;
-        stat.rsplit_once(')')?
-            .1
-            .split_whitespace()
-            .nth(1)?
-            .parse()
-            .ok()
-    }
-
-    // collect every pid in the cgroup subtree rooted at dir. "cgroup.procs" lists only
-    // the procs directly in a cgroup, so recurse into child cgroup directories to catch
-    // processes the desktop session moved into descendant scopes.
-    fn collect_scope_pids(dir: &Path, out: &mut Vec<u32>) {
-        let procs = dir.join("cgroup.procs");
-        match std::fs::read_to_string(&procs) {
-            Ok(content) => {
-                out.extend(content.lines().filter_map(|l| l.trim().parse::<u32>().ok()));
-            }
-            Err(e) if e.kind() != std::io::ErrorKind::NotFound => {
-                log::warn!("Failed to read {}: {}", procs.display(), e);
-            }
-            Err(_) => {}
-        }
-        let entries = match std::fs::read_dir(dir) {
-            Ok(e) => e,
-            Err(e) if e.kind() != std::io::ErrorKind::NotFound => {
-                log::warn!("Failed to list cgroup dir {}: {}", dir.display(), e);
-                return;
-            }
-            Err(_) => return,
-        };
-        for entry in entries {
-            let entry = match entry {
-                Ok(entry) => entry,
-                Err(e) => {
-                    log::warn!("Failed to read entry under {}: {}", dir.display(), e);
-                    continue;
-                }
-            };
-            match entry.file_type() {
-                Ok(t) if t.is_dir() => Self::collect_scope_pids(&entry.path(), out),
-                Ok(_) => {}
-                Err(e) if e.kind() != std::io::ErrorKind::NotFound => {
-                    log::warn!("Failed to stat {}: {}", entry.path().display(), e);
-                }
-                Err(_) => {}
-            }
-        }
-    }
-
-    // a SIGKILL'd Xorg (how wait_x11_children_exit ends it) leaves "/tmp/.X<n>-lock" and
-    // "/tmp/.X11-unix/X<n>" behind, and get_avail_display() treats either file as "display
-    // in use", so the number is never reused and climbs until none are free
-    // (rustdesk/rustdesk#15183). a clean exit would remove them; do the same on teardown,
-    // but skip it if a live process still holds the lock: another server could have taken
-    // the number in the gap, and removing its files would break that display.
-    fn cleanup_x_display_files(display_num: u32) {
-        let lock = format!("/tmp/.X{}-lock", display_num);
-        if let Ok(content) = std::fs::read_to_string(&lock) {
-            if let Ok(pid) = content.trim().parse::<i32>() {
-                if Self::pid_alive(pid) {
-                    log::info!("X display {} still held by pid {}, leaving its files", display_num, pid);
-                    return;
-                }
-            }
-        }
-        for path in [lock, format!("/tmp/.X11-unix/X{}", display_num)] {
-            if let Err(e) = std::fs::remove_file(&path) {
-                if e.kind() != std::io::ErrorKind::NotFound {
-                    log::warn!("Failed to remove stale X file {}: {}", path, e);
-                }
-            }
-        }
-    }
-
-    // signal-0 probe: the pid exists if kill succeeds or fails with EPERM (alive but not
-    // ours); only ESRCH means it is gone.
-    fn pid_alive(pid: i32) -> bool {
-        unsafe {
-            if hbb_common::libc::kill(pid as hbb_common::libc::pid_t, 0) == 0 {
-                return true;
-            }
-        }
-        std::io::Error::last_os_error().raw_os_error() == Some(hbb_common::libc::EPERM)
-    }
-
-    const ORPHANED_SESSION_KEY: &'static str = "headless-orphaned-session";
-
-    fn save_orphaned_marker(scope_dir: &str, display_num: u32) {
-        // tag the marker with this boot's id: a logind session id is only unique within a
-        // boot (the counter lives in /run and resets), so recovery must not reap a recorded
-        // scope path after a reboot, when it may name a different live session.
-        let boot_id = Self::current_boot_id().unwrap_or_default();
-        hbb_common::config::LocalConfig::set_option(
-            Self::ORPHANED_SESSION_KEY.to_owned(),
-            format!("{};{};{}", scope_dir, display_num, boot_id),
-        );
-    }
-
-    fn current_boot_id() -> Option<String> {
-        std::fs::read_to_string("/proc/sys/kernel/random/boot_id")
-            .ok()
-            .map(|s| s.trim().to_owned())
-    }
-
-    fn clear_orphaned_marker() {
-        hbb_common::config::LocalConfig::set_option(
-            Self::ORPHANED_SESSION_KEY.to_owned(),
-            String::new(),
-        );
-    }
-
-    fn parse_orphaned_marker(marker: &str) -> Option<(&str, u32, &str)> {
-        let (rest, boot_id) = marker.rsplit_once(';')?;
-        let (scope_dir, display) = rest.rsplit_once(';')?;
-        Some((scope_dir, display.trim().parse::<u32>().ok()?, boot_id))
-    }
-
-    // a run that dies before wait_stop_x11 (service or --server crash) leaks the headless
-    // session scope + X lock files, the same as a missed teardown (rustdesk/rustdesk#15183).
-    // reap exactly what the dead run recorded - never a scan, so unrelated sessions are safe.
-    fn recover_orphaned_session() {
-        let marker = hbb_common::config::LocalConfig::get_option(Self::ORPHANED_SESSION_KEY);
-        if marker.is_empty() {
-            return;
-        }
-        if let Some((scope_dir, display_num, boot_id)) = Self::parse_orphaned_marker(&marker) {
-            // only reap the recorded scope when the marker is from this same boot: a leaked
-            // cgroup cannot outlive a reboot, so cross-boot there is nothing legitimate to
-            // reap, and the recorded "session-N.scope" may by then name a different live
-            // session. the X lock cleanup is pid-guarded, so run it either way.
-            let same_boot = Self::current_boot_id().map_or(false, |b| b == boot_id);
-            log::info!(
-                "Recovering leaked headless session from a previous run: scope {}, display {} (same boot: {})",
-                scope_dir,
-                display_num,
-                same_boot
-            );
-            if same_boot {
-                Self::reap_session_scope(scope_dir);
-            }
-            Self::cleanup_x_display_files(display_num);
-        }
-        Self::clear_orphaned_marker();
-    }
-
-    fn try_wait_stop_x11(
-        child_xorg: &mut Child,
-        child_wm: &mut Child,
-        scope_dir: &str,
-        display_num: u32,
-    ) -> bool {
+    fn try_wait_stop_x11(child_xorg: &mut Child, child_wm: &mut Child) -> bool {
        let mut desktop_manager = DESKTOP_MANAGER.lock().unwrap();
        let mut exited = true;
        if let Some(desktop_manager) = &mut (*desktop_manager) {
@@ -958,9 +677,6 @@ impl DesktopManager {
            if exited {
                log::debug!("Wait x11 children exiting");
                Self::wait_x11_children_exit(child_xorg, child_wm);
-                Self::reap_session_scope(scope_dir);
-                Self::cleanup_x_display_files(display_num);
-                Self::clear_orphaned_marker();
                desktop_manager
                    .is_child_running
                    .store(false, Ordering::SeqCst);
@@ -970,14 +686,9 @@ impl DesktopManager {
        exited
    }

-    fn wait_stop_x11(
-        mut child_xorg: Child,
-        mut child_wm: Child,
-        scope_dir: String,
-        display_num: u32,
-    ) {
+    fn wait_stop_x11(mut child_xorg: Child, mut child_wm: Child) {
        loop {
-            if Self::try_wait_stop_x11(&mut child_xorg, &mut child_wm, &scope_dir, display_num) {
+            if Self::try_wait_stop_x11(&mut child_xorg, &mut child_wm) {
                break;
            }
            std::thread::sleep(Duration::from_millis(super::SERVICE_INTERVAL));
@@ -1095,77 +806,3 @@ fn pam_get_service_name() -> String {
        "gdm".to_owned()
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn session_scope_truncates_at_first_scope() {
-        assert_eq!(
-            DesktopManager::session_scope("/user.slice/user-1000.slice/session-3.scope").as_deref(),
-            Some("/user.slice/user-1000.slice/session-3.scope")
-        );
-        // a nested child scope must not be mistaken for the session
-        assert_eq!(
-            DesktopManager::session_scope(
-                "/user.slice/user-1000.slice/session-3.scope/app-foo.scope"
-            )
-            .as_deref(),
-            Some("/user.slice/user-1000.slice/session-3.scope")
-        );
-        assert_eq!(
-            DesktopManager::session_scope(
-                "/user.slice/user-1000.slice/user@1000.service/app.slice/x.service"
-            ),
-            None
-        );
-        assert_eq!(DesktopManager::session_scope("/"), None);
-    }
-
-    #[test]
-    fn collect_scope_pids_walks_descendant_cgroups() {
-        // regression for #15183: pids in descendant cgroups must be collected too
-        let base = std::env::temp_dir().join(format!("rustdesk-cgtest-{}", std::process::id()));
-        let _ = std::fs::remove_dir_all(&base);
-        let scope = base.join("session-3.scope");
-        let child = scope.join("app-foo.scope");
-        let nested = child.join("deeper.scope");
-        std::fs::create_dir_all(&nested).unwrap();
-        std::fs::create_dir_all(scope.join("empty.scope")).unwrap();
-        std::fs::write(scope.join("cgroup.procs"), "100\n101\n").unwrap();
-        std::fs::write(scope.join("cgroup.controllers"), "memory pids\n").unwrap();
-        std::fs::write(child.join("cgroup.procs"), "200\n").unwrap();
-        std::fs::write(nested.join("cgroup.procs"), "300\n").unwrap();
-
-        let mut pids = Vec::new();
-        DesktopManager::collect_scope_pids(&scope, &mut pids);
-        pids.sort();
-        let _ = std::fs::remove_dir_all(&base);
-
-        assert_eq!(pids, vec![100, 101, 200, 300]);
-    }
-
-    #[test]
-    fn parses_orphaned_session_marker() {
-        assert_eq!(
-            DesktopManager::parse_orphaned_marker(
-                "/sys/fs/cgroup/user.slice/user-1000.slice/session-3.scope;7;abc-123"
-            ),
-            Some((
-                "/sys/fs/cgroup/user.slice/user-1000.slice/session-3.scope",
-                7,
-                "abc-123"
-            ))
-        );
-        // an empty scope still carries the display so its stale X lock can be cleaned
-        assert_eq!(DesktopManager::parse_orphaned_marker(";5;abc-123"), Some(("", 5, "abc-123")));
-        // an empty boot id never matches the live one, so the scope reap is skipped
-        assert_eq!(DesktopManager::parse_orphaned_marker("/scope;5;"), Some(("/scope", 5, "")));
-        assert_eq!(DesktopManager::parse_orphaned_marker(""), None);
-        assert_eq!(DesktopManager::parse_orphaned_marker("garbage"), None);
-        // the pre-boot-id two-field format no longer parses, recovery just skips it
-        assert_eq!(DesktopManager::parse_orphaned_marker("/scope;7"), None);
-        assert_eq!(DesktopManager::parse_orphaned_marker("/scope;notnum;abc"), None);
-    }
-}
@@ -4,14 +4,13 @@ use hbb_common::{allow_err, bail, log, ResultType};
 use std::{
    ffi::CString,
    io::Error,
-    mem::size_of,
    time::{Duration, Instant},
 };
 use winapi::{
    shared::{
-        minwindef::{BOOL, FALSE, LPARAM, TRUE},
+        minwindef::FALSE,
        ntdef::{HANDLE, NULL},
-        windef::{HDC, HMONITOR, HWND, RECT},
+        windef::HWND,
    },
    um::{
        handleapi::CloseHandle,
@@ -32,13 +31,7 @@ pub(super) const PRIVACY_MODE_IMPL: &str = "privacy_mode_impl_mag";
 pub const ORIGIN_PROCESS_EXE: &'static str = "C:\\Windows\\System32\\RuntimeBroker.exe";
 pub const WIN_TOPMOST_INJECTED_PROCESS_EXE: &'static str = "RuntimeBroker_rustdesk.exe";
 pub const INJECTED_PROCESS_EXE: &'static str = WIN_TOPMOST_INJECTED_PROCESS_EXE;
-pub(super) const PRIVACY_WINDOW_CLASS: &'static str = "RustDeskPrivacyWindowClass";
 pub(super) const PRIVACY_WINDOW_NAME: &'static str = "RustDeskPrivacyWindow";
-const PRIVACY_WINDOW_WAIT_MILLIS: u128 = 1_000;
-const PRIVACY_WINDOW_WAIT_EXTRA_MONITOR_MILLIS: u128 = 500;
-const PRIVACY_WINDOW_POLL_INTERVAL_MILLIS: u64 = 100;
-const WM_RUSTDESK_SHOW_WINDOWS: u32 = WM_APP + 3;
-const WM_RUSTDESK_HIDE_WINDOWS: u32 = WM_APP + 4;

 struct WindowHandlers {
    hthread: u64,
@@ -109,17 +102,22 @@ impl PrivacyMode for PrivacyModeImpl {
            );
        }

-        let should_start_broker = self.handlers.is_default();
-        if should_start_broker {
-            log::info!("turn_on_privacy, broker not running, try start");
+        if self.handlers.is_default() {
+            log::info!("turn_on_privacy, dll not found when started, try start");
            self.start()?;
            std::thread::sleep(std::time::Duration::from_millis(1_000));
        }

-        if let Err(e) = self.show_privacy_windows(conn_id, true) {
-            self.stop();
-            return Err(e);
+        let hwnd = wait_find_privacy_hwnd(0)?;
+        if hwnd.is_null() {
+            bail!("No privacy window created");
        }
+        super::win_input::hook()?;
+        unsafe {
+            ShowWindow(hwnd as _, SW_SHOW);
+        }
+        self.conn_id = conn_id;
+        self.hwnd = hwnd as _;
        Ok(true)
    }

@@ -130,33 +128,27 @@ impl PrivacyMode for PrivacyModeImpl {
    ) -> ResultType<()> {
        self.check_off_conn_id(conn_id)?;
        super::win_input::unhook()?;
-        let hwnds = find_privacy_hwnds()?;
-        let hide_result = set_privacy_windows_visible(&hwnds, false);
-        if hide_result.is_err() {
-            self.stop();
+
+        unsafe {
+            let hwnd = wait_find_privacy_hwnd(0)?;
+            if !hwnd.is_null() {
+                ShowWindow(hwnd, SW_HIDE);
+            }
        }

-        // Continue local state cleanup even after stop(); the broker has
-        // been torn down, so keeping conn_id/hwnd would leave stale state.
        if self.conn_id != INVALID_PRIVACY_MODE_CONN_ID {
-            // Only publish the off state after the hide message was posted.
-            // Otherwise the peer may receive a success-like state and then a
-            // failed turn-off response for the same request.
-            if hide_result.is_ok() {
-                if let Some(state) = state {
-                    allow_err!(super::set_privacy_mode_state(
-                        conn_id,
-                        state,
-                        PRIVACY_MODE_IMPL.to_string(),
-                        1_000
-                    ));
-                }
+            if let Some(state) = state {
+                allow_err!(super::set_privacy_mode_state(
+                    conn_id,
+                    state,
+                    PRIVACY_MODE_IMPL.to_string(),
+                    1_000
+                ));
            }
            self.conn_id = INVALID_PRIVACY_MODE_CONN_ID.to_owned();
-            self.hwnd = 0;
        }

-        hide_result.map(|_| ())
+        Ok(())
    }

    #[inline]
@@ -214,7 +206,8 @@ impl PrivacyModeImpl {
            );
        }

-        if wait_find_privacy_hwnds(PRIVACY_WINDOW_WAIT_MILLIS).is_ok() {
+        let hwnd = wait_find_privacy_hwnd(1_000)?;
+        if !hwnd.is_null() {
            log::info!("Privacy window is ready");
            return Ok(());
        }
@@ -283,19 +276,14 @@ impl PrivacyModeImpl {
                );
            };

-            if let Err(e) = inject_dll(
+            inject_dll(
                proc_info.hProcess,
                proc_info.hThread,
                dll_file.to_string_lossy().as_ref(),
-            ) {
-                TerminateProcess(proc_info.hProcess, 0);
-                CloseHandle(proc_info.hThread);
-                CloseHandle(proc_info.hProcess);
-                return Err(e);
-            }
+            )?;

            if 0xffffffff == ResumeThread(proc_info.hThread) {
-                TerminateProcess(proc_info.hProcess, 0);
+                // CloseHandle
                CloseHandle(proc_info.hThread);
                CloseHandle(proc_info.hProcess);

@@ -308,9 +296,9 @@ impl PrivacyModeImpl {
            self.handlers.hthread = proc_info.hThread as _;
            self.handlers.hprocess = proc_info.hProcess as _;

-            if let Err(e) = wait_find_privacy_hwnds(PRIVACY_WINDOW_WAIT_MILLIS) {
-                self.handlers.reset();
-                return Err(e);
+            let hwnd = wait_find_privacy_hwnd(1_000)?;
+            if hwnd.is_null() {
+                bail!("Failed to get hwnd after started");
            }
        }

@@ -321,49 +309,6 @@ impl PrivacyModeImpl {
    pub fn stop(&mut self) {
        self.handlers.reset();
    }
-
-    fn show_privacy_windows(&mut self, conn_id: i32, hook_input: bool) -> ResultType<()> {
-        let hwnds = wait_find_privacy_hwnds(PRIVACY_WINDOW_WAIT_MILLIS)?;
-        if hwnds.is_empty() {
-            bail!("No privacy window created");
-        }
-
-        if hook_input {
-            super::win_input::hook()?;
-        }
-        match set_privacy_windows_visible(&hwnds, true) {
-            Ok(_) => {
-                let visible_hwnds =
-                    match wait_find_visible_privacy_hwnds(PRIVACY_WINDOW_WAIT_MILLIS) {
-                        Ok(hwnds) => hwnds,
-                        Err(e) => {
-                            allow_err!(set_privacy_windows_visible(&hwnds, false));
-                            if hook_input {
-                                allow_err!(super::win_input::unhook());
-                            }
-                            return Err(e);
-                        }
-                    };
-                let Some(hwnd) = visible_hwnds.first() else {
-                    allow_err!(set_privacy_windows_visible(&hwnds, false));
-                    if hook_input {
-                        allow_err!(super::win_input::unhook());
-                    }
-                    bail!("No visible privacy window created");
-                };
-                self.conn_id = conn_id;
-                self.hwnd = *hwnd as _;
-                Ok(())
-            }
-            Err(e) => {
-                allow_err!(set_privacy_windows_visible(&hwnds, false));
-                if hook_input {
-                    allow_err!(super::win_input::unhook());
-                }
-                Err(e)
-            }
-        }
-    }
 }

 impl Drop for PrivacyModeImpl {
@@ -418,217 +363,21 @@ unsafe fn inject_dll<'a>(hproc: HANDLE, hthread: HANDLE, dll_file: &'a str) -> R
    Ok(())
 }

-fn wait_find_privacy_hwnds(msecs: u128) -> ResultType<Vec<HWND>> {
-    wait_find_privacy_hwnds_impl(msecs, false)
-}
-
-fn wait_find_visible_privacy_hwnds(msecs: u128) -> ResultType<Vec<HWND>> {
-    wait_find_privacy_hwnds_impl(msecs, true)
-}
-
-fn privacy_window_wait_millis(base_millis: u128, monitor_count: usize) -> u128 {
-    if base_millis == 0 {
-        return 0;
-    }
-    // Privacy Mode 1 creates one overlay per monitor. Keep the single-monitor
-    // wait as the base and add time for each extra overlay before coverage
-    // verification times out.
-    base_millis
-        + (monitor_count.saturating_sub(1) as u128) * PRIVACY_WINDOW_WAIT_EXTRA_MONITOR_MILLIS
-}
-
-fn wait_find_privacy_hwnds_impl(msecs: u128, require_visible: bool) -> ResultType<Vec<HWND>> {
-    // This verifies initial turn-on coverage. If displays change during this
-    // short poll window, the DLL refreshes overlays asynchronously, while this
-    // check may still time out against the geometry sampled here.
-    let monitor_rects = get_monitor_rects()?;
-    if monitor_rects.is_empty() {
-        bail!("No privacy monitor found");
-    }
-    let msecs = privacy_window_wait_millis(msecs, monitor_rects.len());
-
+pub(super) fn wait_find_privacy_hwnd(msecs: u128) -> ResultType<HWND> {
    let tm_begin = Instant::now();
+    let wndname = CString::new(PRIVACY_WINDOW_NAME)?;
    loop {
-        let hwnds = find_privacy_hwnds()?;
-        let visible_hwnds = if require_visible {
-            filter_visible_hwnds(&hwnds)
-        } else {
-            Vec::new()
-        };
-        let covered_hwnds = if require_visible {
-            visible_hwnds.as_slice()
-        } else {
-            hwnds.as_slice()
-        };
-        let covered = count_covered_monitors(covered_hwnds, &monitor_rects);
-        if covered == monitor_rects.len() {
-            return Ok(if require_visible {
-                visible_hwnds
-            } else {
-                hwnds
-            });
+        unsafe {
+            let hwnd = FindWindowA(NULL as _, wndname.as_ptr() as _);
+            if !hwnd.is_null() {
+                return Ok(hwnd);
+            }
        }

        if msecs == 0 || tm_begin.elapsed().as_millis() > msecs {
-            let visible = if require_visible { "visible " } else { "" };
-            bail!(
-                "Expected {}privacy windows to cover {} monitors, covered {}, found {}",
-                visible,
-                monitor_rects.len(),
-                covered,
-                hwnds.len(),
-            );
+            return Ok(NULL as _);
        }

-        std::thread::sleep(Duration::from_millis(PRIVACY_WINDOW_POLL_INTERVAL_MILLIS));
+        std::thread::sleep(Duration::from_millis(100));
    }
 }
-
-fn find_privacy_hwnds() -> ResultType<Vec<HWND>> {
-    let class_name = CString::new(PRIVACY_WINDOW_CLASS)?;
-    let wndname = CString::new(PRIVACY_WINDOW_NAME)?;
-    let mut hwnds = Vec::new();
-    unsafe {
-        let mut after = NULL as _;
-        loop {
-            let hwnd = FindWindowExA(
-                NULL as _,
-                after,
-                class_name.as_ptr() as _,
-                wndname.as_ptr() as _,
-            );
-            if hwnd.is_null() {
-                break;
-            }
-            hwnds.push(hwnd);
-            after = hwnd;
-        }
-    }
-    Ok(hwnds)
-}
-
-fn filter_visible_hwnds(hwnds: &[HWND]) -> Vec<HWND> {
-    hwnds
-        .iter()
-        .copied()
-        .filter(|hwnd| unsafe { FALSE != IsWindowVisible(*hwnd) })
-        .collect()
-}
-
-fn set_privacy_windows_visible(hwnds: &[HWND], show: bool) -> ResultType<usize> {
-    if hwnds.is_empty() {
-        return Ok(0);
-    };
-    let message = if show {
-        WM_RUSTDESK_SHOW_WINDOWS
-    } else {
-        WM_RUSTDESK_HIDE_WINDOWS
-    };
-    let mut posted = 0;
-    let mut first_error = None;
-    for &hwnd in hwnds {
-        unsafe {
-            if FALSE == PostMessageA(hwnd, message, 0, 0) {
-                if first_error.is_none() {
-                    first_error = Some(Error::last_os_error());
-                }
-            } else {
-                posted += 1;
-            }
-        }
-    }
-    if let Some(error) = first_error {
-        bail!(
-            "Failed to post privacy window visibility message to all privacy windows, posted {}/{}, first error {}",
-            posted,
-            hwnds.len(),
-            error,
-        );
-    }
-    Ok(posted)
-}
-
-fn get_monitor_rects() -> ResultType<Vec<RECT>> {
-    let mut rects = Vec::new();
-    unsafe {
-        if FALSE
-            == EnumDisplayMonitors(
-                NULL as _,
-                NULL as _,
-                Some(enum_monitor_rect_proc),
-                &mut rects as *mut Vec<RECT> as LPARAM,
-            )
-        {
-            bail!(
-                "Failed EnumDisplayMonitors, error {}",
-                Error::last_os_error()
-            );
-        }
-    }
-    Ok(rects)
-}
-
-unsafe extern "system" fn enum_monitor_rect_proc(
-    hmon: HMONITOR,
-    _hdc: HDC,
-    _rect: *mut RECT,
-    lparam: LPARAM,
-) -> BOOL {
-    let rects = &mut *(lparam as *mut Vec<RECT>);
-    let mut monitor_info = MONITORINFO {
-        cbSize: size_of::<MONITORINFO>() as _,
-        rcMonitor: RECT {
-            left: 0,
-            top: 0,
-            right: 0,
-            bottom: 0,
-        },
-        rcWork: RECT {
-            left: 0,
-            top: 0,
-            right: 0,
-            bottom: 0,
-        },
-        dwFlags: 0,
-    };
-    if FALSE == GetMonitorInfoA(hmon, &mut monitor_info) {
-        return FALSE;
-    }
-    rects.push(monitor_info.rcMonitor);
-    TRUE
-}
-
-fn count_covered_monitors(hwnds: &[HWND], monitor_rects: &[RECT]) -> usize {
-    let mut covered = 0;
-    for monitor_rect in monitor_rects {
-        for hwnd in hwnds {
-            let mut window_rect = RECT {
-                left: 0,
-                top: 0,
-                right: 0,
-                bottom: 0,
-            };
-            unsafe {
-                if FALSE == GetWindowRect(*hwnd, &mut window_rect) {
-                    log::warn!(
-                        "Failed GetWindowRect for privacy window, error {}",
-                        Error::last_os_error()
-                    );
-                    continue;
-                }
-            }
-            if rect_covers(&window_rect, monitor_rect) {
-                covered += 1;
-                break;
-            }
-        }
-    }
-    covered
-}
-
-fn rect_covers(window_rect: &RECT, monitor_rect: &RECT) -> bool {
-    window_rect.left <= monitor_rect.left
-        && window_rect.top <= monitor_rect.top
-        && window_rect.right >= monitor_rect.right
-        && window_rect.bottom >= monitor_rect.bottom
-}
@@ -1,7 +1,7 @@
 /// Url handler based on dbus
 ///
 /// Note:
-/// On linux, we use dbus to communicate between multiple rustdesk processes.
+/// On linux, we use dbus to communicate multiple rustdesk process.
 /// [Flutter]: handle uni links for linux
 use dbus::blocking::Connection;
 use dbus_crossroads::{Crossroads, IfaceBuilder};
@@ -272,10 +272,6 @@ fn create_capturer(
    if privacy_mode_id > 0 {
        #[cfg(windows)]
        {
-            // Windows Mode 1 can cover every local monitor with overlay windows,
-            // but the legacy magnifier capture backend is still single-monitor
-            // constrained. Keep display-switch gating aligned with that backend
-            // limit, not just the overlay coverage.
            if let Some(c1) = crate::privacy_mode::win_mag::create_capturer(
                privacy_mode_id,
                display.origin(),
@@ -902,10 +902,8 @@ pub fn get_async_job_status() -> String {
 #[inline]
 pub fn get_langs() -> String {
    use serde_json::json;
-    let hide_cjk = crate::lang::cjk_ui_unavailable();
    let mut x: Vec<(&str, String)> = crate::lang::LANGS
        .iter()
-        .filter(|a| !hide_cjk || !crate::lang::is_cjk_lang(a.0))
        .map(|a| (a.0, format!("{} ({})", a.1, a.0)))
        .collect();
    x.sort_by(|a, b| a.0.cmp(b.0));
@@ -20,11 +20,6 @@
      "name": "libjpeg-turbo",
      "host": false
    },
-    {
-      "name": "libsodium",
-      "host": false,
-      "platform": "windows & arm64"
-    },
    {
      "name": "oboe",
      "platform": "android"
@@ -69,15 +64,15 @@
      "features": [
        {
          "name": "amf",
-          "platform": "(((windows & !arm) | linux) & static)"
+          "platform": "((windows | linux) & static)"
        },
        {
          "name": "nvcodec",
-          "platform": "(((windows & !arm) | linux) & static)"
+          "platform": "((windows | linux) & static)"
        },
        {
          "name": "qsv",
-          "platform": "(windows & !arm & static)"
+          "platform": "(windows & static)"
        }
      ],
      "platform": "((windows | (linux & !arm32) | osx) & static)"