port forward: a channel id still live when the counter comes round is skipped

The controller handed out `next_id` unchecked. 2^32 opens later it lands on a channel still up: the entry here was replaced, while the peer, which ignores an `open` for a live id, kept routing that id to the old socket, so the new local connection's bytes went into the old target connection. The id is now taken under the map's lock and advanced past any id in use. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01EZ49AbZJYfm8NTp5yDPMab
port forward: a tunnel's TCP stream refuses packets over twice MAX_FRAME
2026-09-17 09:51:02 +03:00 · 2026-09-05 14:29:52 +08:00 · 2026-09-05 14:03:41 +08:00 · 2026-09-05 13:47:42 +08:00 · 2026-09-05 13:40:20 +08:00 · 2026-09-05 13:40:20 +08:00
110 changed files with 7815 additions and 3612 deletions
--- a/.github/workflows/flutter-build.yml
+++ b/.github/workflows/flutter-build.yml
@@ -43,6 +43,7 @@ env:
  #  https://github.com/rustdesk/rustdesk/actions/runs/14414119794/job/40427970174
  # 2. Update the `VCPKG_COMMIT_ID` in `ci.yml` and `playground.yml`.
  VCPKG_COMMIT_ID: "9e593bb18ea69cc5095e012465dcd675a822ed0d"
+  VCPKG_CMAKE_VERSION: "4.3.0"
  ARMV7_VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836" # 2025.01.13, got "/opt/artifacts/vcpkg/vcpkg: No such file or directory" with latest version
  VERSION: "1.5.0"
  NDK_VERSION: "r28c"
@@ -389,6 +390,54 @@ jobs:
          mv $msi.FullName ../../SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.msi
          sha256sum ../../SignOutput/rustdesk-*.msi

+      - name: Build pre-built MSI template
+        # Two things this works around: preprocess.py rewrites res/msi in place, so the
+        # tree is reset around this second variant; and it locates the app as
+        # <app-name>.exe inside the dist, so the dist copy is renamed to match.
+        #
+        # The placeholder is chosen to keep this template as close to the shipped msi as
+        # possible: eight characters like "RustDesk", and a valid 8.3 name, so WiX
+        # derives no short name for it. A longer placeholder would get one, and a patch
+        # cannot rewrite a truncated placeholder, leaving short names pointing at it.
+        #
+        # It still has to be unique, which is why "RustDesk" itself cannot be used:
+        # it also names payload that must never be renamed, such as librustdesk.dll
+        # and drivers\RustDeskPrinterDriver.
+        #
+        #
+        # Building the arm64 template on the native arm64 runner makes the ARM
+        # package available: the build agents are x64 and cannot run
+        # preprocess.py against an ARM exe.
+        if: env.UPLOAD_ARTIFACT == 'true'
+        run: |
+          git checkout -- res/msi
+          cp -r ./rustdesk ./rustdesk-msi-template
+          mv ./rustdesk-msi-template/rustdesk.exe ./rustdesk-msi-template/RDAPPNAM.exe
+          Set-Content -Path ./rustdesk-msi-template/custom.txt -Value 'placeholder' -NoNewline
+          $assets = './rustdesk-msi-template/data/flutter_assets/assets'
+          New-Item -ItemType Directory -Force -Path $assets | Out-Null
+          foreach ($a in 'icon.ico','icon.png','logo.png','logo_light.png','logo_dark.png') {
+            Set-Content -Path "$assets/$a" -Value 'placeholder' -NoNewline
+          }
+          pushd ./res/msi
+          python preprocess.py --arp --template --revision-version 0 -d ../../rustdesk-msi-template --app-name RDAPPNAM
+          $msiPlatform = if ('${{ matrix.job.arch }}' -eq 'aarch64') { 'ARM64' } else { 'x64' }
+          msbuild msi.sln -t:clean -p:Configuration=Release -p:Platform=$msiPlatform
+          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
+          popd
+          mkdir ./msi-template
+          mv $msi.FullName ./msi-template/rustdesk-template-${{ matrix.job.arch }}.msi
+          git checkout -- res/msi
+          rm -r -fo ./rustdesk-msi-template
+
+      - name: Upload unsigned msi template
+        if: env.UPLOAD_ARTIFACT == 'true'
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: rustdesk-unsigned-msi-template-${{ matrix.job.arch }}
+          path: ./msi-template
+
      - name: Sign rustdesk self-extracted file
        if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != '-2'
        shell: bash
@@ -925,15 +974,33 @@ jobs:
          name: rustdesk-unsigned-windows-x86_64
          path: ./windows-x86_64/

+      - name: Download Artifacts
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: rustdesk-unsigned-windows-aarch64
+          path: ./windows-aarch64/
+
      - name: Download Artifacts
        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
        with:
          name: rustdesk-unsigned-windows-x86
          path: ./windows-x86/

+      - name: Download Artifacts
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: rustdesk-unsigned-msi-template-x86_64
+          path: ./msi-template/
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          name: rustdesk-unsigned-msi-template-aarch64
+          path: ./msi-template/
+
      - name: Combine unsigned app
        run: |
-          tar czf rustdesk-${{ env.VERSION }}-unsigned.tar.gz *.dmg windows-x86_64 windows-x86
+          tar czf rustdesk-${{ env.VERSION }}-unsigned.tar.gz *.dmg windows-x86_64 windows-aarch64 windows-x86 msi-template

      - name: Publish unsigned app
        uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
@@ -1470,7 +1537,6 @@ jobs:
          submodules: recursive

      - name: Set Swap Space
-        if: ${{ matrix.job.arch == 'x86_64' }}
        uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0
        with:
          swap-size-gb: 12
@@ -1505,6 +1571,15 @@ jobs:
          name: bridge-artifact
          path: ./

+      # vcpkg 2026.07.29's SPDX scripts require CMake 4.3+, but this ARM64 runner selects CMake 3.31.
+      - name: Install CMake for vcpkg on Linux ARM64
+        if: matrix.job.arch == 'aarch64' && env.UPLOAD_ARTIFACT == 'true'
+        run: |
+          python3 -m pip install --user "cmake==${VCPKG_CMAKE_VERSION}"
+          user_base="$(python3 -m site --user-base)"
+          "${user_base}/bin/cmake" --version
+          echo "${user_base}/bin" >> "${GITHUB_PATH}"
+
      - name: Setup vcpkg with Github Actions binary cache
        if: matrix.job.arch == 'x86_64' || env.UPLOAD_ARTIFACT == 'true'
        uses: lukka/run-vcpkg@b1a0dd252f06b9e25b3c022a9a03bd7a427fb6a2 # v11
@@ -2075,6 +2150,12 @@ jobs:
          echo "Modified vcpkg.json for armv7 build:"
          grep -A 2 -B 2 '"baseline"' vcpkg.json

+      - name: Set Swap Space
+        if: matrix.job.arch == 'armv7'
+        uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0
+        with:
+          swap-size-gb: 12
+
      - name: Free Space
        run: |
          df -h
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -74,6 +74,25 @@
 * Accept a little duplication over a restructure. A new function that repeats a few lines of an existing one is a better diff than reshaping the original so both can share it.
 * Put new logic in self-contained functions in the module it belongs to (platform-specific logic in `src/platform/`, with `use` inside the function body to avoid churning shared import blocks). Call sites in shared files (`src/tray.rs`, `src/core_main.rs`, `src/server/connection.rs`, …) should be thin one-line hooks.

+### Scope check before touching shared code
+
+* Before changing a shared trait, a shared struct, or the signature of a widely used function, check whether the bug or feature is specific to one path. If it is, keep the change inside that path unless that is impossible, and say in the PR why it was.
+* If an unrelated caller needs `Default::default()`, `None`, or another placeholder solely to satisfy a signature you changed, the diff is too broad: stop and redesign.
+* The expected shape of a fix is a new function in the feature's own module, plus at most a new field or a thin hook in the shared code it needs. Feature-specific state belongs beside the feature's existing state, not in a new abstraction every caller has to learn.
+
+### Mandatory regression-surface check
+
+Before considering any implementation complete, perform a minimization pass over the final diff.
+
+* Inspect every modified existing file and every modified existing code path. Each must be strictly necessary for the requested change. Revert changes that are merely cleanup, refactoring, consistency improvements, or fixes for pre-existing issues.
+* For new features, preserve the existing implementation path when the feature is disabled or unsupported whenever practical. `feature off` should run the old code, not a rewritten equivalent.
+* Do not route existing behavior through a new abstraction merely to share code with the new feature. Prefer a parallel new function or a small amount of duplication over changing a proven existing path.
+* Keep new implementation logic in new or feature-specific modules. Changes to shared/core files should normally be thin hooks, capability checks, or protocol plumbing.
+* Do not fix unrelated pre-existing bugs in the same PR. Put them in a separate change unless they directly block correctness or security of the requested work.
+* For submodule bumps, inspect the exact commit range and ensure unrelated changes are not being pulled into the parent PR.
+* Before finalizing, explicitly report the regression surface: list the existing files and existing runtime paths whose behavior changed, and explain why each change is unavoidable.
+* During review, treat an unnecessarily modified legacy path as a review finding even if tests pass and the rewritten behavior appears equivalent.
+
 ## Reviewing a PR

 * Review only what the diff introduces. Verify ownership with `gh pr diff` before reporting a finding — if the offending lines are untouched context, it is a pre-existing problem, not this PR's.
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -753,6 +753,24 @@ dependencies = [
 "syn 2.0.98",
 ]

+[[package]]
+name = "bindgen"
+version = "0.71.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+dependencies = [
+ "bitflags 2.9.1",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.12.1",
+ "proc-macro2 1.0.93",
+ "quote 1.0.36",
+ "regex",
+ "rustc-hash 2.1.1",
+ "shlex",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -1143,6 +1161,30 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"

+[[package]]
+name = "chacha20"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
+dependencies = [
+ "cfg-if 1.0.0",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "chacha20poly1305"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
+dependencies = [
+ "aead",
+ "chacha20",
+ "cipher",
+ "poly1305",
+ "zeroize",
+]
+
 [[package]]
 name = "chrono"
 version = "0.4.41"
@@ -1192,6 +1234,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
 "crypto-common",
 "inout",
+ "zeroize",
 ]

 [[package]]
@@ -2281,7 +2324,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]]
@@ -2399,6 +2442,42 @@ dependencies = [
 "linux-raw-sys 0.6.5",
 ]

+[[package]]
+name = "dtls"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f531dd7c181beaf3cebab3716afa4d0d41ab888be85232583f56bbaf07ca208a"
+dependencies = [
+ "aes",
+ "aes-gcm",
+ "async-trait",
+ "bincode",
+ "byteorder",
+ "cbc",
+ "ccm",
+ "chacha20poly1305",
+ "der-parser",
+ "hmac",
+ "log",
+ "p256",
+ "p384",
+ "portable-atomic",
+ "rand 0.9.2",
+ "rand_core 0.6.4",
+ "rcgen",
+ "ring",
+ "rustls",
+ "sec1",
+ "serde 1.0.228",
+ "sha1",
+ "sha2",
+ "thiserror 1.0.61",
+ "tokio",
+ "webrtc-util",
+ "x25519-dalek",
+ "x509-parser",
+]
+
 [[package]]
 name = "dtoa"
 version = "0.4.8"
@@ -2784,7 +2863,7 @@ dependencies = [
 "is-terminal",
 "lazy_static",
 "log",
- "nu-ansi-term",
+ "nu-ansi-term 0.49.0",
 "regex",
 "thiserror 1.0.61",
 ]
@@ -4098,15 +4177,16 @@ dependencies = [

 [[package]]
 name = "interceptor"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ac0781c825d602095113772e389ef0607afcb869ae0e68a590d8e0799cdcef8"
+checksum = "ea51375727680dc15f06e8ad90fa31df75d79dd030100e8ad60eef1c27fe2c98"
 dependencies = [
 "async-trait",
 "bytes",
+ "futures",
 "log",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "rtcp",
 "rtp",
 "thiserror 1.0.61",
@@ -4258,11 +4338,11 @@ dependencies = [
 [[package]]
 name = "kcp-sys"
 version = "0.1.0"
-source = "git+https://github.com/rustdesk-org/kcp-sys?branch=rustdesk-patches#023a0065398968989f2ddfcf5cc72bb886d02675"
+source = "git+https://github.com/rustdesk-org/kcp-sys#32a6c09fc6223f54aea83981a6aa8995931d29be"
 dependencies = [
 "anyhow",
 "auto_impl",
- "bindgen 0.72.1",
+ "bindgen 0.71.1",
 "bitflags 2.9.1",
 "bytes",
 "cc",
@@ -4273,6 +4353,8 @@ dependencies = [
 "thiserror 2.0.17",
 "tokio",
 "tokio-util",
+ "tracing",
+ "tracing-subscriber",
 "zerocopy 0.7.34",
 ]

@@ -4406,7 +4488,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]]
@@ -5128,6 +5210,16 @@ dependencies = [
 "winapi 0.3.9",
 ]

+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi 0.3.9",
+]
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.49.0"
@@ -5791,6 +5883,12 @@ dependencies = [
 "serde_json 1.0.118",
 ]

+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "owned_ttf_parser"
 version = "0.25.1"
@@ -6179,6 +6277,17 @@ dependencies = [
 "windows-sys 0.52.0",
 ]

+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
 [[package]]
 name = "polyval"
 version = "0.6.2"
@@ -6985,9 +7094,9 @@ dependencies = [

 [[package]]
 name = "rtcp"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9689528bf3a9eb311fd938d05516dd546412f9ce4fffc8acfc1db27cc3dbf72"
+checksum = "81d30d1c4091644431c22acf9f8be6191b56805e0e977f15ca7104b4a6d6eaec"
 dependencies = [
 "bytes",
 "thiserror 1.0.61",
@@ -6996,14 +7105,14 @@ dependencies = [

 [[package]]
 name = "rtp"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54733451a67d76caf9caa07a7a2cec6871ea9dda92a7847f98063d459200f4b"
+checksum = "2f126f38ea84c02480e32e547c1459a939052f74fb92117ac3eef23fdac6b023"
 dependencies = [
 "bytes",
 "memchr",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "serde 1.0.228",
 "thiserror 1.0.61",
 "webrtc-util",
@@ -7438,11 +7547,11 @@ dependencies = [

 [[package]]
 name = "sdp"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd277015eada44a0bb810a4b84d3bf6e810573fa62fb442f457edf6a1087a69"
+checksum = "32c374dceda16965d541c8800ce9cc4e1c14acfd661ddf7952feeedc3411e5c6"
 dependencies = [
- "rand 0.8.5",
+ "rand 0.9.2",
 "substring",
 "thiserror 1.0.61",
 "url",
@@ -7672,6 +7781,15 @@ dependencies = [
 "tzdb 0.5.10",
 ]

+[[package]]
+name = "sharded-slab"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -8011,15 +8129,15 @@ dependencies = [

 [[package]]
 name = "stun"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dbc2bab375524093c143dc362a03fb6a1fb79e938391cdb21665688f88a088a"
+checksum = "1a512c5d501e3e3b5a4bb3e8e31462d56d54a66b95a28b8596e14422bf21c32b"
 dependencies = [
 "base64 0.22.1",
 "crc",
 "lazy_static",
 "md-5",
- "rand 0.8.5",
+ "rand 0.9.2",
 "ring",
 "subtle",
 "thiserror 1.0.61",
@@ -8401,6 +8519,16 @@ dependencies = [
 "syn 2.0.98",
 ]

+[[package]]
+name = "thread_local"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+dependencies = [
+ "cfg-if 1.0.0",
+ "once_cell",
+]
+
 [[package]]
 name = "threadpool"
 version = "1.8.1"
@@ -8780,6 +8908,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
 "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
+dependencies = [
+ "nu-ansi-term 0.46.0",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
 ]

 [[package]]
@@ -8894,9 +9048,9 @@ dependencies = [

 [[package]]
 name = "turn"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f5aea1116456e1da71c45586b87c72e3b43164fbf435eb93ff6aa475416a9a4"
+checksum = "5ed995882f66ab94238de77c62e5e778389698ab700afa4696f4754da8f457cb"
 dependencies = [
 "async-trait",
 "base64 0.22.1",
@@ -8904,7 +9058,7 @@ dependencies = [
 "log",
 "md-5",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "ring",
 "stun",
 "thiserror 1.0.61",
@@ -9030,6 +9184,12 @@ dependencies = [
 "unic-common",
 ]

+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
 [[package]]
 name = "unicode-bidi"
 version = "0.3.15"
@@ -9175,6 +9335,12 @@ dependencies = [
 "bindgen 0.65.1",
 ]

+[[package]]
+name = "valuable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -9558,26 +9724,25 @@ dependencies = [

 [[package]]
 name = "webrtc"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24bab7195998d605c862772f90a452ba655b90a2f463c850ac032038890e367a"
+checksum = "08fd686c0920ac08f3a57eacc48e31f0e4ca1ffefba4478784606f78c14e83ad"
 dependencies = [
 "arc-swap",
 "async-trait",
 "bytes",
- "cfg-if 1.0.0",
+ "dtls",
 "hex",
 "interceptor",
 "lazy_static",
 "log",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "rcgen",
 "regex",
 "ring",
 "rtcp",
 "rtp",
- "rustls",
 "sdp",
 "serde 1.0.228",
 "serde_json 1.0.118",
@@ -9585,13 +9750,12 @@ dependencies = [
 "smol_str",
 "stun",
 "thiserror 1.0.61",
- "time 0.3.36",
 "tokio",
 "turn",
+ "unicase",
 "url",
 "waitgroup",
 "webrtc-data",
- "webrtc-dtls",
 "webrtc-ice",
 "webrtc-mdns",
 "webrtc-media",
@@ -9602,9 +9766,9 @@ dependencies = [

 [[package]]
 name = "webrtc-data"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e97b932854da633a767eff0cc805425a2222fc6481e96f463e57b015d949d1d"
+checksum = "062a5438d63bb0756a221693d76cc0dd6119affee1dfdfe57abe3a2a8c8b3eea"
 dependencies = [
 "bytes",
 "log",
@@ -9615,55 +9779,18 @@ dependencies = [
 "webrtc-util",
 ]

-[[package]]
-name = "webrtc-dtls"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ccbe4d9049390ab52695c3646c1395c877e16c15fb05d3bda8eee0c7351711c"
-dependencies = [
- "aes",
- "aes-gcm",
- "async-trait",
- "bincode",
- "byteorder",
- "cbc",
- "ccm",
- "der-parser",
- "hkdf",
- "hmac",
- "log",
- "p256",
- "p384",
- "portable-atomic",
- "rand 0.8.5",
- "rand_core 0.6.4",
- "rcgen",
- "ring",
- "rustls",
- "sec1",
- "serde 1.0.228",
- "sha1",
- "sha2",
- "subtle",
- "thiserror 1.0.61",
- "tokio",
- "webrtc-util",
- "x25519-dalek",
- "x509-parser",
-]
-
 [[package]]
 name = "webrtc-ice"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb51bde0d790f109a15bfe4d04f1b56fb51d567da231643cb3f21bb74d678997"
+checksum = "69cb13fd1a373e68addc4bba0c8ca058627518e54342583d024bdcbb8ae5d97d"
 dependencies = [
 "arc-swap",
 "async-trait",
 "crc",
 "log",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "serde 1.0.228",
 "serde_json 1.0.118",
 "stun",
@@ -9679,9 +9806,9 @@ dependencies = [

 [[package]]
 name = "webrtc-mdns"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "979cc85259c53b7b620803509d10d35e2546fa505d228850cbe3f08765ea6ea8"
+checksum = "a17279a067e75df72ce923fdeb7f04cd808f6f5aa4910dc6bcb4fbe66b396ace"
 dependencies = [
 "log",
 "socket2 0.5.10",
@@ -9692,21 +9819,22 @@ dependencies = [

 [[package]]
 name = "webrtc-media"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80041211deccda758a3e19aa93d6b10bc1d37c9183b519054b40a83691d13810"
+checksum = "94a84c910fec0848fd5a0d8a5651e0ddbdedaf25a7d3ae3f0b15f71ac73a1773"
 dependencies = [
 "byteorder",
 "bytes",
- "rand 0.8.5",
+ "rand 0.9.2",
 "rtp",
 "thiserror 1.0.61",
 ]

 [[package]]
 name = "webrtc-sctp"
-version = "0.12.0"
-source = "git+https://github.com/rustdesk-org/webrtc?rev=825a0a4862818f74406d8e1cc25be72259228235#825a0a4862818f74406d8e1cc25be72259228235"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f985465467d8910c1f8ac4382cd64f83b1f6a1a75021a82b221546f6fb3b856f"
 dependencies = [
 "arc-swap",
 "async-trait",
@@ -9714,7 +9842,7 @@ dependencies = [
 "crc",
 "log",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "thiserror 1.0.61",
 "tokio",
 "webrtc-util",
@@ -9722,9 +9850,9 @@ dependencies = [

 [[package]]
 name = "webrtc-srtp"
-version = "0.15.0"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01e773f79b09b057ffbda6b03fe7b43403b012a240cf8d05d630674c3723b5bb"
+checksum = "66d8cdc33413f1d0192670a80ce93d17cb78d57fe3a2414be30d6f6dff121123"
 dependencies = [
 "aead",
 "aes",
@@ -9745,19 +9873,19 @@ dependencies = [

 [[package]]
 name = "webrtc-util"
-version = "0.11.0"
-source = "git+https://github.com/rustdesk-org/webrtc?rev=825a0a4862818f74406d8e1cc25be72259228235#825a0a4862818f74406d8e1cc25be72259228235"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1c0c7e0c8f280f2bbfae442701465777ac07adaf46ce0c5863cd58e13fe472a"
 dependencies = [
 "async-trait",
 "bitflags 1.3.2",
 "bytes",
 "ipnet",
 "lazy_static",
- "libc",
 "log",
 "nix 0.26.4",
 "portable-atomic",
- "rand 0.8.5",
+ "rand 0.9.2",
 "thiserror 1.0.61",
 "tokio",
 "winapi 0.3.9",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ screencapturekit = ["cpal/screencapturekit"]
 [dependencies]
 async-trait = "0.1"
 scrap = { path = "libs/scrap", features = ["wayland"] }
-hbb_common = { path = "libs/hbb_common", features = ["webrtc"] }
+hbb_common = { path = "libs/hbb_common" }
 serde_derive = "1.0"
 serde = "1.0"
 serde_json = "1.0"
@@ -83,7 +83,7 @@ fon = "0.6"
 shutdown_hooks = "0.1"
 totp-rs = { version = "5.4", default-features = false, features = ["gen_secret", "otpauth"] }
 stunclient = "0.4"
-kcp-sys= { git = "https://github.com/rustdesk-org/kcp-sys", branch = "rustdesk-patches" }
+kcp-sys= { git = "https://github.com/rustdesk-org/kcp-sys"}
 reqwest = { version = "0.12", features = ["blocking", "socks", "json", "native-tls", "rustls-tls", "rustls-tls-native-roots", "gzip", "zstd"], default-features=false }

 [target.'cfg(not(target_os = "linux"))'.dependencies]
@@ -215,16 +215,6 @@ exclude = ["vdi/host"]
 # This allows building and running on systems without libxdo installed (e.g., Wayland-only)
 [patch.crates-io]
 libxdo-sys = { path = "libs/libxdo-sys-stub" }
-# One branch off upstream v0.13.0, the tag whose crate versions match this stack.
-# webrtc-util: reads the Windows adapter list's IPv6 addresses as host-order u16 groups, so every
-# one comes out byte-swapped, fails to bind, and ICE gathers no IPv6 host candidate on Windows.
-# webrtc-sctp: RFC 4960's 1s RTO floor makes a single loss cost 1-3s on a link whose RTT is 24-64ms,
-# and fast retransmit cannot cover a request/response exchange; INITIAL_MTU 1228 also fragments on
-# IPv6; and its AIMD pins a lossy long-haul link to MSS/(RTT*sqrt(p)), so a switch sends without
-# a congestion window, as KCP does - on by default, `allow-webrtc-congestion-control` opts back in.
-# Pinned by rev, not branch: a fork branch can be rewritten out from under the lockfile.
-webrtc-util = { git = "https://github.com/rustdesk-org/webrtc", rev = "825a0a4862818f74406d8e1cc25be72259228235" }
-webrtc-sctp = { git = "https://github.com/rustdesk-org/webrtc", rev = "825a0a4862818f74406d8e1cc25be72259228235" }

 [package.metadata.winres]
 LegalCopyright = "Copyright © 2026 Purslane Tech Pte. Ltd. All rights reserved."
--- a/build.rs
+++ b/build.rs
@@ -43,15 +43,6 @@ fn build_manifest() {
    }
 }

-// bionic only exports getifaddrs()/freeifaddrs() from API 24, while the jniLibs
-// are built against the API 21 sysroot (flutter/ndk_*.sh). webrtc-util calls
-// them, so without this the android link fails on undefined symbols.
-fn build_android_ifaddrs() {
-    let file = "src/platform/android_ifaddrs.c";
-    cc::Build::new().file(file).compile("android_ifaddrs");
-    println!("cargo:rerun-if-changed={}", file);
-}
-
 fn install_android_deps() {
    let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
    if target_os != "android" {
@@ -98,8 +89,5 @@ fn main() {
        build_mac();
        println!("cargo:rustc-link-lib=framework=ApplicationServices");
    }
-    if target_os == "android" {
-        build_android_ifaddrs();
-    }
    println!("cargo:rerun-if-changed=build.rs");
 }
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -1633,8 +1633,7 @@ String bool2option(String option, bool b) {
  String res;
  if (option.startsWith('enable-') &&
      option != kOptionEnableUdpPunch &&
-      option != kOptionEnableIpv6Punch &&
-      option != kOptionEnableWebrtc) {
+      option != kOptionEnableIpv6Punch) {
    res = b ? defaultOptionYes : 'N';
  } else if (option.startsWith('allow-') ||
      option == kOptionStopService ||
--- a/flutter/lib/common/widgets/setting_widgets.dart
+++ b/flutter/lib/common/widgets/setting_widgets.dart
@@ -244,11 +244,38 @@ List<(String, String)> otherDefaultSettings() {
        kKeyUseAllMyDisplaysForTheRemoteSession
      ),
    ('Keep terminal sessions on disconnect', kOptionTerminalPersistent),
+    (
+      'Allow terminal apps to copy to clipboard',
+      kOptionAllowTerminalClipboardWrite
+    ),
  ];

  return v;
 }

+String getOtherDefaultSettingOption(String key) {
+  if (key == kOptionAllowTerminalClipboardWrite) {
+    return bind.mainGetLocalOption(key: key);
+  }
+  return bind.mainGetUserDefaultOption(key: key);
+}
+
+Future<void> setOtherDefaultSettingOption(String key, String value) {
+  if (key == kOptionAllowTerminalClipboardWrite) {
+    return bind.mainSetLocalOption(
+      key: key,
+      value: value == kTerminalClipboardWriteAllowed
+          ? kTerminalClipboardWriteAllowed
+          : kTerminalClipboardWriteDenied,
+    );
+  }
+  return bind.mainSetUserDefaultOption(key: key, value: value);
+}
+
+bool isOtherDefaultSettingReadOnly(String key) =>
+    isOptionFixed(key) ||
+    (key == kOptionAllowTerminalClipboardWrite && bind.isDisableSettings());
+
 class TrackpadSpeedWidget extends StatefulWidget {
  final SimpleWrapper<int> value;
  // If null, no debouncer will be applied.
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -115,6 +115,11 @@ const String kOptionEnableAudio = "enable-audio";
 const String kOptionEnableCamera = "enable-camera";
 const String kOptionEnableTerminal = "enable-terminal";
 const String kOptionTerminalPersistent = "terminal-persistent";
+const String kOptionAllowTerminalClipboardWrite =
+    "allow-terminal-clipboard-write";
+const String kTerminalClipboardWriteUnconfigured = "";
+const String kTerminalClipboardWriteAllowed = "Y";
+const String kTerminalClipboardWriteDenied = "N";
 const String kOptionEnableTunnel = "enable-tunnel";
 const String kOptionEnableRemoteRestart = "enable-remote-restart";
 const String kOptionEnableBlockInput = "enable-block-input";
@@ -159,6 +164,7 @@ const String kOptionPeerTabVisible = "peer-tab-visible";
 const String kOptionPeerCardUiType = "peer-card-ui-type";
 const String kOptionCurrentAbName = "current-ab-name";
 const String kOptionEnableConfirmClosingTabs = "enable-confirm-closing-tabs";
+const String kOptionEnablePortForwardMux = "enable-port-forward-mux";
 const String kOptionAllowAlwaysSoftwareRender = "allow-always-software-render";
 const String kOptionEnableCheckUpdate = "enable-check-update";
 const String kOptionAllowAutoUpdate = "allow-auto-update";
@@ -166,12 +172,10 @@ const String kOptionAllowRemoveWallpaper = "allow-remove-wallpaper";
 const String kOptionStopService = "stop-service";
 const String kOptionDirectxCapture = "enable-directx-capture";
 const String kOptionAllowRemoteCmModification = "allow-remote-cm-modification";
-const String kOptionEnableTcpPunch = "enable-tcp-punch";
 const String kOptionEnableUdpPunch = "enable-udp-punch";
 const String kOptionEnableIpv6Punch = "enable-ipv6-punch";
 const String kOptionAllowSyncClipboardBetweenSessions =
    "allow-sync-clipboard-between-sessions";
-const String kOptionEnableWebrtc = "enable-webrtc";
 const String kOptionEnableTrustedDevices = "enable-trusted-devices";
 const String kOptionShowVirtualMouse = "show-virtual-mouse";
 const String kOptionVirtualMouseScale = "virtual-mouse-scale";
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -330,12 +330,14 @@ class _ConnectionPageState extends State<ConnectionPage>
  void onConnect(
      {bool isFileTransfer = false,
      bool isViewCamera = false,
-      bool isTerminal = false}) {
+      bool isTerminal = false,
+      bool isTcpTunneling = false}) {
    var id = _idController.id;
    connect(context, id,
        isFileTransfer: isFileTransfer,
        isViewCamera: isViewCamera,
-        isTerminal: isTerminal);
+        isTerminal: isTerminal,
+        isTcpTunneling: isTcpTunneling);
  }

  /// UI for the remote ID TextField.
@@ -568,6 +570,14 @@ class _ConnectionPageState extends State<ConnectionPage>
                                      '${translate('Terminal')} (beta)',
                                      () => onConnect(isTerminal: true)
                                    ),
+                                    // `connect` routes this through the
+                                    // desktop path only; the peer card gates
+                                    // it the same way.
+                                    if (isDesktop)
+                                      (
+                                        'TCP tunneling',
+                                        () => onConnect(isTcpTunneling: true)
+                                      ),
                                  ]
                                      .map((e) => MenuEntryButton<String>(
                                            childBuilder: (TextStyle? style) =>
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -509,6 +509,15 @@ class _GeneralState extends State<_General> {
          kOptionOpenNewConnInTabs,
          isServer: false,
        ),
+        Tooltip(
+          message: translate('port-forward-mux-tip'),
+          child: _OptionCheckBox(
+            context,
+            'Reuse one connection for port forwarding',
+            kOptionEnablePortForwardMux,
+            isServer: false,
+          ),
+        ),
        // though this is related to GUI, but opengl problem affects all users, so put in config rather than local
        if (isLinux)
          Tooltip(
@@ -563,12 +572,6 @@ class _GeneralState extends State<_General> {
          kOptionDirectxCapture,
        ),
      if (!isWeb && !incomingOnly) ...[
-        _OptionCheckBox(
-          context,
-          'Enable TCP hole punching',
-          kOptionEnableTcpPunch,
-          isServer: false,
-        ),
        _OptionCheckBox(
          context,
          'Enable UDP hole punching',
@@ -581,12 +584,6 @@ class _GeneralState extends State<_General> {
          kOptionEnableIpv6Punch,
          isServer: false,
        ),
-        _OptionCheckBox(
-          context,
-          'Enable WebRTC P2P connection',
-          kOptionEnableWebrtc,
-          isServer: false,
-        ),
        Tooltip(
          message: translate('sync-clipboard-between-sessions-tip'),
          child: _OptionCheckBox(
@@ -2092,14 +2089,13 @@ class _DisplayState extends State<_Display> {
  }

  Widget otherRow(String label, String key) {
-    final value = bind.mainGetUserDefaultOption(key: key) == 'Y';
-    final isOptFixed = isOptionFixed(key);
+    final value = getOtherDefaultSettingOption(key) == 'Y';
+    final isOptFixed = isOtherDefaultSettingReadOnly(key);
    onChanged(bool b) async {
-      await bind.mainSetUserDefaultOption(
-          key: key,
-          value: b
-              ? 'Y'
-              : (key == kOptionEnableFileCopyPaste ? 'N' : defaultOptionNo));
+      await setOtherDefaultSettingOption(
+        key,
+        b ? 'Y' : (key == kOptionEnableFileCopyPaste ? 'N' : defaultOptionNo),
+      );
      setState(() {});
    }

--- a/flutter/lib/desktop/pages/terminal_page.dart
+++ b/flutter/lib/desktop/pages/terminal_page.dart
@@ -19,6 +19,8 @@ class TerminalPage extends StatefulWidget {
    required this.tabKey,
    this.forceRelay,
    this.connToken,
+    this.onClipboardWriteBlocked,
+    this.onClipboardWriteSucceeded,
  }) : super(key: key);
  final String id;
  final String? password;
@@ -26,6 +28,8 @@ class TerminalPage extends StatefulWidget {
  final bool? forceRelay;
  final bool? isSharedPassword;
  final String? connToken;
+  final ValueChanged<String>? onClipboardWriteBlocked;
+  final ValueChanged<String>? onClipboardWriteSucceeded;
  final int terminalId;

  /// Tab key for focus management, passed from parent to avoid duplicate construction
@@ -71,6 +75,8 @@ class _TerminalPageState extends State<TerminalPage>

    // Create terminal model with specific terminal ID
    _terminalModel = TerminalModel(_ffi, widget.terminalId);
+    _terminalModel.onClipboardWriteBlocked = widget.onClipboardWriteBlocked;
+    _terminalModel.onClipboardWriteSucceeded = widget.onClipboardWriteSucceeded;
    debugPrint(
        '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');

--- a/flutter/lib/desktop/pages/terminal_tab_page.dart
+++ b/flutter/lib/desktop/pages/terminal_tab_page.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:convert';

 import 'package:desktop_multi_window/desktop_multi_window.dart';
@@ -10,6 +11,8 @@ import 'package:flutter_hbb/models/state_model.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
 import 'package:flutter_hbb/models/model.dart';
+import 'package:flutter_hbb/models/terminal_copy_shortcut.dart';
+import 'package:flutter_hbb/models/terminal_model.dart';
 import 'package:get/get.dart';

 import '../../models/platform_model.dart';
@@ -19,6 +22,12 @@ import '../widgets/material_mod_popup_menu.dart' as mod_menu;
 import '../widgets/popup_menu.dart';
 import 'package:bot_toast/bot_toast.dart';

+typedef _TerminalClipboardSource = ({
+  String peerId,
+  int terminalId,
+  String tabKey,
+});
+
 class TerminalTabPage extends StatefulWidget {
  final Map<String, dynamic> params;

@@ -30,6 +39,18 @@ class TerminalTabPage extends StatefulWidget {

 class _TerminalTabPageState extends State<TerminalTabPage> {
  DesktopTabController get tabController => Get.find<DesktopTabController>();
+  bool get _canConfigureTerminalClipboardPermission =>
+      canConfigureTerminalClipboardPermission(
+        settingsDisabled: bind.isDisableSettings(),
+        optionFixed: isOptionFixed(kOptionAllowTerminalClipboardWrite),
+      );
+  bool get _canHandleTerminalClipboardWriteRequest =>
+      canHandleTerminalClipboardWriteRequest(
+        localOption: bind.mainGetLocalOption(
+          key: kOptionAllowTerminalClipboardWrite,
+        ),
+        canConfigurePermission: _canConfigureTerminalClipboardPermission,
+      );

  static const IconData selectedIcon = Icons.terminal;
  static const IconData unselectedIcon = Icons.terminal_outlined;
@@ -38,6 +59,9 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
  final Set<String> _closingTabs = {};
  // When true, all session cleanup should persist (window-level close in progress)
  bool _windowClosing = false;
+  CancelFunc? _terminalClipboardNoticeCancel;
+  final _terminalClipboardNotice =
+      TerminalClipboardNoticeCoordinator<_TerminalClipboardSource>();

  _TerminalTabPageState(Map<String, dynamic> params) {
    Get.put(DesktopTabController(tabType: DesktopTabType.terminal));
@@ -45,7 +69,10 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
      WindowController.fromWindowId(windowId())
          .setTitle(getWindowNameWithId(id));
    };
-    tabController.onRemoved = (_, id) => onRemoveId(id);
+    tabController.onRemoved = (_, id) {
+      _closeTerminalClipboardNoticeForTab(id);
+      onRemoveId(id);
+    };
    tabController.onCloseWindow = _closeWindowFromConnection;
    final terminalId = params['terminalId'] ?? _nextTerminalId++;
    tabController.add(_createTerminalTab(
@@ -70,6 +97,11 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
    final alias = bind.mainGetPeerOptionSync(id: peerId, key: 'alias');
    final tabLabel =
        alias.isNotEmpty ? '$alias #$terminalId' : '$peerId #$terminalId';
+    final clipboardSource = (
+      peerId: peerId,
+      terminalId: terminalId,
+      tabKey: tabKey,
+    );
    return TabInfo(
      key: tabKey,
      label: tabLabel,
@@ -86,10 +118,169 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
        tabController: tabController,
        forceRelay: forceRelay,
        connToken: connToken,
+        onClipboardWriteBlocked: _canHandleTerminalClipboardWriteRequest
+            ? (text) => _handleTerminalClipboardWriteBlocked(
+                  clipboardSource,
+                  text,
+                )
+            : null,
+        onClipboardWriteSucceeded: (_) {
+          _handleTerminalClipboardWriteSucceeded(clipboardSource);
+        },
      ),
    );
  }

+  void _handleTerminalClipboardWriteBlocked(
+    _TerminalClipboardSource source,
+    String clipboardText,
+  ) {
+    if (!mounted) return;
+    final option = bind.mainGetLocalOption(
+      key: kOptionAllowTerminalClipboardWrite,
+    );
+    final request = _terminalClipboardNotice.recordBlocked(
+      source: source,
+      text: clipboardText,
+      option: option,
+      canWrite: _canWriteTerminalClipboard,
+    );
+    if (request != null) _showTerminalClipboardNotice(request);
+  }
+
+  void _showTerminalClipboardNotice(
+    TerminalClipboardNoticeRequest<_TerminalClipboardSource> request,
+  ) {
+    _terminalClipboardNoticeCancel = BotToast.showCustomNotification(
+      duration: null,
+      enableSlideOff: false,
+      onlyOne: true,
+      onClose: _handleTerminalClipboardNoticeClosed,
+      toastBuilder: (_) => AnimatedBuilder(
+        animation: _terminalClipboardNotice,
+        builder: (_, __) => MaterialBanner(
+          leading: const Icon(Icons.content_copy_outlined),
+          content: Text(translate(kTerminalClipboardNoticeMessageKey)),
+          actions: [
+            TextButton(
+              onPressed: _terminalClipboardNotice.canClaimAction
+                  ? _handleTerminalClipboardNegativeAction
+                  : null,
+              child: Text(translate(request.negativeActionKey)),
+            ),
+            TextButton(
+              onPressed: _terminalClipboardNotice.canClaimAction
+                  ? _handleTerminalClipboardPositiveAction
+                  : null,
+              child: Text(translate(request.actionKey)),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void _handleTerminalClipboardNegativeAction() {
+    final request = _terminalClipboardNotice.claimCurrentAction();
+    if (request == null) return;
+    if (request.persistAllowed) {
+      unawaited(_declineTerminalClipboardWrite());
+    } else {
+      _closeTerminalClipboardNotice();
+    }
+  }
+
+  void _handleTerminalClipboardPositiveAction() {
+    final request = _terminalClipboardNotice.claimCurrentAction();
+    if (request == null) return;
+    unawaited(_completeTerminalClipboardWrite(request));
+  }
+
+  void _handleTerminalClipboardNoticeClosed() {
+    _terminalClipboardNoticeCancel = null;
+    _terminalClipboardNotice.noticeClosed();
+  }
+
+  bool _canWriteTerminalClipboard(
+    _TerminalClipboardSource source,
+  ) {
+    if (!_canHandleTerminalClipboardWriteRequest) return false;
+    final ffi = TerminalConnectionManager.getExistingConnection(source.peerId);
+    return ffi != null &&
+        !ffi.closed &&
+        ffi.ffiModel.permissions['clipboard'] != false &&
+        tabController.state.value.tabs.any((tab) => tab.key == source.tabKey) &&
+        ffi.terminalModels.containsKey(source.terminalId);
+  }
+
+  void _handleTerminalClipboardWriteSucceeded(
+    _TerminalClipboardSource source,
+  ) {
+    final request = _terminalClipboardNotice.currentForSource(source);
+    if (request == null) return;
+    _closeTerminalClipboardNotice();
+  }
+
+  Future<void> _declineTerminalClipboardWrite() async {
+    try {
+      await bind.mainSetLocalOption(
+        key: kOptionAllowTerminalClipboardWrite,
+        value: kTerminalClipboardWriteDenied,
+      );
+    } catch (error) {
+      debugPrint(
+          '[TerminalTabPage] Failed to save terminal clipboard permission: $error');
+      return;
+    } finally {
+      _terminalClipboardNotice.releaseAction();
+    }
+    _closeTerminalClipboardNotice();
+  }
+
+  Future<void> _completeTerminalClipboardWrite(
+    TerminalClipboardNoticeRequest<_TerminalClipboardSource> request,
+  ) async {
+    final source = request.source;
+    var completed = false;
+    try {
+      completed = await completeTerminalClipboardWrite(
+        clipboardText: request.text,
+        canWrite: () => _canWriteTerminalClipboard(source),
+        writeClipboard: writeTerminalClipboard,
+        persistAllowed: request.persistAllowed
+            ? () => bind.mainSetLocalOption(
+                  key: kOptionAllowTerminalClipboardWrite,
+                  value: kTerminalClipboardWriteAllowed,
+                )
+            : null,
+      );
+    } catch (error) {
+      debugPrint(
+          '[TerminalTabPage] Failed to complete terminal clipboard write: $error');
+    } finally {
+      _terminalClipboardNotice.releaseAction();
+    }
+    if (!completed) return;
+    _closeTerminalClipboardNotice();
+  }
+
+  void _closeTerminalClipboardNoticeForTab(String tabKey) {
+    final current = _terminalClipboardNotice.current;
+    if (current?.source.tabKey != tabKey) return;
+    _closeTerminalClipboardNotice();
+  }
+
+  void _closeTerminalClipboardNotice() {
+    if (!_terminalClipboardNotice.beginClose()) return;
+    final cancel = _terminalClipboardNoticeCancel;
+    if (cancel == null) {
+      debugPrint('[TerminalTabPage] Clipboard notice controller is missing');
+      _terminalClipboardNotice.noticeClosed();
+      return;
+    }
+    cancel();
+  }
+
  /// Unified tab close handler for all close paths (button, shortcut, programmatic).
  /// Shows audit dialog, cleans up session if not persistent, then removes the UI tab.
  Future<void> _closeTab(String tabKey) async {
@@ -147,6 +338,8 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
    // Remove all UI tabs immediately (same instant behavior as the old tabController.clear())
    // Keep the cleanup target lookup below synchronous before its first await:
    // it relies on the current frame still retaining each TerminalPage's FFI/model.
+    _terminalClipboardNotice.clear();
+    _terminalClipboardNoticeCancel?.call();
    tabController.clear();
    // Run session cleanup in parallel with bounded timeout (closeTerminal() has internal 3s timeout).
    // Skip tabs already being closed by a concurrent _closeTab() to avoid duplicate FFI calls.
@@ -357,6 +550,8 @@ class _TerminalTabPageState extends State<TerminalTabPage> {
  @override
  void dispose() {
    HardwareKeyboard.instance.removeHandler(_handleKeyEvent);
+    _terminalClipboardNotice.clear();
+    _terminalClipboardNoticeCancel?.call();
    super.dispose();
  }

--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -97,12 +97,10 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
  var _hideNetwork = false;
  var _hideWebSocket = false;
  var _enableTrustedDevices = false;
-  var _enableTcpPunch = false;
  var _enableUdpPunch = false;
  var _allowInsecureTlsFallback = false;
  var _disableUdp = false;
  var _enableIpv6Punch = false;
-  var _enableWebrtc = false;
  var _isUsingPublicServer = false;
  var _allowAskForNoteAtEndOfConnection = false;
  var _preventSleepWhileConnected = true;
@@ -143,10 +141,8 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
        bind.mainGetBuildinOption(key: kOptionHideWebSocketSetting) == 'Y' ||
            isWeb;
    _enableTrustedDevices = mainGetBoolOptionSync(kOptionEnableTrustedDevices);
-    _enableTcpPunch = mainGetLocalBoolOptionSync(kOptionEnableTcpPunch);
    _enableUdpPunch = mainGetLocalBoolOptionSync(kOptionEnableUdpPunch);
    _enableIpv6Punch = mainGetLocalBoolOptionSync(kOptionEnableIpv6Punch);
-    _enableWebrtc = mainGetLocalBoolOptionSync(kOptionEnableWebrtc);
    _allowAskForNoteAtEndOfConnection =
        mainGetLocalBoolOptionSync(kOptionAllowAskForNoteAtEndOfConnection);
    _preventSleepWhileConnected =
@@ -819,65 +815,31 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
                      });
                    },
            ),
-          if (!incomingOnly)
-            SettingsTile.switchTile(
-              title: Text(translate('Enable TCP hole punching')),
-              initialValue: _enableTcpPunch,
-              onToggle: isOptionFixed(kOptionEnableTcpPunch)
-                  ? null
-                  : (v) async {
-                      await mainSetLocalBoolOption(kOptionEnableTcpPunch, v);
-                      final newValue =
-                          mainGetLocalBoolOptionSync(kOptionEnableTcpPunch);
-                      setState(() {
-                        _enableTcpPunch = newValue;
-                      });
-                    },
-            ),
          if (!incomingOnly)
            SettingsTile.switchTile(
              title: Text(translate('Enable UDP hole punching')),
              initialValue: _enableUdpPunch,
-              onToggle: isOptionFixed(kOptionEnableUdpPunch)
-                  ? null
-                  : (v) async {
-                      await mainSetLocalBoolOption(kOptionEnableUdpPunch, v);
-                      final newValue =
-                          mainGetLocalBoolOptionSync(kOptionEnableUdpPunch);
-                      setState(() {
-                        _enableUdpPunch = newValue;
-                      });
-                    },
+              onToggle: (v) async {
+                await mainSetLocalBoolOption(kOptionEnableUdpPunch, v);
+                final newValue =
+                    mainGetLocalBoolOptionSync(kOptionEnableUdpPunch);
+                setState(() {
+                  _enableUdpPunch = newValue;
+                });
+              },
            ),
          if (!incomingOnly)
            SettingsTile.switchTile(
              title: Text(translate('Enable IPv6 P2P connection')),
              initialValue: _enableIpv6Punch,
-              onToggle: isOptionFixed(kOptionEnableIpv6Punch)
-                  ? null
-                  : (v) async {
-                      await mainSetLocalBoolOption(kOptionEnableIpv6Punch, v);
-                      final newValue =
-                          mainGetLocalBoolOptionSync(kOptionEnableIpv6Punch);
-                      setState(() {
-                        _enableIpv6Punch = newValue;
-                      });
-                    },
-            ),
-          if (!incomingOnly)
-            SettingsTile.switchTile(
-              title: Text(translate('Enable WebRTC P2P connection')),
-              initialValue: _enableWebrtc,
-              onToggle: isOptionFixed(kOptionEnableWebrtc)
-                  ? null
-                  : (v) async {
-                      await mainSetLocalBoolOption(kOptionEnableWebrtc, v);
-                      final newValue =
-                          mainGetLocalBoolOptionSync(kOptionEnableWebrtc);
-                      setState(() {
-                        _enableWebrtc = newValue;
-                      });
-                    },
+              onToggle: (v) async {
+                await mainSetLocalBoolOption(kOptionEnableIpv6Punch, v);
+                final newValue =
+                    mainGetLocalBoolOptionSync(kOptionEnableIpv6Punch);
+                setState(() {
+                  _enableIpv6Punch = newValue;
+                });
+              },
            ),
          SettingsTile(
              title: Text(translate('Language')),
@@ -1307,16 +1269,18 @@ class __DisplayPageState extends State<_DisplayPage> {
  }

  SettingsTile otherRow(String label, String key) {
-    final value = bind.mainGetUserDefaultOption(key: key) == 'Y';
-    final isOptFixed = isOptionFixed(key);
+    final value = getOtherDefaultSettingOption(key) == 'Y';
+    final isOptFixed = isOtherDefaultSettingReadOnly(key);
    return SettingsTile.switchTile(
      initialValue: value,
      title: Text(translate(label)),
      onToggle: isOptFixed
          ? null
          : (b) async {
-              await bind.mainSetUserDefaultOption(
-                  key: key, value: b ? 'Y' : defaultOptionNo);
+              await setOtherDefaultSettingOption(
+                key,
+                b ? 'Y' : defaultOptionNo,
+              );
              setState(() {});
            },
    );
--- a/flutter/lib/mobile/pages/terminal_page.dart
+++ b/flutter/lib/mobile/pages/terminal_page.dart
@@ -11,6 +11,7 @@ import 'package:flutter_hbb/models/model.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:flutter_hbb/models/terminal_copy_shortcut.dart';
 import 'package:flutter_hbb/models/terminal_model.dart';
+import 'package:flutter_hbb/models/terminal_mouse_handler.dart';
 import 'package:flutter_hbb/mobile/terminal_keyboard_utils.dart';
 import 'package:flutter_hbb/web/dummy.dart'
    if (dart.library.html) 'package:flutter_hbb/web/terminal_font.dart';
@@ -19,6 +20,49 @@ import 'package:xterm/xterm.dart';
 import '../../desktop/pages/terminal_connection_manager.dart';
 import '../../consts.dart';

+const _terminalBackgroundOpacity = 0.7;
+
+Widget _buildTerminalViewForPlatform({
+  required bool reportMouseInput,
+  required bool reportTouchInput,
+  required Terminal terminal,
+  required TerminalController controller,
+  required TerminalStyle textStyle,
+  required EdgeInsets padding,
+  required bool deleteDetection,
+  required Map<ShortcutActivator, Intent>? shortcuts,
+  required FocusOnKeyEventCallback onKeyEvent,
+  required void Function(TapDownDetails, CellOffset) onSecondaryTapDown,
+}) {
+  if (reportMouseInput || reportTouchInput) {
+    return TerminalMouseInteraction(
+      terminal,
+      controller: controller,
+      autofocus: true,
+      textStyle: textStyle,
+      deleteDetection: deleteDetection,
+      reportTouchInput: reportTouchInput,
+      shortcuts: shortcuts,
+      onKeyEvent: onKeyEvent,
+      backgroundOpacity: _terminalBackgroundOpacity,
+      padding: padding,
+      onSecondaryTapDown: onSecondaryTapDown,
+    );
+  }
+  return TerminalView(
+    terminal,
+    controller: controller,
+    autofocus: true,
+    textStyle: textStyle,
+    deleteDetection: deleteDetection,
+    shortcuts: shortcuts,
+    onKeyEvent: onKeyEvent,
+    backgroundOpacity: _terminalBackgroundOpacity,
+    padding: padding,
+    onSecondaryTapDown: onSecondaryTapDown,
+  );
+}
+
 class TerminalPage extends StatefulWidget {
  const TerminalPage({
    Key? key,
@@ -41,6 +85,19 @@ class TerminalPage extends StatefulWidget {

 class _TerminalPageState extends State<TerminalPage>
    with AutomaticKeepAliveClientMixin, WidgetsBindingObserver {
+  bool get _canConfigureTerminalClipboardPermission =>
+      canConfigureTerminalClipboardPermission(
+        settingsDisabled: bind.isDisableSettings(),
+        optionFixed: isOptionFixed(kOptionAllowTerminalClipboardWrite),
+      );
+  bool get _canHandleTerminalClipboardWriteRequest =>
+      canHandleTerminalClipboardWriteRequest(
+        localOption: bind.mainGetLocalOption(
+          key: kOptionAllowTerminalClipboardWrite,
+        ),
+        canConfigurePermission: _canConfigureTerminalClipboardPermission,
+      );
+
  late FFI _ffi;
  late TerminalModel _terminalModel;
  double? _cellHeight;
@@ -57,6 +114,9 @@ class _TerminalPageState extends State<TerminalPage>
  // For iOS edge swipe gesture
  double _swipeStartX = 0;
  double _swipeCurrentX = 0;
+  ScaffoldFeatureController<MaterialBanner, MaterialBannerClosedReason>?
+      _terminalClipboardNoticeController;
+  final _terminalClipboardNotice = TerminalClipboardNoticeCoordinator<int>();

  // For web only.
  // 'monospace' does not work on web, use Google Fonts, `??` is only for null safety.
@@ -89,6 +149,12 @@ class _TerminalPageState extends State<TerminalPage>

    // Create terminal model with specific terminal ID
    _terminalModel = TerminalModel(_ffi, widget.terminalId);
+    if (_canHandleTerminalClipboardWriteRequest) {
+      _terminalModel.onClipboardWriteBlocked =
+          _handleTerminalClipboardWriteBlocked;
+      _terminalModel.onClipboardWriteSucceeded =
+          _handleTerminalClipboardWriteSucceeded;
+    }
    debugPrint(
        '[TerminalPage] Terminal model created for terminal ${widget.terminalId}');

@@ -134,12 +200,144 @@ class _TerminalPageState extends State<TerminalPage>
    _ffi.ffiModel.updateEventListener(_ffi.sessionId, widget.id);
  }

+  void _handleTerminalClipboardWriteBlocked(String clipboardText) {
+    if (!mounted) return;
+    final option = bind.mainGetLocalOption(
+      key: kOptionAllowTerminalClipboardWrite,
+    );
+    final request = _terminalClipboardNotice.recordBlocked(
+      source: widget.terminalId,
+      text: clipboardText,
+      option: option,
+      canWrite: (_) => _canWriteTerminalClipboard,
+    );
+    if (request != null) _showTerminalClipboardNotice(request);
+  }
+
+  void _showTerminalClipboardNotice(
+    TerminalClipboardNoticeRequest<int> request,
+  ) {
+    final controller = ScaffoldMessenger.of(context).showMaterialBanner(
+      MaterialBanner(
+        leading: const Icon(Icons.content_copy_outlined),
+        content: Text(translate(kTerminalClipboardNoticeMessageKey)),
+        actions: [
+          AnimatedBuilder(
+            animation: _terminalClipboardNotice,
+            builder: (_, __) => TextButton(
+              onPressed: _terminalClipboardNotice.canClaimAction
+                  ? _handleTerminalClipboardNegativeAction
+                  : null,
+              child: Text(translate(request.negativeActionKey)),
+            ),
+          ),
+          AnimatedBuilder(
+            animation: _terminalClipboardNotice,
+            builder: (_, __) => TextButton(
+              onPressed: _terminalClipboardNotice.canClaimAction
+                  ? _handleTerminalClipboardPositiveAction
+                  : null,
+              child: Text(translate(request.actionKey)),
+            ),
+          ),
+        ],
+      ),
+    );
+    _terminalClipboardNoticeController = controller;
+    unawaited(controller.closed.then<void>((_) {
+      if (identical(_terminalClipboardNoticeController, controller)) {
+        _terminalClipboardNoticeController = null;
+        _terminalClipboardNotice.noticeClosed();
+      }
+    }));
+  }
+
+  void _handleTerminalClipboardNegativeAction() {
+    final request = _terminalClipboardNotice.claimCurrentAction();
+    if (request == null) return;
+    if (request.persistAllowed) {
+      unawaited(_declineTerminalClipboardWrite());
+    } else {
+      _closeTerminalClipboardNotice();
+    }
+  }
+
+  void _handleTerminalClipboardPositiveAction() {
+    final request = _terminalClipboardNotice.claimCurrentAction();
+    if (request == null) return;
+    unawaited(_completeTerminalClipboardWrite(request));
+  }
+
+  bool get _canWriteTerminalClipboard =>
+      _canHandleTerminalClipboardWriteRequest &&
+      !_ffi.closed &&
+      _ffi.ffiModel.permissions['clipboard'] != false;
+
+  void _handleTerminalClipboardWriteSucceeded(String _) {
+    _closeTerminalClipboardNotice();
+  }
+
+  Future<void> _declineTerminalClipboardWrite() async {
+    try {
+      await bind.mainSetLocalOption(
+        key: kOptionAllowTerminalClipboardWrite,
+        value: kTerminalClipboardWriteDenied,
+      );
+    } catch (error) {
+      debugPrint(
+          '[TerminalPage] Failed to save terminal clipboard permission: $error');
+      return;
+    } finally {
+      _terminalClipboardNotice.releaseAction();
+    }
+    _closeTerminalClipboardNotice();
+  }
+
+  Future<void> _completeTerminalClipboardWrite(
+    TerminalClipboardNoticeRequest<int> request,
+  ) async {
+    var completed = false;
+    try {
+      completed = await completeTerminalClipboardWrite(
+        clipboardText: request.text,
+        canWrite: () => _canWriteTerminalClipboard,
+        writeClipboard: writeTerminalClipboard,
+        persistAllowed: request.persistAllowed
+            ? () => bind.mainSetLocalOption(
+                  key: kOptionAllowTerminalClipboardWrite,
+                  value: kTerminalClipboardWriteAllowed,
+                )
+            : null,
+      );
+    } catch (error) {
+      debugPrint(
+          '[TerminalPage] Failed to complete terminal clipboard write: $error');
+    } finally {
+      _terminalClipboardNotice.releaseAction();
+    }
+    if (!completed) return;
+    _closeTerminalClipboardNotice();
+  }
+
+  void _closeTerminalClipboardNotice() {
+    if (!_terminalClipboardNotice.beginClose()) return;
+    final controller = _terminalClipboardNoticeController;
+    if (controller == null) {
+      debugPrint('[TerminalPage] Clipboard notice controller is missing');
+      _terminalClipboardNotice.noticeClosed();
+      return;
+    }
+    controller.close();
+  }
+
  @override
  void dispose() {
    // Unregister terminal model from FFI
    _ffi.unregisterTerminalModel(widget.terminalId);
    _terminalModel.dispose();
    _keyboardDebounce?.cancel();
+    _terminalClipboardNotice.clear();
+    _terminalClipboardNoticeController?.close();
    WidgetsBinding.instance.removeObserver(this);
    super.dispose();
    TerminalConnectionManager.releaseConnection(widget.id);
@@ -234,12 +432,12 @@ class _TerminalPageState extends State<TerminalPage>
              child: LayoutBuilder(
                builder: (context, constraints) {
                  final heightPx = constraints.maxHeight;
-                  return TerminalView(
-                    _terminalModel.terminal,
+                  return _buildTerminalViewForPlatform(
+                    reportMouseInput: isWebDesktop || isAndroid,
+                    reportTouchInput: isIOS,
+                    terminal: _terminalModel.terminal,
                    controller: _terminalModel.terminalController,
-                    autofocus: true,
                    textStyle: _getTerminalStyle(),
-                    backgroundOpacity: 0.7,
                    // The following comment is from xterm.dart source code:
                    // Workaround to detect delete key for platforms and IMEs that do not
                    // emit a hardware delete event. Preferred on mobile platforms. [false] by
--- a/flutter/lib/models/rustdesk_terminal.dart
+++ b/flutter/lib/models/rustdesk_terminal.dart
@@ -1,7 +1,108 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
 import 'package:xterm/xterm.dart';

+enum TerminalClipboardWritePermission { denied, unconfigured, allowed }
+
 class RustDeskTerminal extends Terminal {
-  RustDeskTerminal({super.maxLines});
+  RustDeskTerminal({
+    super.maxLines,
+    required TerminalClipboardWritePermission Function()
+        clipboardWritePermission,
+    required Future<bool> Function(String) onClipboardWrite,
+    ValueChanged<String>? onClipboardWriteBlocked,
+    ValueChanged<String>? onClipboardWriteSucceeded,
+  })  : _clipboardWritePermission = clipboardWritePermission,
+        _onClipboardWrite = onClipboardWrite,
+        _onClipboardWriteBlocked = onClipboardWriteBlocked,
+        _onClipboardWriteSucceeded = onClipboardWriteSucceeded {
+    onPrivateOSC = _handlePrivateOsc;
+  }
+
+  static const _clipboardOscCode = '52';
+  static const _systemClipboardSelection = 'c';
+  // Match the terminal helper's existing payload safety ceiling.
+  static const _maxClipboardWriteBytes = 16 * 1024 * 1024;
+  static const _base64InputBytesPerBlock = 3;
+  static const _base64EncodedCharsPerBlock = 4;
+  static final _osc52Selection = RegExp(r'^[cpqs0-7]*$');
+  final TerminalClipboardWritePermission Function() _clipboardWritePermission;
+  final Future<bool> Function(String) _onClipboardWrite;
+  final ValueChanged<String>? _onClipboardWriteBlocked;
+  final ValueChanged<String>? _onClipboardWriteSucceeded;
+
+  bool get isClipboardWriteAllowed =>
+      _clipboardWritePermission() == TerminalClipboardWritePermission.allowed;
+
+  void _handlePrivateOsc(String code, List<String> args) {
+    if (code != _clipboardOscCode) return;
+    if (args.length != 2 || !_osc52Selection.hasMatch(args.first)) {
+      debugPrint('[RustDeskTerminal] Rejected malformed OSC 52 command');
+      return;
+    }
+    if (args.last == '?') {
+      debugPrint('[RustDeskTerminal] Rejected OSC 52 clipboard query');
+      return;
+    }
+    final permission = _clipboardWritePermission();
+    if (permission == TerminalClipboardWritePermission.denied) {
+      debugPrint('[RustDeskTerminal] Rejected unauthorized OSC 52 write');
+      return;
+    }
+    final selection = args.first;
+    if (selection.isNotEmpty &&
+        !selection.contains(_systemClipboardSelection)) {
+      debugPrint('[RustDeskTerminal] Ignored unsupported OSC 52 selection');
+      return;
+    }
+    if (selection.replaceAll(_systemClipboardSelection, '').isNotEmpty) {
+      debugPrint('[RustDeskTerminal] Ignored unsupported OSC 52 selections');
+    }
+    final text = _decodeClipboardPayload(args.last);
+    if (text == null) return;
+    if (permission == TerminalClipboardWritePermission.unconfigured) {
+      debugPrint('[RustDeskTerminal] Blocked OSC 52 write pending consent');
+      _onClipboardWriteBlocked?.call(text);
+      return;
+    }
+    unawaited(_writeClipboard(text));
+  }
+
+  Future<void> _writeClipboard(String text) async {
+    final succeeded = await _onClipboardWrite(text);
+    if (succeeded) {
+      _onClipboardWriteSucceeded?.call(text);
+      return;
+    }
+    debugPrint(
+        '[RustDeskTerminal] OSC 52 clipboard write requires interaction');
+    _onClipboardWriteBlocked?.call(text);
+  }
+
+  String? _decodeClipboardPayload(String payload) {
+    if (payload.length > _maxBase64EncodedLength(_maxClipboardWriteBytes)) {
+      debugPrint('[RustDeskTerminal] Rejected oversized OSC 52 payload');
+      return null;
+    }
+    try {
+      final bytes = base64.decode(payload);
+      if (bytes.length > _maxClipboardWriteBytes) {
+        debugPrint('[RustDeskTerminal] Rejected oversized OSC 52 payload');
+        return null;
+      }
+      return utf8.decode(bytes);
+    } on FormatException {
+      debugPrint('[RustDeskTerminal] Rejected malformed OSC 52 payload');
+      return null;
+    }
+  }
+
+  static int _maxBase64EncodedLength(int maxBytes) =>
+      ((maxBytes + _base64InputBytesPerBlock - 1) ~/
+          _base64InputBytesPerBlock) *
+      _base64EncodedCharsPerBlock;

  @override
  void eraseScrollbackOnly() {
--- a/flutter/lib/models/terminal_clipboard_writer.dart
+++ b/flutter/lib/models/terminal_clipboard_writer.dart
@@ -0,0 +1,15 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/services.dart';
+
+Future<bool> writeTerminalClipboardPlatform(
+  String text, {
+  bool userInitiated = false,
+}) async {
+  try {
+    await Clipboard.setData(ClipboardData(text: text));
+    return true;
+  } catch (error) {
+    debugPrint('[Terminal] Failed to write clipboard: $error');
+    return false;
+  }
+}
--- a/flutter/lib/models/terminal_clipboard_writer_web.dart
+++ b/flutter/lib/models/terminal_clipboard_writer_web.dart
@@ -0,0 +1,29 @@
+import 'dart:js_interop';
+
+import 'package:flutter/foundation.dart';
+
+const _writeTerminalClipboardCommand = 'write_terminal_clipboard';
+
+@JS('setByName')
+external JSPromise<JSBoolean> _setByName(
+  JSString name,
+  JSString value,
+  JSBoolean userInitiated,
+);
+
+Future<bool> writeTerminalClipboardPlatform(
+  String text, {
+  bool userInitiated = false,
+}) async {
+  try {
+    final result = await _setByName(
+      _writeTerminalClipboardCommand.toJS,
+      text.toJS,
+      userInitiated.toJS,
+    ).toDart;
+    return result.toDart;
+  } catch (error) {
+    debugPrint('[Terminal] Failed to write Web clipboard: $error');
+    return false;
+  }
+}
--- a/flutter/lib/models/terminal_copy_shortcut.dart
+++ b/flutter/lib/models/terminal_copy_shortcut.dart
@@ -3,20 +3,130 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/widgets.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:xterm/xterm.dart';

+import 'terminal_clipboard_writer.dart'
+    if (dart.library.html) 'terminal_clipboard_writer_web.dart';
+
 const _controlShiftVPasteShortcut = SingleActivator(
  LogicalKeyboardKey.keyV,
  control: true,
  shift: true,
 );

-Future<void> writeTerminalClipboard(String text) async {
-  try {
-    await Clipboard.setData(ClipboardData(text: text));
-  } catch (error) {
-    debugPrint('[Terminal] Failed to write clipboard: $error');
+typedef TerminalClipboardWriter = Future<bool> Function(
+  String text, {
+  required bool userInitiated,
+});
+
+class TerminalClipboardNoticeRequest<T> {
+  const TerminalClipboardNoticeRequest({
+    required this.source,
+    required this.text,
+    required this.persistAllowed,
+  });
+
+  final T source;
+  final String text;
+  final bool persistAllowed;
+
+  String get actionKey => persistAllowed ? 'Enable' : 'Copy to clipboard';
+
+  String get negativeActionKey => persistAllowed ? 'Decline' : 'Dismiss';
+}
+
+const kTerminalClipboardNoticeMessageKey = 'terminal-clipboard-write-tip';
+
+class TerminalClipboardNoticeCoordinator<T> extends ChangeNotifier {
+  TerminalClipboardNoticeRequest<T>? _current;
+  bool _noticeVisible = false;
+  bool _actionInProgress = false;
+
+  TerminalClipboardNoticeRequest<T>? get current => _current;
+  bool get canClaimAction =>
+      _noticeVisible && !_actionInProgress && _current != null;
+
+  TerminalClipboardNoticeRequest<T>? currentForSource(T source) {
+    final current = _current;
+    if (current == null || current.source != source) return null;
+    return current;
  }
+
+  TerminalClipboardNoticeRequest<T>? recordBlocked({
+    required T source,
+    required String text,
+    required String option,
+    required bool Function(T source) canWrite,
+  }) {
+    if (!canWrite(source)) return null;
+    final requestAllowsPersistence =
+        option == kTerminalClipboardWriteUnconfigured;
+    if (option != kTerminalClipboardWriteAllowed && !requestAllowsPersistence) {
+      return null;
+    }
+    if (_noticeVisible && _actionInProgress) return null;
+    final wasVisible = _noticeVisible;
+    final persistAllowed =
+        wasVisible ? _current?.persistAllowed : requestAllowsPersistence;
+    final request = TerminalClipboardNoticeRequest(
+      source: source,
+      text: text,
+      persistAllowed: persistAllowed ?? requestAllowsPersistence,
+    );
+    _current = request;
+    if (wasVisible) return null;
+    _noticeVisible = true;
+    return request;
+  }
+
+  TerminalClipboardNoticeRequest<T>? claimCurrentAction() {
+    if (!canClaimAction) return null;
+    final current = _current;
+    if (current == null) return null;
+    _actionInProgress = true;
+    notifyListeners();
+    return current;
+  }
+
+  void releaseAction() {
+    if (!_actionInProgress) return;
+    _actionInProgress = false;
+    notifyListeners();
+  }
+
+  bool beginClose() {
+    if (!_noticeVisible) return false;
+    _actionInProgress = true;
+    notifyListeners();
+    return true;
+  }
+
+  void noticeClosed() => clear();
+
+  void clear() {
+    _current = null;
+    _noticeVisible = false;
+    _actionInProgress = false;
+  }
+}
+
+Future<bool> writeTerminalClipboard(
+  String text, {
+  bool userInitiated = false,
+}) =>
+    writeTerminalClipboardPlatform(text, userInitiated: userInitiated);
+
+Future<bool> completeTerminalClipboardWrite({
+  required String clipboardText,
+  required bool Function() canWrite,
+  required TerminalClipboardWriter writeClipboard,
+  Future<void> Function()? persistAllowed,
+}) async {
+  if (!canWrite()) return false;
+  if (!await writeClipboard(clipboardText, userInitiated: true)) return false;
+  await persistAllowed?.call();
+  return true;
 }

 Map<ShortcutActivator, Intent>? platformTerminalShortcuts() {
@@ -68,7 +178,7 @@ FocusOnKeyEventCallback terminalCopyHandler(
        if (selection != null && !selection.isCollapsed) {
          if (event is KeyDownEvent) {
            final text = terminal.buffer.getText(selection);
-            unawaited(writeTerminalClipboard(text));
+            unawaited(writeTerminalClipboard(text, userInitiated: true));
          }
          return KeyEventResult.handled;
        }
--- a/flutter/lib/models/terminal_model.dart
+++ b/flutter/lib/models/terminal_model.dart
@@ -11,8 +11,38 @@ import 'input_modifier_utils.dart';
 import 'model.dart';
 import 'platform_model.dart';
 import 'rustdesk_terminal.dart';
+import 'terminal_copy_shortcut.dart';
 import 'terminal_mouse_handler.dart';

+bool canConfigureTerminalClipboardPermission({
+  required bool settingsDisabled,
+  required bool optionFixed,
+}) =>
+    !settingsDisabled && !optionFixed;
+
+bool canHandleTerminalClipboardWriteRequest({
+  required String localOption,
+  required bool canConfigurePermission,
+}) =>
+    canConfigurePermission || localOption == kTerminalClipboardWriteAllowed;
+
+TerminalClipboardWritePermission terminalClipboardWritePermission(
+  String localOption, {
+  required bool remoteClipboardEnabled,
+  bool canRequestConsent = true,
+}) {
+  if (!remoteClipboardEnabled) {
+    return TerminalClipboardWritePermission.denied;
+  }
+  if (localOption == kTerminalClipboardWriteAllowed) {
+    return TerminalClipboardWritePermission.allowed;
+  }
+  if (localOption == kTerminalClipboardWriteUnconfigured && canRequestConsent) {
+    return TerminalClipboardWritePermission.unconfigured;
+  }
+  return TerminalClipboardWritePermission.denied;
+}
+
 class TerminalModel with ChangeNotifier {
  final String id; // peer id
  final FFI parent;
@@ -62,6 +92,9 @@ class TerminalModel with ChangeNotifier {
  /// The listener (typically TerminalPage) can use this to auto-close the tab/page.
  VoidCallback? onClosed;

+  ValueChanged<String>? onClipboardWriteBlocked;
+  ValueChanged<String>? onClipboardWriteSucceeded;
+
  Future<void> _handleInput(String data) async {
    // xterm can complete asynchronous input after the Flutter page has gone
    // away. Stop before reading or clearing widget-owned modifier state.
@@ -130,7 +163,19 @@ class TerminalModel with ChangeNotifier {
  }

  TerminalModel(this.parent, [this.terminalId = 0]) : id = parent.id {
-    terminal = RustDeskTerminal(maxLines: 10000);
+    terminal = RustDeskTerminal(
+      maxLines: 10000,
+      onClipboardWrite: writeTerminalClipboard,
+      clipboardWritePermission: () => terminalClipboardWritePermission(
+        bind.mainGetLocalOption(key: kOptionAllowTerminalClipboardWrite),
+        remoteClipboardEnabled:
+            parent.ffiModel.permissions['clipboard'] != false,
+        canRequestConsent: onClipboardWriteBlocked != null,
+      ),
+      onClipboardWriteBlocked: (text) => onClipboardWriteBlocked?.call(text),
+      onClipboardWriteSucceeded: (text) =>
+          onClipboardWriteSucceeded?.call(text),
+    );
    terminal.mouseHandler = const WheelButtonFixMouseHandler();
    terminalController = TerminalController();

@@ -593,6 +638,8 @@ class TerminalModel with ChangeNotifier {
    clearAltLock = null;
    onResizeExternal = null;
    onClosed = null;
+    onClipboardWriteBlocked = null;
+    onClipboardWriteSucceeded = null;
    // Clear buffers to free memory
    _inputBuffer.clear();
    _pendingOutputChunks.clear();
--- a/flutter/lib/models/terminal_mouse_drag_reporter.dart
+++ b/flutter/lib/models/terminal_mouse_drag_reporter.dart
@@ -62,13 +62,17 @@ class TerminalMouseDragReporter {
  var _ownsControllerSuspension = false;
  var _releasePending = false;
  var _reporting = false;
+  var _dragged = false;

  bool handleDown(
    PointerDownEvent event,
    Terminal terminal,
-    TerminalViewState? terminalView,
-  ) {
-    if (!_isPrimaryMouse(event) || !_reportsDrag(terminal.mouseMode)) {
+    TerminalViewState? terminalView, {
+    bool reportTouchInput = false,
+    bool deferReport = false,
+  }) {
+    if (!_isPrimaryPointer(event, reportTouchInput) ||
+        !_reportsDrag(terminal.mouseMode)) {
      return false;
    }
    if (terminalView == null || terminalView.widget.readOnly) return false;
@@ -83,14 +87,33 @@ class TerminalMouseDragReporter {
    _pointerId = event.pointer;
    _controller = controller;
    _ownsControllerSuspension = true;
-    _releasePending = true;
-    _reporting = true;
+    _releasePending = !deferReport;
+    _reporting = !deferReport;
+    _dragged = false;
    controller.setSuspendPointerInput(true);
    _clearSelection(controller);
    final position = _cellAt(event, terminalView);
    _lastReportedPosition = position;
+    if (!deferReport) {
+      terminal.textInput(
+        _report(terminal.mouseReportMode, position),
+      );
+    }
+    return true;
+  }
+
+  bool activateDeferredDown(Terminal terminal) {
+    if (_pointerId == null ||
+        _controller == null ||
+        _releasePending ||
+        !_reportsDrag(terminal.mouseMode)) {
+      return false;
+    }
+    _releasePending = true;
+    _reporting = true;
+    _clearSelection(_controller);
    terminal.textInput(
-      _report(terminal.mouseReportMode, position),
+      _report(terminal.mouseReportMode, _lastReportedPosition),
    );
    return true;
  }
@@ -98,26 +121,36 @@ class TerminalMouseDragReporter {
  bool handleMove(
    PointerMoveEvent event,
    Terminal terminal,
-    TerminalViewState? terminalView,
-  ) {
+    TerminalViewState? terminalView, {
+    void Function(bool dragged)? beforeRelease,
+    void Function()? onCancel,
+  }) {
    if (event.pointer != _pointerId) return false;
    if (terminalView == null) {
+      onCancel?.call();
      cancel();
      return true;
    }
    final reportsDrag = _reportsDrag(terminal.mouseMode);
-    if (!_isPrimaryMouse(event)) {
+    if (!_hasPrimaryButton(event)) {
      if (_releasePending && reportsDrag) {
-        _reportRelease(
+        _finishRelease(
+          event,
          terminal,
-          _reporting ? _cellAt(event, terminalView) : _lastReportedPosition,
+          terminalView,
+          beforeRelease: beforeRelease,
        );
+      } else {
+        onCancel?.call();
      }
      cancel();
      return true;
    }
    if (!_reporting || !reportsDrag) {
-      if (!reportsDrag) _releasePending = false;
+      if (!reportsDrag && _releasePending) {
+        _releasePending = false;
+        onCancel?.call();
+      }
      _reporting = false;
      // Keep ownership until the matching end event to suppress local selection.
      final controller = _controller;
@@ -126,7 +159,7 @@ class TerminalMouseDragReporter {
    }

    final position = _cellAt(event, terminalView);
-    _lastReportedPosition = position;
+    _recordPosition(position);
    terminal.textInput(
      _report(terminal.mouseReportMode, position, motion: true),
    );
@@ -138,16 +171,22 @@ class TerminalMouseDragReporter {
  bool handleEnd(
    PointerEvent event,
    Terminal terminal,
-    TerminalViewState? terminalView,
-  ) {
+    TerminalViewState? terminalView, {
+    void Function(bool dragged)? beforeRelease,
+    void Function()? onCancel,
+  }) {
    if (event.pointer != _pointerId) return false;
    if (terminalView != null &&
        _releasePending &&
        _reportsDrag(terminal.mouseMode)) {
-      _reportRelease(
+      _finishRelease(
+        event,
        terminal,
-        _reporting ? _cellAt(event, terminalView) : _lastReportedPosition,
+        terminalView,
+        beforeRelease: beforeRelease,
      );
+    } else {
+      onCancel?.call();
    }
    _clearSelection(_controller);
    final controller = _controller;
@@ -172,6 +211,7 @@ class TerminalMouseDragReporter {
    _ownsControllerSuspension = false;
    _releasePending = false;
    _reporting = false;
+    _dragged = false;
  }

  void updateController(TerminalController controller) {
@@ -203,6 +243,24 @@ class TerminalMouseDragReporter {
    );
  }

+  void _finishRelease(
+    PointerEvent event,
+    Terminal terminal,
+    TerminalViewState terminalView, {
+    void Function(bool dragged)? beforeRelease,
+  }) {
+    final position =
+        _reporting ? _cellAt(event, terminalView) : _lastReportedPosition;
+    if (_reporting) _recordPosition(position);
+    beforeRelease?.call(_dragged);
+    _reportRelease(terminal, position);
+  }
+
+  void _recordPosition(CellOffset position) {
+    _dragged = _dragged || position != _lastReportedPosition;
+    _lastReportedPosition = position;
+  }
+
  CellOffset _cellAt(PointerEvent event, TerminalViewState terminalView) {
    final renderTerminal = terminalView.renderTerminal;
    return renderTerminal.getCellOffset(
@@ -210,9 +268,13 @@ class TerminalMouseDragReporter {
    );
  }

-  bool _isPrimaryMouse(PointerEvent event) =>
-      event.kind == PointerDeviceKind.mouse &&
-      (event.buttons & kPrimaryMouseButton) == kPrimaryMouseButton;
+  bool _isPrimaryPointer(PointerEvent event, bool reportTouchInput) =>
+      (event.kind == PointerDeviceKind.mouse ||
+          reportTouchInput && event.kind == PointerDeviceKind.touch) &&
+      _hasPrimaryButton(event);
+
+  bool _hasPrimaryButton(PointerEvent event) =>
+      (event.buttons & kPrimaryButton) == kPrimaryButton;

  bool _reportsDrag(MouseMode mode) =>
      mode == MouseMode.upDownScrollDrag || mode == MouseMode.upDownScrollMove;
--- a/flutter/lib/models/terminal_mouse_handler.dart
+++ b/flutter/lib/models/terminal_mouse_handler.dart
@@ -1,45 +1,17 @@
 import 'dart:async';

+import 'package:flutter/foundation.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/widgets.dart';
 import 'package:xterm/xterm.dart';

+import 'platform_model.dart';
+import 'rustdesk_terminal.dart';
 import 'terminal_copy_shortcut.dart';
 import 'terminal_mouse_drag_reporter.dart';

-/// xterm 4.0.0 encodes wheel buttons as 68..71; the extra bit reads as a Shift
-/// modifier, so strict full-screen apps ignore the report and never scroll.
-/// Upstream fix: TerminalStudio/xterm.dart#238.
-class WheelButtonFixMouseHandler implements TerminalMouseHandler {
-  const WheelButtonFixMouseHandler({this.positionProvider});
-
-  final CellOffset? Function()? positionProvider;
-
-  @override
-  String? call(TerminalMouseEvent event) {
-    if (!event.button.isWheel) {
-      return defaultMouseHandler(event);
-    }
-    // Same gate as UpDownMouseHandler: only the scroll modes report a wheel,
-    // and a wheel release is never reported, so the report is always a press.
-    if (!event.state.mouseMode.reportScroll ||
-        event.buttonState == TerminalMouseButtonState.up) {
-      return null;
-    }
-    return _reportWheel(event);
-  }
-
-  String _reportWheel(TerminalMouseEvent event) {
-    // Wheel buttons 4..7 go on the wire as 64..67, but `id` is 64 + 4..7.
-    final button = event.button.id - 4;
-    final position = positionProvider?.call() ?? event.position;
-    return encodeTerminalMouseReport(
-      event.state.mouseReportMode,
-      button,
-      position,
-    );
-  }
-}
+part 'terminal_mouse_handler_input.dart';
+part 'terminal_web_clipboard_gesture.dart';

 class TerminalMouseInteraction extends StatefulWidget {
  const TerminalMouseInteraction(
@@ -47,6 +19,12 @@ class TerminalMouseInteraction extends StatefulWidget {
    super.key,
    required this.controller,
    this.focusNode,
+    this.autofocus = false,
+    this.textStyle = const TerminalStyle(),
+    this.deleteDetection = false,
+    this.reportTouchInput = false,
+    this.shortcuts,
+    this.onKeyEvent,
    this.backgroundOpacity = 1,
    this.padding,
    this.onSecondaryTapDown,
@@ -55,6 +33,12 @@ class TerminalMouseInteraction extends StatefulWidget {
  final Terminal terminal;
  final TerminalController controller;
  final FocusNode? focusNode;
+  final bool autofocus;
+  final TerminalStyle textStyle;
+  final bool deleteDetection;
+  final bool reportTouchInput;
+  final Map<ShortcutActivator, Intent>? shortcuts;
+  final FocusOnKeyEventCallback? onKeyEvent;
  final double backgroundOpacity;
  final EdgeInsets? padding;
  final void Function(TapDownDetails, CellOffset)? onSecondaryTapDown;
@@ -81,8 +65,13 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {
  Buffer? _selectionBuffer;
  int? _selectionPointerId;
  Timer? _selectionScrollTimer;
+  Timer? _pendingTouchMouseTimer;
+  PointerDownEvent? _pendingTouchMouseDown;
  var _selectionHasScrolled = false;
  var _scrollDirection = _noScroll;
+  // xterm can finish its tap callbacks after the raw drag was reported.
+  var _suppressXtermLeftButton = false;
+  var _terminalClipboardGesturePrepared = false;
  TerminalViewState? get _terminalView => _terminalViewKey.currentState;

  @override
@@ -90,6 +79,7 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {
    super.initState();
    _mouseHandler = WheelButtonFixMouseHandler(
      positionProvider: _cellAtPointer,
+      suppressLeftButton: kIsWeb ? _consumeXtermLeftButtonSuppression : null,
    );
    _installMouseHandler(widget.terminal);
  }
@@ -100,10 +90,15 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {
    final terminalChanged = !identical(oldWidget.terminal, widget.terminal);
    final controllerChanged =
        !identical(oldWidget.controller, widget.controller);
+    final touchInputChanged =
+        oldWidget.reportTouchInput != widget.reportTouchInput;
+    if (!terminalChanged && !controllerChanged && !touchInputChanged) return;
+    _cancelPendingTouchMouseDrag();
    if (!terminalChanged && !controllerChanged) return;
    if (controllerChanged && !terminalChanged) {
      _mouseDrag.updateController(widget.controller);
    } else {
+      _discardPendingTerminalClipboardWrites();
      _mouseDrag.cancel();
    }
    _clearSelectionDrag();
@@ -123,46 +118,18 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {
    }
  }

-  CellOffset? _cellAtPointer() {
-    final terminalView = _terminalView;
-    final pointerPosition = _pointerPosition;
-    if (terminalView == null || pointerPosition == null) return null;
-    final renderTerminal = terminalView.renderTerminal;
-    return renderTerminal.getCellOffset(
-      renderTerminal.globalToLocal(pointerPosition),
-    );
-  }
-
-  void _updatePointerPosition(PointerEvent event) =>
-      _pointerPosition = event.position;
-
-  void _handlePointerDown(PointerDownEvent event) {
-    _updatePointerPosition(event);
-    if (_mouseDrag.handleDown(event, widget.terminal, _terminalView)) {
-      _clearSelectionDrag();
-      return;
-    }
-    if (event.kind != PointerDeviceKind.mouse ||
-        (event.buttons & kPrimaryMouseButton) != kPrimaryMouseButton) {
-      return;
-    }
-    _clearSelectionDrag();
-    final terminalView = _terminalView;
-    if (terminalView == null) return;
-    final renderTerminal = terminalView.renderTerminal;
-    final localPosition = renderTerminal.globalToLocal(event.position);
-    final selectionBuffer = widget.terminal.buffer;
-    _selectionPointerId = event.pointer;
-    _selectionBase = selectionBuffer.createAnchorFromOffset(
-      renderTerminal.getCellOffset(localPosition),
-    );
-    _selectionBuffer = selectionBuffer;
-    _selectionPointer = localPosition;
-  }
-
  void _handlePointerMove(PointerMoveEvent event) {
    _updatePointerPosition(event);
-    if (_mouseDrag.handleMove(event, widget.terminal, _terminalView)) return;
+    if (_handlePendingTouchMove(event)) return;
+    if (_mouseDrag.handleMove(
+      event,
+      widget.terminal,
+      _terminalView,
+      beforeRelease: _finishTerminalClipboardWrite,
+      onCancel: _cancelTerminalClipboardWrite,
+    )) {
+      return;
+    }
    if (event.pointer != _selectionPointerId) return;
    if (event.kind != PointerDeviceKind.mouse ||
        (event.buttons & kPrimaryMouseButton) != kPrimaryMouseButton) {
@@ -241,8 +208,28 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {

  void _handlePointerEnd(PointerEvent event) {
    _updatePointerPosition(event);
-    if (!_mouseDrag.handleEnd(event, widget.terminal, _terminalView) &&
-        event.pointer != _selectionPointerId) return;
+    final pendingTouch = _pendingTouchMouseDown;
+    if (pendingTouch != null && pendingTouch.pointer == event.pointer) {
+      final movedBeyondSlop =
+          (event.position - pendingTouch.position).distance > kTouchSlop;
+      if (event is PointerUpEvent && !movedBeyondSlop) {
+        _activatePendingTouchMouseDrag(cancelOnFailure: false);
+      } else {
+        _takePendingTouchMouseDrag(pointer: event.pointer);
+      }
+    }
+    final handledByMouseDrag = _mouseDrag.handleEnd(
+      event,
+      widget.terminal,
+      _terminalView,
+      beforeRelease: event is PointerUpEvent
+          ? _finishTerminalClipboardWrite
+          : (_) => _cancelTerminalClipboardWrite(),
+      onCancel: _cancelTerminalClipboardWrite,
+    );
+    if (!handledByMouseDrag && event.pointer != _selectionPointerId) {
+      return;
+    }
    if (_selectionHasScrolled) _scrollSelection(scroll: false);
    _clearSelectionDrag();
  }
@@ -265,6 +252,8 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {

  @override
  void dispose() {
+    _discardPendingTerminalClipboardWrites();
+    _cancelPendingTouchMouseDrag();
    _mouseDrag.cancel();
    _clearSelectionDrag();
    _restoreMouseHandler(widget.terminal);
@@ -290,10 +279,14 @@ class _TerminalMouseInteractionState extends State<TerminalMouseInteraction> {
        controller: widget.controller,
        scrollController: _scrollController,
        focusNode: widget.focusNode,
+        autofocus: widget.autofocus,
+        textStyle: widget.textStyle,
+        deleteDetection: widget.deleteDetection,
        backgroundOpacity: widget.backgroundOpacity,
        padding: widget.padding,
-        shortcuts: platformTerminalShortcuts(),
-        onKeyEvent: terminalCopyHandler(widget.terminal, widget.controller),
+        shortcuts: widget.shortcuts ?? platformTerminalShortcuts(),
+        onKeyEvent: widget.onKeyEvent ??
+            terminalCopyHandler(widget.terminal, widget.controller),
        onSecondaryTapDown: widget.onSecondaryTapDown,
      ),
    );
--- a/flutter/lib/models/terminal_mouse_handler_input.dart
+++ b/flutter/lib/models/terminal_mouse_handler_input.dart
@@ -0,0 +1,162 @@
+part of 'terminal_mouse_handler.dart';
+
+/// xterm 4.0.0 encodes wheel buttons as 68..71; the extra bit reads as a Shift
+/// modifier, so strict full-screen apps ignore the report and never scroll.
+/// Upstream fix: TerminalStudio/xterm.dart#238.
+class WheelButtonFixMouseHandler implements TerminalMouseHandler {
+  const WheelButtonFixMouseHandler({
+    this.positionProvider,
+    this.suppressLeftButton,
+  });
+
+  final CellOffset? Function()? positionProvider;
+  final bool Function(TerminalMouseButtonState)? suppressLeftButton;
+
+  @override
+  String? call(TerminalMouseEvent event) {
+    if (!event.button.isWheel) {
+      if (event.button == TerminalMouseButton.left &&
+          suppressLeftButton?.call(event.buttonState) == true) {
+        return null;
+      }
+      return defaultMouseHandler(event);
+    }
+    // Same gate as UpDownMouseHandler: only the scroll modes report a wheel,
+    // and a wheel release is never reported, so the report is always a press.
+    if (!event.state.mouseMode.reportScroll ||
+        event.buttonState == TerminalMouseButtonState.up) {
+      return null;
+    }
+    return _reportWheel(event);
+  }
+
+  String _reportWheel(TerminalMouseEvent event) {
+    // Wheel buttons 4..7 go on the wire as 64..67, but `id` is 64 + 4..7.
+    final button = event.button.id - 4;
+    final position = positionProvider?.call() ?? event.position;
+    return encodeTerminalMouseReport(
+      event.state.mouseReportMode,
+      button,
+      position,
+    );
+  }
+}
+
+extension _TerminalMouseInput on _TerminalMouseInteractionState {
+  CellOffset? _cellAtPointer() {
+    final terminalView = _terminalView;
+    final pointerPosition = _pointerPosition;
+    if (terminalView == null || pointerPosition == null) return null;
+    final renderTerminal = terminalView.renderTerminal;
+    return renderTerminal.getCellOffset(
+      renderTerminal.globalToLocal(pointerPosition),
+    );
+  }
+
+  void _updatePointerPosition(PointerEvent event) =>
+      _pointerPosition = event.position;
+
+  void _handlePointerDown(PointerDownEvent event) {
+    _updatePointerPosition(event);
+    _suppressXtermLeftButton = false;
+    if (_startPendingTouchMouseDrag(event)) return;
+    if (_mouseDrag.handleDown(event, widget.terminal, _terminalView)) {
+      _prepareTerminalClipboardWrite();
+      if (kIsWeb) _suppressXtermLeftButton = true;
+      _clearSelectionDrag();
+      return;
+    }
+    if (event.kind != PointerDeviceKind.mouse ||
+        (event.buttons & kPrimaryMouseButton) != kPrimaryMouseButton) {
+      return;
+    }
+    _clearSelectionDrag();
+    final terminalView = _terminalView;
+    if (terminalView == null) return;
+    final renderTerminal = terminalView.renderTerminal;
+    final localPosition = renderTerminal.globalToLocal(event.position);
+    final selectionBuffer = widget.terminal.buffer;
+    _selectionPointerId = event.pointer;
+    _selectionBase = selectionBuffer.createAnchorFromOffset(
+      renderTerminal.getCellOffset(localPosition),
+    );
+    _selectionBuffer = selectionBuffer;
+    _selectionPointer = localPosition;
+  }
+
+  bool _startPendingTouchMouseDrag(PointerDownEvent event) {
+    if (!widget.reportTouchInput ||
+        event.kind != PointerDeviceKind.touch ||
+        !_mouseDrag.handleDown(
+          event,
+          widget.terminal,
+          _terminalView,
+          reportTouchInput: true,
+          deferReport: true,
+        )) {
+      return false;
+    }
+    _pendingTouchMouseDown = event;
+    _pendingTouchMouseTimer = Timer(
+      kLongPressTimeout,
+      _activatePendingTouchMouseDrag,
+    );
+    return true;
+  }
+
+  bool _activatePendingTouchMouseDrag({
+    bool cancelOnFailure = true,
+  }) {
+    if (_takePendingTouchMouseDrag() == null) return false;
+    if (_mouseDrag.activateDeferredDown(widget.terminal)) {
+      _prepareTerminalClipboardWrite();
+      _clearSelectionDrag();
+      return true;
+    }
+    if (cancelOnFailure) _mouseDrag.cancel();
+    return false;
+  }
+
+  PointerDownEvent? _takePendingTouchMouseDrag({int? pointer}) {
+    final pending = _pendingTouchMouseDown;
+    if (pending == null || pointer != null && pointer != pending.pointer) {
+      return null;
+    }
+    _pendingTouchMouseTimer?.cancel();
+    _pendingTouchMouseTimer = null;
+    _pendingTouchMouseDown = null;
+    return pending;
+  }
+
+  void _cancelPendingTouchMouseDrag({
+    int? pointer,
+    bool deferCancel = false,
+  }) {
+    if (_takePendingTouchMouseDrag(pointer: pointer) == null) return;
+    if (deferCancel) {
+      scheduleMicrotask(_mouseDrag.cancel);
+    } else {
+      _mouseDrag.cancel();
+    }
+  }
+
+  bool _handlePendingTouchMove(PointerMoveEvent event) {
+    final pending = _pendingTouchMouseDown;
+    if (pending == null || pending.pointer != event.pointer) return false;
+    if ((event.position - pending.position).distance > kTouchSlop) {
+      _cancelPendingTouchMouseDrag(
+        pointer: event.pointer,
+        deferCancel: true,
+      );
+    }
+    return true;
+  }
+
+  bool _consumeXtermLeftButtonSuppression(TerminalMouseButtonState state) {
+    final suppress = _suppressXtermLeftButton;
+    if (state == TerminalMouseButtonState.up) {
+      _suppressXtermLeftButton = false;
+    }
+    return suppress;
+  }
+}
--- a/flutter/lib/models/terminal_web_clipboard_gesture.dart
+++ b/flutter/lib/models/terminal_web_clipboard_gesture.dart
@@ -0,0 +1,56 @@
+part of 'terminal_mouse_handler.dart';
+
+const _prepareTerminalClipboardCommand = 'prepare_terminal_clipboard';
+const _finishTerminalClipboardCommand = 'finish_terminal_clipboard';
+const _cancelTerminalClipboardCommand = 'cancel_terminal_clipboard';
+
+extension _TerminalWebClipboardGesture on _TerminalMouseInteractionState {
+  void _prepareTerminalClipboardWrite() {
+    if (!kIsWeb) return;
+    _cancelTerminalClipboardWrite();
+    final terminal = widget.terminal;
+    if (terminal is! RustDeskTerminal || !terminal.isClipboardWriteAllowed) {
+      return;
+    }
+    try {
+      ffiSetByName(_prepareTerminalClipboardCommand);
+      _terminalClipboardGesturePrepared = true;
+    } catch (error) {
+      debugPrint('[Terminal] Failed to prepare Web clipboard write: $error');
+    }
+  }
+
+  void _finishTerminalClipboardWrite(bool responseExpected) {
+    if (!_terminalClipboardGesturePrepared) return;
+    _terminalClipboardGesturePrepared = false;
+    if (!kIsWeb) return;
+    try {
+      ffiSetByName(
+        _finishTerminalClipboardCommand,
+        responseExpected ? 'true' : 'false',
+      );
+    } catch (error) {
+      debugPrint('[Terminal] Failed to finish Web clipboard write: $error');
+    }
+  }
+
+  void _cancelTerminalClipboardWrite() {
+    if (!_terminalClipboardGesturePrepared) return;
+    _terminalClipboardGesturePrepared = false;
+    _sendTerminalClipboardCancel();
+  }
+
+  void _discardPendingTerminalClipboardWrites() {
+    _cancelTerminalClipboardWrite();
+    _sendTerminalClipboardCancel();
+  }
+
+  void _sendTerminalClipboardCancel() {
+    if (!kIsWeb) return;
+    try {
+      ffiSetByName(_cancelTerminalClipboardCommand);
+    } catch (error) {
+      debugPrint('[Terminal] Failed to cancel Web clipboard write: $error');
+    }
+  }
+}
--- a/libs/hbb_common
+++ b/libs/hbb_common
--- a/libs/portable/Cargo.toml
+++ b/libs/portable/Cargo.toml
@@ -12,7 +12,7 @@ build = "build.rs"
 brotli = "3.4"
 dirs = "5.0"
 md5 = "0.7"
-winapi = { version = "0.3", features = ["winbase"] }
+winapi = { version = "0.3", features = ["winbase", "libloaderapi"] }

 [target.'cfg(target_os = "windows")'.dependencies]
 windows = { version = "0.61", features = [
--- a/libs/portable/generate.py
+++ b/libs/portable/generate.py
@@ -15,15 +15,29 @@ encoding = 'utf-8'
 # output: {path: (compressed_data, file_md5)}


-def generate_md5_table(folder: str, level) -> dict:
+def normalize(path: str) -> str:
+    path = path.replace('\\', '/')
+    while path.startswith('./'):
+        path = path[2:]
+    return path.lower()
+
+
+def generate_md5_table(folder: str, level, exclude: str = None) -> dict:
    res: dict = dict()
-    curdir = os.curdir
+    skip = normalize(exclude) if exclude else None
+    excluded = False
+    # os.curdir is the literal ".", so restoring it left us inside `folder`.
+    curdir = os.getcwd()
    os.chdir(folder)
    for root, _, files in os.walk('.'):
        # remove ./
        for f in files:
            md5_generator = md5()
            full_path = os.path.join(root, f)
+            if skip and normalize(full_path) == skip:
+                print(f"Excluding {full_path}...")
+                excluded = True
+                continue
            print(f"Processing {full_path}...")
            f = open(full_path, "rb")
            content = f.read()
@@ -33,11 +47,16 @@ def generate_md5_table(folder: str, level) -> dict:
            md5_code = md5_generator.hexdigest().encode(encoding=encoding)
            res[full_path] = (content_compressed, md5_code)
    os.chdir(curdir)
+    if skip and not excluded:
+        raise ValueError(f"excluded file was not found in {folder}: {exclude}")
    return res


 def write_package_metadata(md5_table: dict, output_folder: str, exe: str):
-    output_path = os.path.join(output_folder, "data.bin")
+    write_blob(md5_table, os.path.join(output_folder, "data.bin"), exe)
+
+
+def write_blob(md5_table: dict, output_path: str, exe: str):
    with open(output_path, "wb") as f:
        f.write("rustdesk".encode(encoding=encoding))
        for path in md5_table.keys():
@@ -92,6 +111,14 @@ if __name__ == '__main__':
                      help="the target used by cargo")
    parser.add_option("-l", "--level", dest="level", type="int",
                      help="compression level, default is 11, highest", default=11)
+    parser.add_option("--package", dest="package",
+                      help="write the per-customer blob to this path instead of "
+                           "data.bin, and skip the cargo build. Injected into the "
+                           "template's RDPKG resource so customizing needs no rebuild")
+    parser.add_option("--exclude-exe", dest="exclude_exe", action="store_true",
+                      default=False,
+                      help="omit the executable from the blob, for a template whose "
+                           "executable ships in the package instead")
    (options, args) = parser.parse_args()
    folder = options.folder or './rustdesk'
    output_folder = os.path.abspath(options.output_folder or './')
@@ -100,14 +127,29 @@ if __name__ == '__main__':
        options.executable = 'rustdesk.exe'
    if not options.executable.startswith(folder):
        options.executable = folder + '/' + options.executable
+    # Note: the simple check `options.executable.startswith(folder)` is incorrect.
+    # `python generate.py -f rustdesk -e rustdesk.exe` or `python generate.py -f rustdesk`
+    # will result the print "Executable path: ..exe".
+    # So we need to check if the executable is in the folder, and if so, concat again.
+    if os.path.exists(os.path.join(folder, options.executable)):
+        options.executable = os.path.join(folder, options.executable)
+    folder_path = os.path.abspath(folder)
    exe: str = os.path.abspath(options.executable)
-    if not exe.startswith(os.path.abspath(folder)):
+    try:
+        in_source_folder = os.path.commonpath([folder_path, exe]) == folder_path
+    except ValueError:
+        in_source_folder = False
+    if not in_source_folder:
        print("The executable must locate in source folder")
        exit(-1)
-    exe = '.' + exe[len(os.path.abspath(folder)):]
+    exe = '.' + exe[len(folder_path):]
    print("Executable path: " + exe)
    print("Compression level: " + str(options.level))
-    md5_table = generate_md5_table(folder, options.level)
-    write_package_metadata(md5_table, output_folder, exe)
-    write_app_metadata(output_folder)
-    build_portable(output_folder, options.target)
+    md5_table = generate_md5_table(
+        folder, options.level, exe if options.exclude_exe else None)
+    if options.package:
+        write_blob(md5_table, os.path.abspath(options.package), exe)
+    else:
+        write_package_metadata(md5_table, output_folder, exe)
+        write_app_metadata(output_folder)
+        build_portable(output_folder, options.target)
--- a/libs/portable/src/bin_reader.rs
+++ b/libs/portable/src/bin_reader.rs
@@ -1,15 +1,22 @@
 use std::{
+    collections::HashSet,
    fs::{self},
    io::{Cursor, Read},
    path::Path,
 };

+// The generic payload, shared by every customer and compiled in once per release.
 #[cfg(windows)]
 const BIN_DATA: &[u8] = include_bytes!("../data.bin");
-#[cfg(not(windows))]
-const BIN_DATA: &[u8] = &[];
+
+// The per-customer payload, injected into the RCDATA resource after the template
+// has been built, so that customizing a client needs no recompilation.
+#[cfg(windows)]
+const PACKAGE_RESOURCE_NAME: &str = "RDPKG";
+
 // 4bytes
 const LENGTH: usize = 4;
+const IDENTIFIER: &[u8] = b"rustdesk";
 const IDENTIFIER_LENGTH: usize = 8;
 const MD5_LENGTH: usize = 32;
 const BUF_SIZE: usize = 4096;
@@ -24,12 +31,172 @@ pub(crate) struct BinaryData {
 pub(crate) struct BinaryReader {
    pub files: Vec<BinaryData>,
    pub exe: String,
+    // Paths supplied by the per-customer package. Recorded so that a file dropped
+    // from a later package -- a logo the customer removed, say -- can be deleted
+    // from an existing extraction, which the timestamp wipe no longer covers now
+    // that the packer is built once per release rather than once per customer.
+    pub package_paths: Vec<String>,
 }

-impl Default for BinaryReader {
-    fn default() -> Self {
-        let (files, exe) = BinaryReader::read();
-        Self { files, exe }
+impl BinaryReader {
+    pub fn new() -> Result<Self, String> {
+        let package = read_package()?;
+        let package_paths = package.0.iter().map(|f| f.path.clone()).collect();
+        let (files, exe) = merge(read_embedded()?, package);
+        Ok(Self {
+            files,
+            exe,
+            package_paths,
+        })
+    }
+}
+
+// Folds the per-customer package into the generic payload.
+fn merge(
+    embedded: (Vec<BinaryData>, String),
+    package: (Vec<BinaryData>, String),
+) -> (Vec<BinaryData>, String) {
+    let (mut files, generic_exe) = embedded;
+    let (package_files, package_exe) = package;
+
+    let exe = if package_exe.is_empty() {
+        generic_exe.clone()
+    } else {
+        package_exe
+    };
+
+    // The generic payload ships the executable under its stock name, the package
+    // decides the final one. Rename on extraction so the process is always
+    // `<appname>.exe`, which the app itself relies on to find its own sessions.
+    if !generic_exe.is_empty() && normalize_path(&exe) != normalize_path(&generic_exe) {
+        let generic_key = normalize_path(&generic_exe);
+        for file in files.iter_mut() {
+            if normalize_path(&file.path) == generic_key {
+                file.path = exe.clone();
+            }
+        }
+    }
+
+    // Per-customer entries replace the generic ones they shadow.
+    if !package_files.is_empty() {
+        let overridden: HashSet<String> = package_files
+            .iter()
+            .map(|file| normalize_path(&file.path))
+            .collect();
+        files.retain(|file| !overridden.contains(&normalize_path(&file.path)));
+        files.extend(package_files);
+    }
+
+    (files, exe)
+}
+
+pub(crate) fn normalize_path(path: &str) -> String {
+    path.replace('\\', "/")
+        .trim_start_matches("./")
+        .to_lowercase()
+}
+
+fn read_u32(blob: &[u8], at: usize) -> Option<u32> {
+    let bytes = blob.get(at..at + LENGTH)?;
+    Some(u32::from_be_bytes([bytes[0], bytes[1], bytes[2], bytes[3]]))
+}
+
+// Returns the files and the executable to launch, or None if the blob is absent or malformed.
+fn parse(blob: &'static [u8]) -> Option<(Vec<BinaryData>, String)> {
+    let mut base = 0usize;
+    let mut parsed = Vec::new();
+    if blob.get(base..base + IDENTIFIER_LENGTH)? != IDENTIFIER {
+        return None;
+    }
+    base += IDENTIFIER_LENGTH;
+    loop {
+        if blob.get(base..base + IDENTIFIER_LENGTH)? == IDENTIFIER {
+            base += IDENTIFIER_LENGTH;
+            break;
+        }
+        let path_length = read_u32(blob, base)? as usize;
+        base += LENGTH;
+        let path = std::str::from_utf8(blob.get(base..base + path_length)?)
+            .ok()?
+            .to_owned();
+        base += path_length;
+        let file_length = read_u32(blob, base)? as usize;
+        base += LENGTH;
+        let raw = blob.get(base..base + file_length)?;
+        base += file_length;
+        let md5_code = blob.get(base..base + MD5_LENGTH)?;
+        base += MD5_LENGTH;
+        parsed.push(BinaryData {
+            md5_code,
+            raw,
+            path,
+        });
+    }
+    let executable = std::str::from_utf8(blob.get(base..)?).ok()?.to_owned();
+    Some((parsed, executable))
+}
+
+#[cfg(windows)]
+fn read_embedded() -> Result<(Vec<BinaryData>, String), String> {
+    parse(BIN_DATA).ok_or_else(|| "bin file is not valid!".to_owned())
+}
+
+#[cfg(not(windows))]
+fn read_embedded() -> Result<(Vec<BinaryData>, String), String> {
+    Ok(Default::default())
+}
+
+fn parse_package_blob(blob: Option<&'static [u8]>) -> Result<(Vec<BinaryData>, String), String> {
+    let Some(blob) = blob else {
+        return Ok(Default::default());
+    };
+    let package = parse(blob).ok_or_else(|| "RDPKG resource is invalid".to_owned())?;
+    if package.1.trim().is_empty() {
+        return Err("RDPKG resource has no executable".to_owned());
+    }
+    Ok(package)
+}
+
+#[cfg(windows)]
+fn read_package() -> Result<(Vec<BinaryData>, String), String> {
+    parse_package_blob(read_resource(PACKAGE_RESOURCE_NAME))
+}
+
+#[cfg(not(windows))]
+fn read_package() -> Result<(Vec<BinaryData>, String), String> {
+    Ok(Default::default())
+}
+
+// Reads an RCDATA resource out of the running image. Resources live in the mapped
+// image for the lifetime of the process, so the slice is genuinely 'static and no
+// copy is needed.
+#[cfg(windows)]
+fn read_resource(name: &str) -> Option<&'static [u8]> {
+    use std::ptr::null_mut;
+    use winapi::um::libloaderapi::{FindResourceW, LoadResource, LockResource, SizeofResource};
+
+    // MAKEINTRESOURCEW(10), avoids depending on the winuser feature for RT_RCDATA.
+    const RT_RCDATA: *const u16 = 10 as _;
+
+    let name: Vec<u16> = name.encode_utf16().chain(std::iter::once(0)).collect();
+    unsafe {
+        let info = FindResourceW(null_mut(), name.as_ptr(), RT_RCDATA);
+        if info.is_null() {
+            return None;
+        }
+        let size = SizeofResource(null_mut(), info) as usize;
+        if size == 0 {
+            return None;
+        }
+        let handle = LoadResource(null_mut(), info);
+        if handle.is_null() {
+            return None;
+        }
+        let data = LockResource(handle) as *const u8;
+        if data.is_null() {
+            return None;
+        }
+        Some(std::slice::from_raw_parts(data, size))
    }
 }

@@ -68,59 +235,6 @@ impl BinaryData {
 }

 impl BinaryReader {
-    fn read() -> (Vec<BinaryData>, String) {
-        let mut base: usize = 0;
-        let mut parsed = vec![];
-        assert!(BIN_DATA.len() > IDENTIFIER_LENGTH, "bin data invalid!");
-        let mut iden = String::from_utf8_lossy(&BIN_DATA[base..base + IDENTIFIER_LENGTH]);
-        if iden != "rustdesk" {
-            panic!("bin file is not valid!");
-        }
-        base += IDENTIFIER_LENGTH;
-        loop {
-            iden = String::from_utf8_lossy(&BIN_DATA[base..base + IDENTIFIER_LENGTH]);
-            if iden == "rustdesk" {
-                base += IDENTIFIER_LENGTH;
-                break;
-            }
-            // start reading
-            let mut offset = 0;
-            let path_length = u32::from_be_bytes([
-                BIN_DATA[base + offset],
-                BIN_DATA[base + offset + 1],
-                BIN_DATA[base + offset + 2],
-                BIN_DATA[base + offset + 3],
-            ]) as usize;
-            offset += LENGTH;
-            let path =
-                String::from_utf8_lossy(&BIN_DATA[base + offset..base + offset + path_length])
-                    .to_string();
-            offset += path_length;
-            // file sz
-            let file_length = u32::from_be_bytes([
-                BIN_DATA[base + offset],
-                BIN_DATA[base + offset + 1],
-                BIN_DATA[base + offset + 2],
-                BIN_DATA[base + offset + 3],
-            ]) as usize;
-            offset += LENGTH;
-            let raw = &BIN_DATA[base + offset..base + offset + file_length];
-            offset += file_length;
-            // md5
-            let md5 = &BIN_DATA[base + offset..base + offset + MD5_LENGTH];
-            offset += MD5_LENGTH;
-            parsed.push(BinaryData {
-                md5_code: md5,
-                raw: raw,
-                path: path,
-            });
-            base += offset;
-        }
-        // executable
-        let executable = String::from_utf8_lossy(&BIN_DATA[base..]).to_string();
-        (parsed, executable)
-    }
-
    #[cfg(linux)]
    pub fn configure_permission(&self, prefix: &Path) {
        use std::os::unix::prelude::PermissionsExt;
@@ -137,3 +251,155 @@ impl BinaryReader {
        }
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    // Builds a blob in the same layout generate.py writes, so these tests pin the
+    // cross-language format contract as well as the merge rules.
+    fn blob(files: &[(&str, &[u8])], exe: &str) -> &'static [u8] {
+        let mut out = Vec::new();
+        out.extend_from_slice(IDENTIFIER);
+        for (path, data) in files {
+            out.extend_from_slice(&(path.len() as u32).to_be_bytes());
+            out.extend_from_slice(path.as_bytes());
+            out.extend_from_slice(&(data.len() as u32).to_be_bytes());
+            out.extend_from_slice(data);
+            out.extend_from_slice(&[b'a'; MD5_LENGTH]);
+        }
+        out.extend_from_slice(IDENTIFIER);
+        out.extend_from_slice(exe.as_bytes());
+        Box::leak(out.into_boxed_slice())
+    }
+
+    fn entry<'a>(files: &'a [BinaryData], path: &str) -> Option<&'a BinaryData> {
+        files
+            .iter()
+            .find(|file| normalize_path(&file.path) == normalize_path(path))
+    }
+
+    #[test]
+    fn parses_the_generate_py_layout() {
+        let (files, exe) = parse(blob(
+            &[("./rustdesk.exe", b"app"), ("./custom.txt", b"cfg")],
+            "./rustdesk.exe",
+        ))
+        .unwrap();
+        assert_eq!(exe, "./rustdesk.exe");
+        assert_eq!(files.len(), 2);
+        assert_eq!(entry(&files, "./custom.txt").unwrap().raw, b"cfg");
+    }
+
+    #[test]
+    fn rejects_malformed_blobs() {
+        assert!(parse(b"".as_slice()).is_none());
+        assert!(parse(b"notrustd".as_slice()).is_none());
+        // Truncated mid-record rather than panicking on a slice out of range.
+        assert!(parse(b"rustdesk\x00\x00\x00\x40partial".as_slice()).is_none());
+    }
+
+    #[test]
+    fn distinguishes_an_absent_package_from_a_malformed_one() {
+        assert!(parse_package_blob(None).unwrap().0.is_empty());
+        assert!(parse_package_blob(Some(b"damaged")).is_err());
+        assert!(parse_package_blob(Some(blob(&[("./custom.txt", b"cfg")], ""))).is_err());
+    }
+
+    #[test]
+    fn without_a_package_the_stock_payload_is_untouched() {
+        let embedded = parse(blob(&[("./rustdesk.exe", b"app")], "./rustdesk.exe")).unwrap();
+        let (files, exe) = merge(embedded, Default::default());
+        assert_eq!(exe, "./rustdesk.exe");
+        assert!(entry(&files, "./rustdesk.exe").is_some());
+    }
+
+    #[test]
+    fn renames_the_stock_executable_to_the_package_name() {
+        // x86: the big executable stays in the generic payload and only gets renamed.
+        let embedded = parse(blob(
+            &[("./rustdesk.exe", b"app"), ("./sciter.dll", b"dll")],
+            "./rustdesk.exe",
+        ))
+        .unwrap();
+        let package = parse(blob(&[("./custom.txt", b"cfg")], "./acme.exe")).unwrap();
+
+        let (files, exe) = merge(embedded, package);
+
+        assert_eq!(exe, "./acme.exe");
+        assert!(entry(&files, "./acme.exe").is_some());
+        assert!(entry(&files, "./rustdesk.exe").is_none());
+        // Untouched neighbours survive.
+        assert_eq!(entry(&files, "./sciter.dll").unwrap().raw, b"dll");
+        assert_eq!(entry(&files, "./custom.txt").unwrap().raw, b"cfg");
+    }
+
+    #[test]
+    fn package_entries_win_over_the_generic_payload() {
+        // x64: the customized executable and icons ship in the package instead.
+        let embedded = parse(blob(
+            &[
+                ("./data/flutter_assets/assets/icon.ico", b"stock-icon"),
+                ("./librustdesk.dll", b"core"),
+            ],
+            "./rustdesk.exe",
+        ))
+        .unwrap();
+        let package = parse(blob(
+            &[
+                ("./acme.exe", b"branded"),
+                ("./data/flutter_assets/assets/icon.ico", b"acme-icon"),
+            ],
+            "./acme.exe",
+        ))
+        .unwrap();
+
+        let (files, exe) = merge(embedded, package);
+
+        assert_eq!(exe, "./acme.exe");
+        assert_eq!(
+            entry(&files, "./data/flutter_assets/assets/icon.ico")
+                .unwrap()
+                .raw,
+            b"acme-icon"
+        );
+        assert_eq!(
+            files
+                .iter()
+                .filter(|f| normalize_path(&f.path) == "data/flutter_assets/assets/icon.ico")
+                .count(),
+            1
+        );
+        assert_eq!(entry(&files, "./librustdesk.dll").unwrap().raw, b"core");
+    }
+
+    #[test]
+    fn package_paths_are_recorded_for_the_dropped_file_sweep() {
+        let package = parse(blob(
+            &[("./custom.txt", b"cfg"), ("./data/logo.png", b"img")],
+            "./acme.exe",
+        ))
+        .unwrap();
+        let mut paths: Vec<String> = package.0.iter().map(|f| f.path.clone()).collect();
+        paths.sort();
+        assert_eq!(paths, vec!["./custom.txt", "./data/logo.png"]);
+
+        // Merging must not disturb them: the generic payload contributes none.
+        let embedded = parse(blob(&[("./librustdesk.dll", b"core")], "./rustdesk.exe")).unwrap();
+        let (files, _) = merge(embedded, package);
+        assert!(entry(&files, "./data/logo.png").is_some());
+    }
+
+    #[test]
+    fn matches_paths_across_separator_styles() {
+        // generate.py emits backslashes when it runs on Windows.
+        let embedded = parse(blob(&[(".\\rustdesk.exe", b"app")], ".\\rustdesk.exe")).unwrap();
+        let package = parse(blob(&[("./custom.txt", b"cfg")], "./acme.exe")).unwrap();
+
+        let (files, exe) = merge(embedded, package);
+
+        assert_eq!(exe, "./acme.exe");
+        assert!(entry(&files, "./acme.exe").is_some());
+        assert!(entry(&files, ".\\rustdesk.exe").is_none());
+    }
+}
--- a/libs/portable/src/main.rs
+++ b/libs/portable/src/main.rs
@@ -5,7 +5,7 @@ use std::{
    process::{Command, Stdio},
 };

-use bin_reader::BinaryReader;
+use bin_reader::{normalize_path, BinaryReader};

 pub mod bin_reader;
 #[cfg(windows)]
@@ -17,11 +17,24 @@ const APP_METADATA: &[u8] = include_bytes!("../app_metadata.toml");
 const APP_METADATA: &[u8] = &[];
 const APP_METADATA_CONFIG: &str = "meta.toml";
 const META_LINE_PREFIX_TIMESTAMP: &str = "timestamp = ";
+const META_LINE_PREFIX_FILE: &str = "file = ";
 const APP_PREFIX: &str = "rustdesk";
 const APPNAME_RUNTIME_ENV_KEY: &str = "RUSTDESK_APPNAME";
 #[cfg(windows)]
 const SET_FOREGROUND_WINDOW_ENV_KEY: &str = "SET_FOREGROUND_WINDOW";

+// The extraction directory follows whatever executable the payload asks for, so a
+// custom client gets its own directory instead of sharing RustDesk's. Falls back to
+// APP_PREFIX when no package is injected, which keeps stock builds unchanged.
+fn app_dir_name(exe: &str) -> String {
+    Path::new(&exe.replace('\\', "/"))
+        .file_stem()
+        .and_then(|stem| stem.to_str())
+        .map(|stem| stem.trim().to_lowercase())
+        .filter(|stem| !stem.is_empty())
+        .unwrap_or_else(|| APP_PREFIX.to_owned())
+}
+
 fn is_timestamp_matches(dir: &Path, ts: &mut u64) -> bool {
    let Ok(app_metadata) = std::str::from_utf8(APP_METADATA) else {
        return true;
@@ -50,13 +63,93 @@ fn is_timestamp_matches(dir: &Path, ts: &mut u64) -> bool {
    false
 }

-fn write_meta(dir: &Path, ts: u64) {
+fn write_meta(dir: &Path, ts: u64, package_paths: &[String]) {
    let meta_file = dir.join(APP_METADATA_CONFIG);
-    if ts != 0 {
-        let content = format!("{}{}", META_LINE_PREFIX_TIMESTAMP, ts);
-        // Ignore is ok here
-        let _ = std::fs::write(meta_file, content);
+    let mut content = format!("{}{}\n", META_LINE_PREFIX_TIMESTAMP, ts);
+    for path in package_paths {
+        content.push_str(&format!("{}{}\n", META_LINE_PREFIX_FILE, path));
    }
+    // Ignore is ok here
+    let _ = std::fs::write(meta_file, content);
+}
+
+fn previous_package_files(dir: &Path) -> Vec<String> {
+    let Ok(content) = std::fs::read_to_string(dir.join(APP_METADATA_CONFIG)) else {
+        return Vec::new();
+    };
+    content
+        .lines()
+        .filter_map(|line| line.strip_prefix(META_LINE_PREFIX_FILE))
+        .map(|path| path.trim().to_owned())
+        .collect()
+}
+
+// meta.toml is plain text in a user-writable directory, and it now drives deletion,
+// so the path is rebuilt from plain components rather than joined as written. A
+// prefix, root or parent component would otherwise escape the extraction directory:
+// Path::join replaces the base entirely when given an absolute path.
+fn resolve_within(dir: &Path, relative: &str) -> Option<PathBuf> {
+    use std::path::Component;
+    let mut path = dir.to_path_buf();
+    let mut any = false;
+    for component in Path::new(&relative.replace('\\', "/")).components() {
+        match component {
+            Component::Normal(part) => {
+                // A drive-relative name like "C:x" parses as Normal, and only a
+                // Windows host would classify "C:/..." as a Prefix, so the colon is
+                // rejected outright rather than relying on the host's parser.
+                if part.to_string_lossy().contains(':') {
+                    return None;
+                }
+                path.push(part);
+                any = true;
+            }
+            Component::CurDir => {}
+            _ => return None,
+        }
+    }
+    if any {
+        Some(path)
+    } else {
+        None
+    }
+}
+
+// A customer who drops a branding asset gets a package without it, and the file
+// would otherwise linger in an existing extraction and keep being used. The wipe
+// cannot cover this: it is keyed on the packer's build timestamp, which is now the
+// same for every customer of a release.
+fn remove_dropped_package_files_with<F>(
+    dir: &Path,
+    current: &[String],
+    mut remove_file: F,
+) -> Vec<String>
+where
+    F: FnMut(&Path) -> std::io::Result<()>,
+{
+    let keep: std::collections::HashSet<String> =
+        current.iter().map(|p| normalize_path(p)).collect();
+    let mut failed = Vec::new();
+    for previous in previous_package_files(dir) {
+        if keep.contains(&normalize_path(&previous)) {
+            continue;
+        }
+        let Some(path) = resolve_within(dir, &previous) else {
+            continue;
+        };
+        if path.is_file() {
+            println!("removing dropped {}", previous);
+            if let Err(error) = remove_file(&path) {
+                eprintln!("failed to remove dropped {}: {}", previous, error);
+                failed.push(previous);
+            }
+        }
+    }
+    failed
+}
+
+fn remove_dropped_package_files(dir: &Path, current: &[String]) -> Vec<String> {
+    remove_dropped_package_files_with(dir, current, |path| std::fs::remove_file(path))
 }

 fn setup(
@@ -71,7 +164,7 @@ fn setup(
    } else {
        // home dir
        if let Some(dir) = dirs::data_local_dir() {
-            dir.join(APP_PREFIX)
+            dir.join(app_dir_name(&reader.exe))
        } else {
            eprintln!("not found data local dir");
            return None;
@@ -87,10 +180,12 @@ fn setup(
        }
        std::fs::remove_dir_all(&dir).ok();
    }
+    let mut metadata_paths = reader.package_paths.clone();
+    metadata_paths.extend(remove_dropped_package_files(&dir, &reader.package_paths));
    for file in reader.files.iter() {
        file.write_to_file(&dir);
    }
-    write_meta(&dir, ts);
+    write_meta(&dir, ts, &metadata_paths);
    #[cfg(windows)]
    win::copy_runtime_broker(&dir);
    #[cfg(linux)]
@@ -174,7 +269,7 @@ fn execute(path: PathBuf, args: Vec<String>, _ui: bool) {
    }
 }

-fn main() {
+fn main() -> Result<(), String> {
    let mut args = Vec::new();
    let mut arg_exe = Default::default();
    let mut i = 0;
@@ -193,7 +288,7 @@ fn main() {
    let quick_support = false;

    let mut ui = false;
-    let reader = BinaryReader::default();
+    let reader = BinaryReader::new()?;
    if let Some(exe) = setup(
        reader,
        None,
@@ -208,6 +303,7 @@ fn main() {
        }
        execute(exe, args, ui);
    }
+    Ok(())
 }

 #[cfg(windows)]
@@ -246,3 +342,27 @@ mod win {
        exe.contains("-qs-") || exe.contains("-qs.exe") || exe.contains("_qs.exe")
    }
 }
+
+#[cfg(test)]
+mod meta_tests {
+    use super::*;
+
+    #[test]
+    fn resolve_within_rejects_paths_that_escape() {
+        let base = Path::new("/base");
+        assert_eq!(
+            resolve_within(base, "./data/logo.png"),
+            Some(base.join("data").join("logo.png"))
+        );
+        assert_eq!(
+            resolve_within(base, ".\\data\\logo.png"),
+            Some(base.join("data").join("logo.png"))
+        );
+        // meta.toml is user-writable, so these must not reach remove_file.
+        assert_eq!(resolve_within(base, "../../etc/passwd"), None);
+        assert_eq!(resolve_within(base, "/etc/passwd"), None);
+        assert_eq!(resolve_within(base, "C:\\Windows\\System32\\x.dll"), None);
+        assert_eq!(resolve_within(base, "."), None);
+        assert_eq!(resolve_within(base, ""), None);
+    }
+}
--- a/libs/scrap/examples/benchmark.rs
+++ b/libs/scrap/examples/benchmark.rs
@@ -143,7 +143,7 @@ fn test_vpx(
    println!(
        "{:?} encode: {:?}, {} byte",
        codec_id,
-        time_sum / yuv_count as u32,
+        time_sum / yuv_count as _,
        size / yuv_count
    );

@@ -156,7 +156,7 @@ fn test_vpx(
    println!(
        "{:?} decode: {:?}",
        codec_id,
-        start.elapsed() / yuv_count as u32
+        start.elapsed() / yuv_count as _
    );
 }

@@ -212,7 +212,7 @@ fn test_av1(
    assert_eq!(av1s.len(), yuv_count);
    println!(
        "AV1 encode: {:?}, {} byte",
-        time_sum / yuv_count as u32,
+        time_sum / yuv_count as _,
        size / yuv_count
    );
    let mut decoder = AomDecoder::new().unwrap();
@@ -221,7 +221,7 @@ fn test_av1(
        let _ = decoder.decode(&av1);
        let _ = decoder.flush();
    }
-    println!("AV1 decode: {:?}", start.elapsed() / yuv_count as u32);
+    println!("AV1 decode: {:?}", start.elapsed() / yuv_count as _);
 }

 #[cfg(feature = "hwcodec")]
--- a/libs/scrap/src/common/dxgi.rs
+++ b/libs/scrap/src/common/dxgi.rs
@@ -132,7 +132,15 @@ impl Display {
            .map(Display)
            .collect::<Vec<_>>();

-        let displays_dxgi = Self::all_().unwrap_or(Default::default());
+        let mut displays_dxgi = match Self::all_() {
+            Ok(displays) => displays,
+            Err(e) => {
+                hbb_common::log::error!("DXGI display enumeration failed: {e}");
+                Vec::new()
+            }
+        };
+        // Win+P "Show only on 1/2" still enumerates detached DXGI outputs.
+        displays_dxgi.retain(|d| d.is_online() && d.width() > 0 && d.height() > 0);

        // Return gdi displays if dxgi is not supported
        if displays_dxgi.is_empty() {
@@ -155,7 +163,6 @@ impl Display {
        }

        // Reorder displays from dxgi
-        let mut displays_dxgi = displays_dxgi;
        let mut displays_dxgi_ordered = Vec::new();
        for name in names_gdi.iter() {
            let pos = match displays_dxgi.iter().position(|d| d.name() == *name) {
@@ -176,11 +183,11 @@ impl Display {
    }

    pub fn width(&self) -> usize {
-        self.0.width() as usize
+        self.0.width().max(0) as usize
    }

    pub fn height(&self) -> usize {
-        self.0.height() as usize
+        self.0.height().max(0) as usize
    }

    pub fn name(&self) -> String {
@@ -201,7 +208,8 @@ impl Display {

    pub fn is_primary(&self) -> bool {
        // https://docs.microsoft.com/en-us/windows/win32/api/wingdi/ns-wingdi-devmodea
-        self.origin() == (0, 0)
+        // Detached outputs can still report origin (0,0) with a zero size.
+        self.origin() == (0, 0) && self.width() > 0 && self.height() > 0
    }

    #[cfg(feature = "vram")]
--- a/libs/scrap/src/wayland/display.rs
+++ b/libs/scrap/src/wayland/display.rs
@@ -297,6 +297,30 @@ pub fn clear_wayland_displays_cache() {
    // capturer rebuild loop clears about once a second.
 }

+// Bumped ONLY by the layout-drift edge in display_service (its single owner), never by cache
+// clears: session inits and hotplug workers clear the cache too, and a bump there tears down
+// every OTHER live capturer on a multi-display session. A capturer records this at build and
+// treats a later bump as "the layout changed under me, rebuild" — the only trigger a rotation
+// has, since it changes neither the CRTC mode nor the framebuffer size (rustdesk#15886).
+static SNAPSHOT_GENERATION: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
+
+/// Whether no snapshot has been cached: the signature of an enumeration that failed at session
+/// build (an `Err` is deliberately not cached), as opposed to a session that started healthy.
+#[cfg(feature = "drm")]
+pub fn wayland_snapshot_missing() -> bool {
+    DISPLAYS.lock().unwrap().is_none()
+}
+
+#[cfg(any(test, feature = "drm"))]
+pub fn bump_layout_generation() {
+    SNAPSHOT_GENERATION.fetch_add(1, std::sync::atomic::Ordering::Release);
+}
+
+#[cfg(feature = "drm")]
+pub fn wayland_snapshot_generation() -> u64 {
+    SNAPSHOT_GENERATION.load(std::sync::atomic::Ordering::Acquire)
+}
+
 // Return (min_x, max_x, min_y, max_y)
 pub fn get_desktop_rect_for_uinput() -> Option<(i32, i32, i32, i32)> {
    let wayland_displays = get_displays();
@@ -332,7 +356,8 @@ fn desktop_rect_of(displays: &[WaylandDisplayInfo]) -> Option<(i32, i32, i32, i3
    // Otherwise, we use the logical size for `uinput`.
    if displays.len() == 1 {
        let d = &displays[0];
-        return Some((d.x, d.x + d.width, d.y, d.y + d.height));
+        let (w, h) = oriented_physical(d);
+        return Some((d.x, d.x + w, d.y, d.y + h));
    }

    let mut min_x = i32::MAX;
@@ -344,6 +369,8 @@ fn desktop_rect_of(displays: &[WaylandDisplayInfo]) -> Option<(i32, i32, i32, i3
        min_y = min_y.min(d.y);
        let size = if let Some(logical_size) = d.logical_size {
            logical_size
+        } else if d.transform == 90 || d.transform == 270 {
+            oriented_physical(d)
        } else {
            // When `logical_size` is None, we cannot obtain the correct desktop rectangle.
            // This may occur if the Wayland compositor does not provide logical size information,
@@ -374,6 +401,24 @@ pub struct DisplayRect {
    pub y: i32,
    pub w: i32,
    pub h: i32,
+    // Carried so the drift comparison sees 0<->180 and 90<->270 flips, whose rects are
+    // otherwise identical; the remap itself matches by name and containment, never by this.
+    pub transform: i32,
+}
+
+/// Physical size in delivered orientation: a 90/270 output scans out WxH but is captured,
+/// advertised and pointed at as HxW.
+fn oriented_physical(d: &WaylandDisplayInfo) -> (i32, i32) {
+    if d.transform == 90 || d.transform == 270 {
+        (d.height, d.width)
+    } else {
+        (d.width, d.height)
+    }
+}
+
+/// The logical rectangles of a display list, for a caller that already has the list.
+pub fn logical_rects_of_displays(displays: &[WaylandDisplayInfo]) -> Vec<DisplayRect> {
+    logical_rects_of(displays)
 }

 fn logical_rects_of(displays: &[WaylandDisplayInfo]) -> Vec<DisplayRect> {
@@ -386,9 +431,9 @@ fn logical_rects_of(displays: &[WaylandDisplayInfo]) -> Vec<DisplayRect> {
        .iter()
        .map(|d| {
            let (w, h) = if single {
-                (d.width, d.height)
+                oriented_physical(d)
            } else {
-                d.logical_size.unwrap_or((d.width, d.height))
+                d.logical_size.unwrap_or_else(|| oriented_physical(d))
            };
            DisplayRect {
                name: d.name.clone(),
@@ -396,6 +441,7 @@ fn logical_rects_of(displays: &[WaylandDisplayInfo]) -> Vec<DisplayRect> {
                y: d.y,
                w,
                h,
+                transform: d.transform,
            }
        })
        .collect()
@@ -495,8 +541,8 @@ mod tests {
    #[test]
    fn test_clear_keeps_the_failure_stamp() {
        // The stamp describes the seat, not the cache: the ~1/s capturer rebuild loop clears,
-        // and dropping the stamp with it would defeat the backoff. Sole test touching these
-        // statics; serialize before adding another.
+        // and dropping the stamp with it would defeat the backoff. The generation test also
+        // calls clear now; both only assert monotonic/unchanged state, so they can interleave.
        *LAST_FAILED_LOOKUP.lock().unwrap() = Some(Instant::now());
        clear_wayland_displays_cache();
        let stamp = *LAST_FAILED_LOOKUP.lock().unwrap();
@@ -519,6 +565,7 @@ mod tests {
            height,
            logical_size,
            refresh_rate: 60,
+            transform: 0,
        }
    }

@@ -553,6 +600,42 @@ mod tests {
        assert_eq!(desktop_rect_of(&displays), Some((0, 5120, 0, 1440)));
    }

+    #[test]
+    fn a_single_rotated_display_swaps_the_uinput_rect() {
+        // Review finding 1 on rustdesk#15889: the single-display branch served the unrotated
+        // mode, so the pointer could not reach ~44% of a portrait screen.
+        let mut d = display(0, 0, 1920, 1080, None);
+        d.transform = 90;
+        assert_eq!(desktop_rect_of(&[d.clone()]), Some((0, 1080, 0, 1920)));
+        let rects = logical_rects_of(&[d]);
+        assert_eq!((rects[0].w, rects[0].h), (1080, 1920));
+    }
+
+    #[test]
+    fn a_transform_flip_is_visible_to_the_drift_comparison() {
+        // Review finding 5: 0<->180 and 90<->270 leave every rect identical; the transform
+        // field is what lets `baseline != live` fire on them.
+        let mut a = display(0, 0, 1920, 1080, Some((1920, 1080)));
+        let mut b = a.clone();
+        a.transform = 90;
+        b.transform = 270;
+        assert_ne!(logical_rects_of(&[a.clone(), a.clone()]), logical_rects_of(&[b.clone(), b]));
+    }
+
+    #[test]
+    fn only_the_explicit_bump_moves_the_generation() {
+        // A cache clear must NOT bump: session inits clear too, and a bump there rebuilds
+        // every other live capturer (adversarial finding on the first version of this).
+        let before = SNAPSHOT_GENERATION.load(std::sync::atomic::Ordering::Acquire);
+        clear_wayland_displays_cache();
+        assert_eq!(
+            SNAPSHOT_GENERATION.load(std::sync::atomic::Ordering::Acquire),
+            before
+        );
+        bump_layout_generation();
+        assert!(SNAPSHOT_GENERATION.load(std::sync::atomic::Ordering::Acquire) > before);
+    }
+
    fn rect(name: &str, x: i32, y: i32, w: i32, h: i32) -> DisplayRect {
        DisplayRect {
            name: name.to_owned(),
@@ -560,6 +643,7 @@ mod tests {
            y,
            w,
            h,
+            transform: 0,
        }
    }

--- a/res/admin-roles.py
+++ b/res/admin-roles.py
@@ -0,0 +1,417 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+
+import requests
+
+
+ROLE_TYPES = {
+    "global": 1,
+    "individual": 2,
+    "group": 3,
+}
+
+PERMISSION_IDS = {
+    "users.view": 0x0101,
+    "users.create": 0x0103,
+    "users.invite": 0x0104,
+    "users.delete": 0x0105,
+    "users.enable_disable": 0x0106,
+    "users.edit_email": 0x0107,
+    "users.edit_password": 0x0108,
+    "users.edit_note": 0x0109,
+    "users.manage_2fa": 0x010A,
+    "users.force_logout": 0x010B,
+    "users.change_group": 0x010C,
+    "users.change_strategy": 0x010D,
+    "users.change_control_role": 0x010E,
+    "users.edit_display_name": 0x010F,
+    "devices.view": 0x0201,
+    "devices.enable_disable": 0x0203,
+    "devices.delete": 0x0204,
+    "devices.edit_info": 0x0205,
+    "devices.assign_to_user": 0x0206,
+    "devices.change_group": 0x0207,
+    "devices.change_strategy": 0x0208,
+    "user_groups.view": 0x0301,
+    "user_groups.edit": 0x0302,
+    "device_groups.view": 0x0401,
+    "device_groups.edit": 0x0402,
+    "device_groups.change_strategy": 0x0403,
+    "audits.view": 0x0501,
+    "audits.edit": 0x0502,
+    "strategies.view": 0x0601,
+    "strategies.edit": 0x0602,
+    "custom_clients.view": 0x0701,
+    "custom_clients.edit": 0x0702,
+    "control_roles.view": 0x0801,
+    "control_roles.edit": 0x0802,
+}
+
+PERMISSION_NAMES = {permission_id: name for name, permission_id in PERMISSION_IDS.items()}
+
+
+def check_response(response):
+    if response.status_code != 200:
+        print(f"Error: HTTP {response.status_code}: {response.text}")
+        exit(1)
+
+    if response.text and response.text.strip():
+        try:
+            data = response.json()
+        except ValueError:
+            return response.text
+        if isinstance(data, dict) and "error" in data:
+            print(f"Error: {data['error']}")
+            exit(1)
+        return data
+    return None
+
+
+def headers_with(token):
+    return {"Authorization": f"Bearer {token}", "Content-Type": "application/json"}
+
+
+def split_csv(value):
+    if value is None:
+        return None
+    return [item.strip() for item in value.split(",") if item.strip()]
+
+
+def parse_permissions(value):
+    permissions = []
+    for item in split_csv(value) or []:
+        permission = PERMISSION_IDS.get(item.lower())
+        if permission is None:
+            try:
+                permission = int(item, 0)
+            except ValueError:
+                print(f"Error: Invalid permission name or ID '{item}'")
+                exit(1)
+        if permission < 0 or permission > 65535:
+            print(f"Error: Permission ID '{item}' is outside the 0-65535 range")
+            exit(1)
+        permissions.append(permission)
+    return permissions
+
+
+def format_role_permissions(role):
+    permissions = role.get("permissions")
+    if isinstance(permissions, list):
+        role["permissions"] = [
+            PERMISSION_NAMES.get(permission, permission) for permission in permissions
+        ]
+    return role
+
+
+def list_roles(url, token, name=None, role_type=None, page_size=50):
+    params = {"pageSize": page_size}
+    if name is not None:
+        params["name"] = name
+    if role_type is not None:
+        params["type"] = ROLE_TYPES[role_type]
+
+    roles = []
+    current = 0
+    while True:
+        current += 1
+        params["current"] = current
+        response = requests.get(
+            f"{url}/api/admin-roles", headers=headers_with(token), params=params
+        )
+        data = check_response(response)
+        if not isinstance(data, dict):
+            print("Error: Unexpected response while listing admin roles")
+            exit(1)
+        rows = data.get("data", [])
+        roles.extend(format_role_permissions(role) for role in rows)
+        total = data.get("total", 0)
+        if len(rows) < page_size or current * page_size >= total:
+            break
+    return roles
+
+
+def get_role(url, token, name=None, guid=None):
+    if guid:
+        response = requests.get(
+            f"{url}/api/admin-roles/{guid}", headers=headers_with(token)
+        )
+        role = check_response(response)
+        if isinstance(role, dict):
+            return format_role_permissions(role)
+        return role
+
+    roles = list_roles(url, token, name=name)
+    for role in roles:
+        if role.get("name") == name:
+            return role
+    return None
+
+
+def resolve_role(url, token, name=None, guid=None):
+    role = get_role(url, token, name=name, guid=guid)
+    if role:
+        return role
+    target = guid if guid else name
+    print(f"Error: Admin role '{target}' not found")
+    exit(1)
+
+
+def get_user_guid(url, token, name):
+    response = requests.get(
+        f"{url}/api/users",
+        headers=headers_with(token),
+        params={"name": name, "pageSize": 50, "current": 1},
+    )
+    data = check_response(response)
+    users = data.get("data", []) if isinstance(data, dict) else []
+    for user in users:
+        if user.get("name") == name:
+            return user.get("guid")
+    return None
+
+
+def resolve_users(url, token, users):
+    guids = []
+    for user in users:
+        if len(user) == 36 and user.count("-") == 4:
+            guids.append(user)
+            continue
+        guid = get_user_guid(url, token, user)
+        if not guid:
+            print(f"Error: User '{user}' not found")
+            exit(1)
+        guids.append(guid)
+    return guids
+
+
+def create_role(
+    url,
+    token,
+    name,
+    role_type,
+    permissions,
+    note=None,
+    user_groups=None,
+    device_groups=None,
+    unassigned=None,
+):
+    payload = {
+        "name": name,
+        "type": ROLE_TYPES[role_type],
+        "permissions": permissions,
+    }
+    if note is not None:
+        payload["note"] = note
+    if user_groups:
+        payload["user_groups"] = user_groups
+    if device_groups:
+        payload["device_groups"] = device_groups
+    if unassigned is not None:
+        payload["unassigned"] = unassigned
+    response = requests.post(
+        f"{url}/api/admin-roles", headers=headers_with(token), json=payload
+    )
+    check_response(response)
+
+
+def update_role(
+    url,
+    token,
+    guid,
+    new_name=None,
+    note=None,
+    permissions=None,
+    user_groups=None,
+    device_groups=None,
+    unassigned=None,
+):
+    payload = {}
+    if new_name is not None:
+        payload["name"] = new_name
+    if note is not None:
+        payload["note"] = note
+    if permissions is not None:
+        payload["permissions"] = permissions
+    if user_groups is not None:
+        payload["user_groups"] = user_groups
+    if device_groups is not None:
+        payload["device_groups"] = device_groups
+    if unassigned is not None:
+        payload["unassigned"] = unassigned
+    response = requests.put(
+        f"{url}/api/admin-roles/{guid}", headers=headers_with(token), json=payload
+    )
+    check_response(response)
+
+
+def delete_roles(url, token, guids):
+    response = requests.delete(
+        f"{url}/api/admin-roles",
+        headers=headers_with(token),
+        json={"guids": guids},
+    )
+    check_response(response)
+
+
+def change_users(url, token, guid, users, remove=False):
+    method = requests.delete if remove else requests.post
+    response = method(
+        f"{url}/api/admin-roles/{guid}/users",
+        headers=headers_with(token),
+        json={"users": users},
+    )
+    check_response(response)
+
+
+def view_users(url, token, role_guid, page_size=50):
+    params = {"admin_role_guid": role_guid, "pageSize": page_size}
+    users = []
+    current = 0
+    while True:
+        current += 1
+        params["current"] = current
+        response = requests.get(
+            f"{url}/api/users", headers=headers_with(token), params=params
+        )
+        data = check_response(response)
+        if not isinstance(data, dict):
+            print("Error: Unexpected response while listing users")
+            exit(1)
+        rows = data.get("data", [])
+        users.extend(rows)
+        total = data.get("total", 0)
+        if len(rows) < page_size or current * page_size >= total:
+            break
+    return users
+
+
+def require_role_target(parser, args):
+    if not args.name and not args.guid:
+        parser.error("one of --name or --guid is required")
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Admin role manager")
+    parser.add_argument(
+        "command",
+        choices=["view", "add", "update", "delete", "view-users", "add-users", "remove-users"],
+    )
+    parser.add_argument("--url", required=True, help="Server URL")
+    parser.add_argument("--token", required=True, help="API token")
+    parser.add_argument("--name", help="Admin role name")
+    parser.add_argument("--guid", help="Admin role GUID")
+    parser.add_argument("--new-name", help="New admin role name")
+    parser.add_argument("--note", help="Role note; use an empty value to clear it")
+    parser.add_argument("--type", choices=ROLE_TYPES, help="Role type")
+    parser.add_argument(
+        "--permissions",
+        help="Comma-separated permission names or numeric IDs; use an empty value to clear",
+    )
+    parser.add_argument(
+        "--user-groups",
+        help="Comma-separated user group names; use an empty value to clear",
+    )
+    parser.add_argument(
+        "--device-groups",
+        help="Comma-separated device group names; use an empty value to clear",
+    )
+    parser.add_argument("--users", help="Comma-separated user names or GUIDs")
+    unassigned = parser.add_mutually_exclusive_group()
+    unassigned.add_argument(
+        "--unassigned", dest="unassigned", action="store_true", help="Include unassigned devices"
+    )
+    unassigned.add_argument(
+        "--no-unassigned",
+        dest="unassigned",
+        action="store_false",
+        help="Exclude unassigned devices",
+    )
+    parser.set_defaults(unassigned=None)
+    args = parser.parse_args()
+    args.url = args.url.rstrip("/")
+
+    if args.command == "view":
+        if args.guid:
+            result = resolve_role(args.url, args.token, guid=args.guid)
+        else:
+            result = list_roles(args.url, args.token, args.name, args.type)
+        print(json.dumps(result, indent=2))
+        return
+
+    if args.command == "add":
+        if not args.name or not args.type or args.permissions is None:
+            parser.error("--name, --type, and --permissions are required for add")
+        if args.type != "group" and (
+            args.user_groups is not None
+            or args.device_groups is not None
+            or args.unassigned is not None
+        ):
+            parser.error("group scope options can only be used with --type group")
+        create_role(
+            args.url,
+            args.token,
+            args.name,
+            args.type,
+            parse_permissions(args.permissions),
+            args.note,
+            split_csv(args.user_groups),
+            split_csv(args.device_groups),
+            args.unassigned,
+        )
+        print(f"Success: Created admin role '{args.name}'")
+        return
+
+    require_role_target(parser, args)
+    role = resolve_role(args.url, args.token, args.name, args.guid)
+    role_guid = role.get("guid")
+    role_name = role.get("name")
+
+    if args.command == "update":
+        updates = [
+            args.new_name,
+            args.note,
+            args.permissions,
+            args.user_groups,
+            args.device_groups,
+            args.unassigned,
+        ]
+        if all(value is None for value in updates):
+            parser.error("at least one update option is required")
+        if role.get("type") != ROLE_TYPES["group"] and (
+            args.user_groups is not None
+            or args.device_groups is not None
+            or args.unassigned is not None
+        ):
+            parser.error("group scope options can only be used with a group role")
+        update_role(
+            args.url,
+            args.token,
+            role_guid,
+            args.new_name,
+            args.note,
+            parse_permissions(args.permissions) if args.permissions is not None else None,
+            split_csv(args.user_groups),
+            split_csv(args.device_groups),
+            args.unassigned,
+        )
+        print(f"Success: Updated admin role '{role_name}'")
+    elif args.command == "delete":
+        delete_roles(args.url, args.token, [role_guid])
+        print(f"Success: Deleted admin role '{role_name}'")
+    elif args.command == "view-users":
+        print(json.dumps(view_users(args.url, args.token, role_guid), indent=2))
+    elif args.command in ("add-users", "remove-users"):
+        users = split_csv(args.users)
+        if not users:
+            parser.error("--users is required for add-users and remove-users")
+        user_guids = resolve_users(args.url, args.token, users)
+        remove = args.command == "remove-users"
+        change_users(args.url, args.token, role_guid, user_guids, remove=remove)
+        action = "Removed users from" if remove else "Added users to"
+        print(f"Success: {action} admin role '{role_name}'")
+
+
+if __name__ == "__main__":
+    main()
--- a/res/control-roles.py
+++ b/res/control-roles.py
@@ -0,0 +1,292 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+
+import requests
+
+
+STATUSES = {
+    "disabled": 0,
+    "enabled": 1,
+}
+
+
+def check_response(response):
+    if response.status_code != 200:
+        print(f"Error: HTTP {response.status_code}: {response.text}")
+        exit(1)
+
+    if response.text and response.text.strip():
+        try:
+            data = response.json()
+        except ValueError:
+            return response.text
+        if isinstance(data, dict) and "error" in data:
+            print(f"Error: {data['error']}")
+            exit(1)
+        return data
+    return None
+
+
+def headers_with(token):
+    return {"Authorization": f"Bearer {token}", "Content-Type": "application/json"}
+
+
+def split_csv(value):
+    if value is None:
+        return None
+    return [item.strip() for item in value.split(",") if item.strip()]
+
+
+def list_roles(url, token, name=None, status=None, page_size=50):
+    params = {"pageSize": page_size}
+    if name is not None:
+        params["name"] = name
+    if status is not None:
+        params["status"] = STATUSES[status]
+
+    roles = []
+    current = 0
+    while True:
+        current += 1
+        params["current"] = current
+        response = requests.get(
+            f"{url}/api/control-roles", headers=headers_with(token), params=params
+        )
+        data = check_response(response)
+        if not isinstance(data, dict):
+            print("Error: Unexpected response while listing control roles")
+            exit(1)
+        rows = data.get("data", [])
+        for role in rows:
+            role.pop("info", None)
+        roles.extend(rows)
+        total = data.get("total", 0)
+        if len(rows) < page_size or current * page_size >= total:
+            break
+    return roles
+
+
+def get_role(url, token, name=None, guid=None):
+    if guid:
+        response = requests.get(
+            f"{url}/api/control-roles/{guid}", headers=headers_with(token)
+        )
+        role = check_response(response)
+        if isinstance(role, dict):
+            role.pop("info", None)
+        return role
+
+    roles = list_roles(url, token, name=name)
+    for role in roles:
+        if role.get("name") == name:
+            return role
+    return None
+
+
+def resolve_role(url, token, name=None, guid=None):
+    role = get_role(url, token, name=name, guid=guid)
+    if role:
+        return role
+    target = guid if guid else name
+    print(f"Error: Control role '{target}' not found")
+    exit(1)
+
+
+def get_user_guid(url, token, name):
+    response = requests.get(
+        f"{url}/api/users",
+        headers=headers_with(token),
+        params={"name": name, "pageSize": 50, "current": 1},
+    )
+    data = check_response(response)
+    users = data.get("data", []) if isinstance(data, dict) else []
+    for user in users:
+        if user.get("name") == name:
+            return user.get("guid")
+    return None
+
+
+def resolve_users(url, token, users):
+    guids = []
+    for user in users:
+        if len(user) == 36 and user.count("-") == 4:
+            guids.append(user)
+            continue
+        guid = get_user_guid(url, token, user)
+        if not guid:
+            print(f"Error: User '{user}' not found")
+            exit(1)
+        guids.append(guid)
+    return guids
+
+
+def create_role(url, token, name, note=None):
+    payload = {"name": name}
+    if note is not None:
+        payload["note"] = note
+    response = requests.post(
+        f"{url}/api/control-roles", headers=headers_with(token), json=payload
+    )
+    check_response(response)
+
+
+def update_role(url, token, guid, new_name=None, note=None):
+    payload = {}
+    if new_name is not None:
+        payload["name"] = new_name
+    if note is not None:
+        payload["note"] = note
+    response = requests.put(
+        f"{url}/api/control-roles/{guid}", headers=headers_with(token), json=payload
+    )
+    check_response(response)
+
+
+def delete_roles(url, token, guids):
+    response = requests.delete(
+        f"{url}/api/control-roles",
+        headers=headers_with(token),
+        json={"guids": guids},
+    )
+    check_response(response)
+
+
+def set_status(url, token, guids, disable):
+    response = requests.put(
+        f"{url}/api/control-roles/enable",
+        headers=headers_with(token),
+        json={"guids": guids, "disable": disable},
+    )
+    check_response(response)
+
+
+def change_users(url, token, guid, users, remove=False):
+    if remove:
+        endpoint = f"{url}/api/control-roles/users"
+        response = requests.delete(
+            endpoint,
+            headers=headers_with(token),
+            json={"user_guids": users},
+        )
+    else:
+        endpoint = f"{url}/api/control-roles/{guid}/users"
+        response = requests.post(
+            endpoint,
+            headers=headers_with(token),
+            json={"user_guids": users},
+        )
+    check_response(response)
+
+
+def view_users(url, token, role_guid, page_size=50):
+    params = {"control_role_guid": role_guid, "pageSize": page_size}
+    users = []
+    current = 0
+    while True:
+        current += 1
+        params["current"] = current
+        response = requests.get(
+            f"{url}/api/users", headers=headers_with(token), params=params
+        )
+        data = check_response(response)
+        if not isinstance(data, dict):
+            print("Error: Unexpected response while listing users")
+            exit(1)
+        rows = data.get("data", [])
+        users.extend(rows)
+        total = data.get("total", 0)
+        if len(rows) < page_size or current * page_size >= total:
+            break
+    return users
+
+
+def require_role_target(parser, args):
+    if not args.name and not args.guid:
+        parser.error("one of --name or --guid is required")
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        description="Control role manager (configure control permissions in the web console)"
+    )
+    parser.add_argument(
+        "command",
+        choices=[
+            "view",
+            "add",
+            "update",
+            "delete",
+            "enable",
+            "disable",
+            "view-users",
+            "assign-users",
+            "remove-users",
+        ],
+    )
+    parser.add_argument("--url", required=True, help="Server URL")
+    parser.add_argument("--token", required=True, help="API token")
+    parser.add_argument("--name", help="Control role name")
+    parser.add_argument("--guid", help="Control role GUID")
+    parser.add_argument("--new-name", help="New control role name")
+    parser.add_argument("--note", help="Role note; use an empty value to clear it")
+    parser.add_argument("--status", choices=STATUSES, help="Status filter for view")
+    parser.add_argument("--users", help="Comma-separated user names or GUIDs")
+    args = parser.parse_args()
+    args.url = args.url.rstrip("/")
+
+    if args.command == "view":
+        if args.guid:
+            result = resolve_role(args.url, args.token, guid=args.guid)
+        else:
+            result = list_roles(args.url, args.token, args.name, args.status)
+        print(json.dumps(result, indent=2))
+        return
+
+    if args.command == "add":
+        if not args.name:
+            parser.error("--name is required for add")
+        create_role(args.url, args.token, args.name, args.note)
+        print(f"Success: Created control role '{args.name}'")
+        return
+
+    if args.command == "remove-users":
+        users = split_csv(args.users)
+        if not users:
+            parser.error("--users is required for remove-users")
+        user_guids = resolve_users(args.url, args.token, users)
+        change_users(args.url, args.token, None, user_guids, remove=True)
+        print("Success: Removed users from their control roles")
+        return
+
+    require_role_target(parser, args)
+    role = resolve_role(args.url, args.token, args.name, args.guid)
+    role_guid = role.get("guid")
+    role_name = role.get("name")
+
+    if args.command == "update":
+        if args.new_name is None and args.note is None:
+            parser.error("--new-name or --note is required for update")
+        update_role(args.url, args.token, role_guid, args.new_name, args.note)
+        print(f"Success: Updated control role '{role_name}'")
+    elif args.command == "delete":
+        delete_roles(args.url, args.token, [role_guid])
+        print(f"Success: Deleted control role '{role_name}'")
+    elif args.command in ("enable", "disable"):
+        disable = args.command == "disable"
+        set_status(args.url, args.token, [role_guid], disable)
+        print(f"Success: {args.command.title()}d control role '{role_name}'")
+    elif args.command == "view-users":
+        print(json.dumps(view_users(args.url, args.token, role_guid), indent=2))
+    elif args.command == "assign-users":
+        users = split_csv(args.users)
+        if not users:
+            parser.error("--users is required for assign-users")
+        user_guids = resolve_users(args.url, args.token, users)
+        change_users(args.url, args.token, role_guid, user_guids)
+        print(f"Success: Assigned users to control role '{role_name}'")
+
+
+if __name__ == "__main__":
+    main()
--- a/res/msi/CustomActions/Common.h
+++ b/res/msi/CustomActions/Common.h
@@ -18,6 +18,9 @@ void UninstallDriver(LPCWSTR hardwareId, BOOL &rebootRequired);

 namespace RemotePrinter
 {
-    VOID installUpdatePrinter(const std::wstring& installFolder);
-    VOID uninstallPrinter();
+    // `appName` names the printer and its port. It is passed in rather than compiled
+    // in so that a single dll serves every custom client; an empty value keeps the
+    // stock "RustDesk Printer" name.
+    VOID installUpdatePrinter(const std::wstring& installFolder, const std::wstring& appName);
+    VOID uninstallPrinter(const std::wstring& appName);
 }
--- a/res/msi/CustomActions/CustomActions.cpp
+++ b/res/msi/CustomActions/CustomActions.cpp
@@ -300,7 +300,7 @@ bool TerminateProcessesByNameW(LPCWSTR processName, LPCWSTR excludeParam)
        {
            do
            {
-                if (lstrcmpW(processName, processEntry.szExeFile) == 0)
+                if (lstrcmpiW(processName, processEntry.szExeFile) == 0)
                {
                    HANDLE process = OpenProcess(PROCESS_TERMINATE | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, processEntry.th32ProcessID);
                    if (process != NULL)
@@ -1021,9 +1021,9 @@ UINT __stdcall InstallPrinter(
    DWORD er = ERROR_SUCCESS;

    int nResult = 0;
-    LPWSTR installFolder = NULL;
-    LPWSTR pwz = NULL;
    LPWSTR pwzData = NULL;
+    std::wstring appNameValue;
+    std::wstring installFolderValue;

    hr = WcaInitialize(hInstall, "InstallPrinter");
    ExitOnFailure(hr, "Failed to initialize");
@@ -1031,12 +1031,27 @@ UINT __stdcall InstallPrinter(
    hr = WcaGetProperty(L"CustomActionData", &pwzData);
    ExitOnFailure(hr, "failed to get CustomActionData");

-    pwz = pwzData;
-    hr = WcaReadStringFromCaData(&pwz, &installFolder);
-    ExitOnFailure(hr, "failed to read database key from custom action data: %ls", pwz);
+    // "<app name>|<install folder>". Split here rather than through
+    // WcaReadStringFromCaData, whose delimiter is a literal wide char 128 that a
+    // Formatted property value cannot carry.
+    {
+        std::wstring data(pwzData);
+        size_t separator = data.find(L'|');
+        if (separator == std::wstring::npos)
+        {
+            // A package built before the name was passed in; keep the stock name.
+            appNameValue.clear();
+            installFolderValue = data;
+        }
+        else
+        {
+            appNameValue = data.substr(0, separator);
+            installFolderValue = data.substr(separator + 1);
+        }
+    }

-    WcaLog(LOGMSG_STANDARD, "Try to install RD printer in : %ls", installFolder);
-    RemotePrinter::installUpdatePrinter(installFolder);
+    WcaLog(LOGMSG_STANDARD, "Try to install RD printer in : %ls", installFolderValue.c_str());
+    RemotePrinter::installUpdatePrinter(installFolderValue, appNameValue);
    WcaLog(LOGMSG_STANDARD, "Install RD printer done");

 LExit:
@@ -1054,14 +1069,30 @@ UINT __stdcall UninstallPrinter(
    HRESULT hr = S_OK;
    DWORD er = ERROR_SUCCESS;

+    LPWSTR pwzData = NULL;
+    std::wstring appNameValue;
+
    hr = WcaInitialize(hInstall, "UninstallPrinter");
    ExitOnFailure(hr, "Failed to initialize");

+    // Must match the name install used, otherwise the printer is left behind. Absent
+    // on packages built before this was passed in, where it was the stock name.
+    hr = WcaGetProperty(L"CustomActionData", &pwzData);
+    ExitOnFailure(hr, "failed to get CustomActionData");
+    if (pwzData)
+    {
+        appNameValue = pwzData;
+    }
+
    WcaLog(LOGMSG_STANDARD, "Try to uninstall RD printer");
-    RemotePrinter::uninstallPrinter();
+    RemotePrinter::uninstallPrinter(appNameValue);
    WcaLog(LOGMSG_STANDARD, "Uninstall RD printer done");

 LExit:
+    if (pwzData) {
+        ReleaseStr(pwzData);
+    }
+
    er = SUCCEEDED(hr) ? ERROR_SUCCESS : ERROR_INSTALL_FAILURE;
    return WcaFinalize(er);
 }
--- a/res/msi/CustomActions/RemotePrinter.cpp
+++ b/res/msi/CustomActions/RemotePrinter.cpp
@@ -18,12 +18,19 @@ namespace RemotePrinter
 {
 #define HRESULT_ERR_ELEMENT_NOT_FOUND 0x80070490

+    // The driver files and the driver name ship with the app under their stock names
+    // and stay fixed for every custom client. Only the printer and its port carry the
+    // app name, and that arrives at runtime so one dll serves every custom client.
    LPCWCH RD_DRIVER_INF_PATH = L"drivers\\RustDeskPrinterDriver\\RustDeskPrinterDriver.inf";
-    LPCWCH RD_PRINTER_PORT = L"RustDesk Printer";
-    LPCWCH RD_PRINTER_NAME = L"RustDesk Printer";
    LPCWCH RD_PRINTER_DRIVER_NAME = L"RustDesk v4 Printer Driver";
+    LPCWCH RD_DEFAULT_APP_NAME = L"RustDesk";
    LPCWCH XCV_MONITOR_LOCAL_PORT = L",XcvMonitor Local Port";

+    static std::wstring printerNameOf(const std::wstring &appName)
+    {
+        return (appName.empty() ? std::wstring(RD_DEFAULT_APP_NAME) : appName) + L" Printer";
+    }
+
    using FuncEnum = std::function<BOOL(DWORD level, LPBYTE pDriverInfo, DWORD cbBuf, LPDWORD pcbNeeded, LPDWORD pcReturned)>;
    template <typename T, typename R>
    using FuncOnData = std::function<std::shared_ptr<R>(const T &)>;
@@ -458,8 +465,12 @@ namespace RemotePrinter
    //    We should not check the driver version because the driver is deployed with the application.
    //    It's better to uninstall the existing driver and install the driver from the application.
    // 3. Add the printer.
-    VOID installUpdatePrinter(const std::wstring &installFolder)
+    VOID installUpdatePrinter(const std::wstring &installFolder, const std::wstring &appName)
    {
+        const std::wstring printerName = printerNameOf(appName);
+        const LPCWCH RD_PRINTER_NAME = printerName.c_str();
+        const LPCWCH RD_PRINTER_PORT = printerName.c_str();
+
        const std::wstring infFile = installFolder + L"\\" + RemotePrinter::RD_DRIVER_INF_PATH;
        if (!FileExists(infFile))
        {
@@ -505,13 +516,15 @@ namespace RemotePrinter
        }
    }

-    VOID uninstallPrinter()
+    VOID uninstallPrinter(const std::wstring &appName)
    {
-        deletePrinter(RD_PRINTER_NAME);
+        const std::wstring printerName = printerNameOf(appName);
+
+        deletePrinter(printerName.c_str());
        WcaLog(LOGMSG_STANDARD, "Deleted the printer\n");
        uninstallDriver(RD_PRINTER_DRIVER_NAME);
        WcaLog(LOGMSG_STANDARD, "Uninstalled the printer driver\n");
-        checkDeleteLocalPort(RD_PRINTER_PORT);
+        checkDeleteLocalPort(printerName.c_str());
        WcaLog(LOGMSG_STANDARD, "Deleted the local port\n");
    }
 }
--- a/res/msi/Package/Components/RustDesk.wxs
+++ b/res/msi/Package/Components/RustDesk.wxs
@@ -30,7 +30,14 @@
 		<CustomAction Id="SetPropertyServiceStop.SetParam.PropertyName" Return="check" Property="PropertyName" Value="STOP_SERVICE" />
 		<CustomAction Id="TryDeleteStartupShortcut.SetParam" Return="check" Property="ShortcutName" Value="$(var.Product) Tray" />
 		<CustomAction Id="RemoveAmyuniIdd.SetParam" Return="check" Property="RemoveAmyuniIdd" Value="[INSTALLFOLDER_INNER]" />
-		<CustomAction Id="InstallPrinter.SetParam" Return="check" Property="InstallPrinter" Value="[INSTALLFOLDER_INNER]" />
+		<!-- The app name comes first and is separated by '|', which cannot occur in a
+		     Windows path nor in a validated app name. wcautil's own delimiter is a
+		     literal wide char 128 that a Formatted value cannot carry, and [~] is
+		     MSI's NUL escape rather than that delimiter, so the action parses this
+		     itself. Passing the name keeps the dll free of it, so one build serves
+		     every custom client. -->
+		<CustomAction Id="InstallPrinter.SetParam" Return="check" Property="InstallPrinter" Value="[ProductName]|[INSTALLFOLDER_INNER]" />
+		<CustomAction Id="UninstallPrinter.SetParam" Return="check" Property="UninstallPrinter" Value="[ProductName]" />
 		<InstallExecuteSequence>

 			<Custom Action="SetPropertyIsServiceRunning" After="InstallInitialize" Condition="Installed" />
@@ -86,6 +93,7 @@
 			<Custom Action="RemoveFirewallRules.SetParam" Before="RemoveFirewallRules"/>

 			<Custom Action="UninstallPrinter" Before="RemoveRuntimeGeneratedFiles" Condition="VersionNT &gt;= 603" />
+			<Custom Action="UninstallPrinter.SetParam" Before="UninstallPrinter" Condition="VersionNT &gt;= 603" />

 			<Custom Action="TerminateProcesses" Before="RemoveRuntimeGeneratedFiles"/>
 			<Custom Action="TerminateProcesses.SetParam" Before="TerminateProcesses"/>
--- a/res/msi/Package/Package.wxs
+++ b/res/msi/Package/Package.wxs
@@ -13,6 +13,12 @@
 		<PropertyRef Id="AddRemovePropertiesFile" />

 		<Media Id="1" Cabinet="cab1.cab" EmbedCab="yes" CompressionLevel="high" />
+		<!--$Media2Start$-->
+		<!-- preprocess.py in template mode adds a second cabinet here, holding only
+		     the files that differ per customer, so a custom client can be produced by
+		     rebuilding that small cabinet instead of the whole package. The shipped
+		     msi is built without template mode and keeps a single cabinet. -->
+		<!--$Media2End$-->
 		<Icon Id="AppIcon" SourceFile="Resources\icon.ico" />
 		<CustomAction Id="BlockSelfInstalledApp" Error="!(loc.AnotherAppDialogDescription)" />

--- a/res/msi/preprocess.py
+++ b/res/msi/preprocess.py
@@ -10,7 +10,6 @@ import subprocess
 import re
 import platform
 from pathlib import Path
-from itertools import chain
 import shutil
 from xml.sax.saxutils import quoteattr

@@ -67,6 +66,14 @@ def make_parser():
    parser.add_argument(
        "-c", "--custom", action="store_true", help="Is custom client", default=False
    )
+    parser.add_argument(
+        "--template",
+        action="store_true",
+        default=False,
+        help="Build a template to be patched per customer rather than a finished "
+        "package: puts the files a custom client replaces in their own cabinet, so "
+        "rebranding rebuilds a few hundred KB instead of the whole payload.",
+    )
    parser.add_argument(
        "--conn-type",
        type=str,
@@ -92,6 +99,43 @@ def make_parser():
    return parser


+# Files a custom client replaces. Kept in their own cabinet by --template so that
+# rebranding rebuilds a few hundred KB instead of recompressing the whole payload.
+# The app executable is handled separately: it has its own component in RustDesk.wxs.
+#
+# A template has to ship a placeholder for each of these so there is a File row to
+# patch, but the branding assets are optional for a customer and a stock build has
+# none of them at all. So each optional one installs only when its property is set,
+# which the patcher does for the files a customer actually supplied. Otherwise a
+# customer without a logo would install the placeholder, where today they get no
+# logo at all -- the client treats a missing asset as "no logo".
+PER_CUSTOMER_DISK_ID = 2
+PER_CUSTOMER_FILES = {
+    # relative path -> property gating installation, or None if always installed
+    "custom.txt": None,
+    "data/flutter_assets/assets/icon.ico": "CC_HAS_ICON_ICO",
+    "data/flutter_assets/assets/icon.png": "CC_HAS_ICON_PNG",
+    "data/flutter_assets/assets/logo.png": "CC_HAS_LOGO",
+    "data/flutter_assets/assets/logo_light.png": "CC_HAS_LOGO_LIGHT",
+    "data/flutter_assets/assets/logo_dark.png": "CC_HAS_LOGO_DARK",
+}
+
+
+def normalize_relative(relative_path):
+    path = relative_path.replace("\\", "/")
+    while path.startswith("./"):
+        path = path[2:]
+    return path.lower()
+
+
+def is_per_customer(relative_path):
+    return normalize_relative(relative_path) in PER_CUSTOMER_FILES
+
+
+def per_customer_condition(relative_path):
+    return PER_CUSTOMER_FILES.get(normalize_relative(relative_path))
+
+
 def read_lines_and_start_index(file_path, tag_start, tag_end):
    with open(file_path, "r", encoding="utf-8") as f:
        lines = f.readlines()
@@ -112,7 +156,7 @@ def read_lines_and_start_index(file_path, tag_start, tag_end):
    return lines, index_start


-def insert_components_between_tags(lines, index_start, app_name, dist_dir):
+def insert_components_between_tags(lines, index_start, app_name, dist_dir, template=False):
    indent = g_indent_unit * 3
    path = Path(dist_dir)
    idx = 1
@@ -126,12 +170,23 @@ def insert_components_between_tags(lines, index_start, app_name, dist_dir):
            if subdir != ".":
                dir_attr = f'Subdirectory="{subdir}"'

+            relative = file_path.relative_to(path).as_posix()
+            disk_attr = ""
+            condition_attr = ""
+            if template and is_per_customer(relative):
+                disk_attr = f' DiskId="{PER_CUSTOMER_DISK_ID}"'
+                # Branding assets are optional, and the template only carries a
+                # placeholder, so install one only when the customer supplied it.
+                condition = per_customer_condition(relative)
+                if condition:
+                    condition_attr = f' Condition="{condition} = 1"'
+
            # Don't generate Component Id and File Id like 'Component_{idx}' and 'File_{idx}'
            # because it will cause error
            # "Error WIX0130	The primary key 'xxxx' is duplicated in table 'Directory'"
            to_insert_lines = f"""
-{indent}<Component Guid="{uuid.uuid4()}" {dir_attr}>
-{indent}{g_indent_unit}<File Source="{file_path.as_posix()}" KeyPath="yes" Checksum="yes" />
+{indent}<Component Guid="{uuid.uuid4()}" {dir_attr}{condition_attr}>
+{indent}{g_indent_unit}<File Source="{file_path.as_posix()}" KeyPath="yes" Checksum="yes"{disk_attr} />
 {indent}</Component>
 """
            lines.insert(index_start + 1, to_insert_lines[1:])
@@ -140,17 +195,52 @@ def insert_components_between_tags(lines, index_start, app_name, dist_dir):
    return True


-def gen_auto_component(app_name, dist_dir):
+def gen_auto_component(app_name, dist_dir, template=False):
    return gen_content_between_tags(
        "Package/Components/RustDesk.wxs",
        "<!--$AutoComonentStart$-->",
        "<!--$AutoComponentEnd$-->",
        lambda lines, index_start: insert_components_between_tags(
-            lines, index_start, app_name, dist_dir
+            lines, index_start, app_name, dist_dir, template
        ),
    )


+def gen_media2():
+    """Second cabinet holding only what a custom client replaces."""
+
+    def func(lines, index_start):
+        indent = g_indent_unit * 2
+        lines.insert(
+            index_start + 1,
+            f'{indent}<Media Id="{PER_CUSTOMER_DISK_ID}" Cabinet="cab2.cab"'
+            ' EmbedCab="yes" CompressionLevel="high" />\n',
+        )
+        return lines
+
+    return gen_content_between_tags(
+        "Package/Package.wxs", "<!--$Media2Start$-->", "<!--$Media2End$-->", func
+    )
+
+
+def put_app_exe_on_media2():
+    """The app executable has its own component, so it is moved by name."""
+    target = Path(sys.argv[0]).parent.joinpath("Package/Components/RustDesk.wxs")
+    with open(target, "r", encoding="utf-8") as f:
+        content = f.read()
+    old = '<File Id="App.exe" Name="$(var.Product).exe" KeyPath="yes" Checksum="yes">'
+    new = (
+        '<File Id="App.exe" Name="$(var.Product).exe" KeyPath="yes" Checksum="yes"'
+        f' DiskId="{PER_CUSTOMER_DISK_ID}">'
+    )
+    if content.count(old) != 1:
+        print(f"Error: expected exactly one App.exe File element, found {content.count(old)}")
+        return False
+    with open(target, "w", encoding="utf-8") as f:
+        f.write(content.replace(old, new))
+    return True
+
+
 def gen_pre_vars(args, dist_dir):
    def func(lines, index_start):
        upgrade_code = uuid.uuid5(uuid.NAMESPACE_OID, app_name + ".exe")
@@ -190,18 +280,6 @@ def replace_app_name_in_langs(app_name):
        with open(file_path, "w", encoding="utf-8") as f:
            f.writelines(lines)

-def replace_app_name_in_custom_actions(app_name):
-    custion_actions_dir = Path(sys.argv[0]).parent.joinpath("CustomActions")
-    for file_path in chain(custion_actions_dir.glob("*.cpp"), custion_actions_dir.glob("*.h")):
-        with open(file_path, "r", encoding="utf-8") as f:
-            lines = f.readlines()
-        for i, line in enumerate(lines):
-            line = re.sub(r"\bRustDesk\b", app_name, line)
-            line = line.replace(f"{app_name} v4 Printer Driver", "RustDesk v4 Printer Driver")
-            lines[i] = line
-        with open(file_path, "w", encoding="utf-8") as f:
-            f.writelines(lines)
-
 def gen_upgrade_info():
    def func(lines, index_start):
        indent = g_indent_unit * 3
@@ -478,11 +556,16 @@ if __name__ == "__main__":
    if not gen_conn_type(args):
        sys.exit(-1)

-    if not gen_auto_component(app_name, dist_dir):
+    if args.template:
+        if not gen_media2():
+            sys.exit(-1)
+        if not put_app_exe_on_media2():
+            sys.exit(-1)
+
+    if not gen_auto_component(app_name, dist_dir, args.template):
        sys.exit(-1)

    if not gen_custom_dialog_bitmaps():
        sys.exit(-1)

    replace_app_name_in_langs(args.app_name)
-    replace_app_name_in_custom_actions(args.app_name)
--- a/res/vcpkg/ffmpeg/portfile.cmake
+++ b/res/vcpkg/ffmpeg/portfile.cmake
@@ -87,7 +87,7 @@ if(VCPKG_HOST_IS_WINDOWS)
    vcpkg_acquire_msys(MSYS_ROOT PACKAGES automake1.16)
    set(SHELL "${MSYS_ROOT}/usr/bin/bash.exe")
    vcpkg_add_to_path("${MSYS_ROOT}/usr/share/automake-1.16")
-    string(APPEND OPTIONS " --pkg-config=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+    string(APPEND OPTIONS " --pkg-config=${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX} ")
 else()
    find_program(SHELL bash)
 endif()
--- a/src/client.rs
+++ b/src/client.rs
--- a/src/client/io_loop.rs
+++ b/src/client/io_loop.rs
@@ -185,14 +185,6 @@ impl<T: InvokeUiSession> Remote<T> {
                    .unwrap()
                    .set_connected();
                let is_secured = peer.is_secured();
-                // Only WebRTC needs refining: its label names the transport that won the race,
-                // not the family ICE ended up nominating, and it is the one path where the two
-                // can disagree with the address the rendezvous observed.
-                let stream_type = if peer.webrtc_remote_ipv6().await.unwrap_or(false) {
-                    "WebRTC/IPv6"
-                } else {
-                    stream_type
-                };
                self.handler
                    .set_connection_type(is_secured, direct, stream_type); // flutter -> connection_ready
                if !is_secured
@@ -204,11 +196,6 @@ impl<T: InvokeUiSession> Remote<T> {
                        tokio::time::sleep(KCP_CLOSE_REASON_FLUSH_DELAY).await;
                    }
                    self.handle_disconnected(round);
-                    // Close the WebRTC pc on this decline path too (no-op for TCP/WS); otherwise its
-                    // pc lingers in the global session cache until ICE decays on its own. The pc
-                    // and its teardown live on hbb_common's WebRTC I/O runtime, so this session
-                    // runtime's death on return affects neither.
-                    peer.close_webrtc();
                    return;
                }
                self.handler.update_direct(Some(direct));
@@ -355,14 +342,6 @@ impl<T: InvokeUiSession> Remote<T> {
                    }
                }
                log::debug!("Exit io_loop of id={}", self.handler.get_id());
-                // Close the WebRTC peer connection (if this session used it) so its pc is not left
-                // lingering in the global session cache after the session ends; dropping `peer`
-                // alone does not release it. No-op for TCP/WebSocket transports. The pc, its
-                // sockets and pump tasks, and this close all live on hbb_common's WebRTC I/O
-                // runtime — nothing may run them on this session runtime, which is dropped the
-                // moment io_loop returns and would kill the teardown (or, if awaited under a
-                // timeout, cancel it after `close()` latches `is_closed`, stranding the pc).
-                peer.close_webrtc();
                // Stop client audio server.
                if let Some(s) = self.stop_voice_call_sender.take() {
                    s.send(()).ok();
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,7 +1,7 @@
 use std::{
    collections::HashMap,
    future::Future,
-    net::SocketAddr,
+    net::{SocketAddr, ToSocketAddrs},
    sync::{Arc, Mutex, RwLock},
    task::Poll,
 };
@@ -1153,13 +1153,6 @@ pub fn is_public(url: &str) -> bool {
    host == "rustdesk.com" || host.ends_with(".rustdesk.com")
 }

-pub fn get_tcp_punch_enabled() -> bool {
-    config::option2bool(
-        keys::OPTION_ENABLE_TCP_PUNCH,
-        &get_local_option(keys::OPTION_ENABLE_TCP_PUNCH),
-    )
-}
-
 pub fn get_udp_punch_enabled() -> bool {
    config::option2bool(
        keys::OPTION_ENABLE_UDP_PUNCH,
@@ -1174,19 +1167,9 @@ pub fn get_ipv6_punch_enabled() -> bool {
    )
 }

-pub fn get_webrtc_enabled() -> bool {
-    config::option2bool(
-        keys::OPTION_ENABLE_WEBRTC,
-        &get_local_option(keys::OPTION_ENABLE_WEBRTC),
-    )
-}
-
 pub fn get_local_option(key: &str) -> String {
    let v = LocalConfig::get_option(key);
-    if key == keys::OPTION_ENABLE_UDP_PUNCH
-        || key == keys::OPTION_ENABLE_IPV6_PUNCH
-        || key == keys::OPTION_ENABLE_WEBRTC
-    {
+    if key == keys::OPTION_ENABLE_UDP_PUNCH || key == keys::OPTION_ENABLE_IPV6_PUNCH {
        if v.is_empty() {
            if !is_public(&Config::get_rendezvous_server()) {
                return "N".to_owned();
@@ -2143,21 +2126,11 @@ pub fn get_rs_pk(str_base64: &str) -> Option<sign::PublicKey> {
 }

 pub fn decode_id_pk(signed: &[u8], key: &sign::PublicKey) -> ResultType<(String, [u8; 32])> {
-    let (id, pk, _) = decode_id_pk_dtls(signed, key)?;
-    Ok((id, pk))
-}
-
-/// Like [`decode_id_pk`] but also returns the signed DTLS certificate fingerprint (empty string
-/// for non-WebRTC peers), used to bind a WebRTC DTLS channel to the verified peer identity.
-pub fn decode_id_pk_dtls(
-    signed: &[u8],
-    key: &sign::PublicKey,
-) -> ResultType<(String, [u8; 32], String)> {
    let res = IdPk::parse_from_bytes(
        &sign::verify(signed, key).map_err(|_| anyhow!("Signature mismatch"))?,
    )?;
    if let Some(pk) = get_pk(&res.pk) {
-        Ok((res.id, pk, res.dtls_fingerprint))
+        Ok((res.id, pk))
    } else {
        bail!("Wrong their public length");
    }
@@ -2459,26 +2432,16 @@ pub fn is_udp_disabled() -> bool {
    Config::get_option(keys::OPTION_DISABLE_UDP) == "Y"
 }

-/// Run KCP with its congestion window (nc=0) instead of the turbo profile it has always shipped.
-///
-/// Opt-in: which profile wins depends on why packets are lost — nc=1 deepens real congestion,
-/// while nc=0 reads random loss as congestion and its RTO backoff drops cwnd to 1. Undecidable
-/// without a shaped link, so keep what users run today.
-#[inline]
-pub fn get_kcp_cc_enabled() -> bool {
-    let k = keys::OPTION_ALLOW_KCP_CC;
-    config::option2bool(k, &Config::get_option(k))
-}
-
 // this crate https://github.com/yoshd/stun-client supports nat type
-async fn stun_ipv6_test(stun_server: String) -> ResultType<(SocketAddr, String)> {
+async fn stun_ipv6_test(stun_server: &str) -> ResultType<(SocketAddr, String)> {
+    use std::net::ToSocketAddrs;
    use stunclient::StunClient;
    let local_addr = SocketAddr::from(([0u16; 8], 0)); // [::]:0
    let socket = UdpSocket::bind(&local_addr).await?;
-    // Resolve via tokio so DNS never blocks the async runtime worker.
-    let Some(stun_addr) = tokio::net::lookup_host(&stun_server)
-        .await?
-        .find(|x| x.is_ipv6())
+    let Some(stun_addr) = stun_server
+        .to_socket_addrs()?
+        .filter(|x| x.is_ipv6())
+        .next()
    else {
        bail!(
            "Failed to resolve STUN ipv6 server address: {}",
@@ -2488,36 +2451,81 @@ async fn stun_ipv6_test(stun_server: String) -> ResultType<(SocketAddr, String)>
    let client = StunClient::new(stun_addr);
    let addr = client.query_external_address_async(&socket).await?;
    Ok(if addr.ip().is_ipv6() {
-        (addr, stun_server)
+        (addr, stun_server.to_owned())
    } else {
        bail!("STUN server returned non-IPv6 address: {}", addr)
    })
 }

+async fn stun_ipv4_test(stun_server: &str) -> ResultType<(SocketAddr, String)> {
+    use std::net::ToSocketAddrs;
+    use stunclient::StunClient;
+    let local_addr = SocketAddr::from(([0u8; 4], 0));
+    let socket = UdpSocket::bind(&local_addr).await?;
+    let Some(stun_addr) = stun_server
+        .to_socket_addrs()?
+        .filter(|x| x.is_ipv4())
+        .next()
+    else {
+        bail!(
+            "Failed to resolve STUN ipv4 server address: {}",
+            stun_server
+        );
+    };
+    let client = StunClient::new(stun_addr);
+    let addr = client.query_external_address_async(&socket).await?;
+    Ok(if addr.ip().is_ipv4() {
+        (addr, stun_server.to_owned())
+    } else {
+        bail!("STUN server returned non-IPv6 address: {}", addr)
+    })
+}
+
+static STUNS_V4: [&str; 3] = [
+    "stun.l.google.com:19302",
+    "stun.cloudflare.com:3478",
+    "stun.nextcloud.com:3478",
+];
+
+static STUNS_V6: [&str; 3] = [
+    "stun.l.google.com:19302",
+    "stun.cloudflare.com:3478",
+    "stun.nextcloud.com:3478",
+];
+
+pub async fn test_nat_ipv4() -> ResultType<(SocketAddr, String)> {
+    use hbb_common::futures::future::{select_ok, FutureExt};
+    let tests = STUNS_V4
+        .iter()
+        .map(|&stun| stun_ipv4_test(stun).boxed())
+        .collect::<Vec<_>>();
+
+    match select_ok(tests).await {
+        Ok(res) => {
+            return Ok(res.0);
+        }
+        Err(e) => {
+            bail!(
+                "Failed to get public IPv4 address via public STUN servers: {}",
+                e
+            );
+        }
+    };
+}
+
 async fn test_bind_ipv6() -> ResultType<SocketAddr> {
-    use hbb_common::futures::future::FutureExt;
    let local_addr = SocketAddr::from(([0u16; 8], 0)); // [::]:0
    let socket = UdpSocket::bind(local_addr).await?;
-    // Nothing is sent - `connect` only makes the kernel pick a route and a source address - so any
-    // resolvable target answers equally and the whole cost is DNS. Race the lookups rather than
-    // walk them: this is awaited inline on the connection path, not every STUN host publishes a
-    // AAAA, and one resolver that hangs must not decide whether this host has v6.
-    let lookups = hbb_common::webrtc::WebRTCStream::default_stun_servers()
-        .into_iter()
-        .map(|stun| {
-            (async move {
-                let addr = tokio::net::lookup_host(&stun)
-                    .await?
-                    .find(|x| x.is_ipv6())
-                    .ok_or_else(|| {
-                        anyhow!("Failed to resolve STUN ipv6 server address: {}", stun)
-                    })?;
-                Ok::<SocketAddr, hbb_common::anyhow::Error>(addr)
-            })
-            .boxed()
-        })
-        .collect::<Vec<_>>();
-    let (addr, _) = hbb_common::futures::future::select_ok(lookups).await?;
+    let addr = STUNS_V6[0]
+        .to_socket_addrs()?
+        .filter(|x| x.is_ipv6())
+        .next()
+        .ok_or_else(|| {
+            anyhow!(
+                "Failed to resolve STUN ipv6 server address: {}",
+                STUNS_V6[0]
+            )
+        })?;
    socket.connect(addr).await?;
    Ok(socket.local_addr()?)
 }
@@ -2584,9 +2592,9 @@ pub async fn test_ipv6() -> Option<tokio::task::JoinHandle<()>> {

    Some(tokio::spawn(async {
        use hbb_common::futures::future::{select_ok, FutureExt};
-        let tests = hbb_common::webrtc::WebRTCStream::default_stun_servers()
-            .into_iter()
-            .map(|stun| stun_ipv6_test(stun).boxed())
+        let tests = STUNS_V6
+            .iter()
+            .map(|&stun| stun_ipv6_test(stun).boxed())
            .collect::<Vec<_>>();

        match select_ok(tests).await {
@@ -2607,114 +2615,51 @@ pub async fn test_ipv6() -> Option<tokio::task::JoinHandle<()>> {
    }))
 }

-// A punch packet carries a magic and a transaction id so a reply can be *proven* to answer this
-// probe. The punch it replaces sent a zero-length datagram and called the hole open on whatever
-// arrived next - which the rendezvous NAT test's own leftover replies satisfied instantly, so the
-// retry loop below never actually ran and its success meant nothing.
-const PUNCH_PROBE: [u8; 4] = *b"RDP?";
-const PUNCH_ACK: [u8; 4] = *b"RDP!";
-const PUNCH_PACKET_LEN: usize = 12;
-
-fn punch_packet(tag: &[u8; 4], tid: u64) -> [u8; PUNCH_PACKET_LEN] {
-    let mut packet = [0u8; PUNCH_PACKET_LEN];
-    packet[..4].copy_from_slice(tag);
-    packet[4..].copy_from_slice(&tid.to_le_bytes());
-    packet
-}
-
-fn punch_tid(packet: &[u8], tag: &[u8; 4]) -> Option<u64> {
-    if packet.len() != PUNCH_PACKET_LEN || packet[..4] != tag[..] {
-        return None;
-    }
-    packet[4..].try_into().ok().map(u64::from_le_bytes)
-}
-
-/// Punch until one of our own probes is acknowledged. Both ends run this identically - each
-/// probes, each answers the other's probes - and each returns only once a reply carrying its own
-/// transaction id comes back, the one thing that proves the pair carries traffic both ways.
-///
-/// Returning is therefore a fact rather than a guess, which is what lets the caller stop instead
-/// of handing a dead socket to a transport whose only way to discover the truth is to time out.
-///
-/// A datagram that is neither probe nor acknowledgement is returned rather than dropped: it means
-/// the peer finished first and is already speaking KCP, whose SYN is never retransmitted.
-///
-/// Only the connector stops on its own acknowledgement, because only it has something to send
-/// next. An acknowledgement proves our probe came back, not that the peer's probe was answered -
-/// and after this returns nothing answers probes any more, since KCP's io loop drops anything
-/// shorter than its header. A listener that stopped here would go mute while a peer whose own
-/// probe or answer was lost - the normal state of a hole that is still opening - kept probing an
-/// endpoint that works, until it timed out. So the listener stops on the peer's first real packet.
 pub async fn punch_udp(
    socket: Arc<UdpSocket>,
    listen: bool,
 ) -> ResultType<Option<bytes::BytesMut>> {
-    let tid = ((hbb_common::time_based_rand() as u64) << 32) | hbb_common::time_based_rand() as u64;
-    let probe = punch_packet(&PUNCH_PROBE, tid);
-    let mut data = [0u8; 1500];
-    // `connect` does not flush the receive queue, so the NAT test's extra replies are still in it.
-    while socket.try_recv(&mut data).is_ok() {}
-
    let mut retry_interval = Duration::from_millis(20);
    const MAX_INTERVAL: Duration = Duration::from_millis(200);
-    // Both ends start within one rendezvous round trip of each other and the acknowledgement is
-    // one peer round trip, so a pair that has not answered in this long is not going to. The old
-    // 20s came from having no way to tell "not yet" from "never".
-    const MAX_TIME: Duration = Duration::from_secs(3);
-    let mut probes_sent = 0u32;
-    let mut probes_seen = 0u32;
-    let mut acked = false;
-    let mut recv_errors = 0u32;
-    socket.send(&probe).await.ok();
-    probes_sent += 1;
+    const MAX_TIME: Duration = Duration::from_secs(20);
+    let mut packets_sent = 0;
+    socket.send(&[]).await.ok();
+    packets_sent += 1;
    let mut last_send_time = Instant::now();
    let tm = Instant::now();
+    let mut data = [0u8; 1500];

    loop {
        tokio::select! {
            _ = hbb_common::sleep(retry_interval.as_secs_f32()) => {
                if tm.elapsed() > MAX_TIME {
-                    bail!("UDP punch is timed out, {probes_sent} probes sent, {probes_seen} probes received, acked: {acked}, {recv_errors} recv errors absorbed");
+                    bail!("UDP punch is timed out, stop sending packets after {:?} packets", packets_sent);
                }
-                if last_send_time.elapsed() >= retry_interval {
-                    socket.send(&probe).await.ok();
-                    probes_sent += 1;
-                    retry_interval = std::cmp::min(retry_interval.mul_f64(1.5), MAX_INTERVAL);
+                let elapsed = last_send_time.elapsed();
+
+                if elapsed >= retry_interval {
+                    socket.send(&[]).await.ok();
+                    packets_sent += 1;
+
+                    // Exponentially increase interval to reduce network pressure
+                    retry_interval = std::cmp::min(
+                        Duration::from_millis((retry_interval.as_millis() as f64 * 1.5) as u64),
+                        MAX_INTERVAL
+                    );
                    last_send_time = Instant::now();
                }
            }
            res = socket.recv(&mut data) => match res {
-                Err(e) => {
-                    // ICMP unreachable from the peer's NAT is expected while the hole forms and
-                    // surfaces here as ConnectionReset/Refused; treat it as loss, MAX_TIME bounds
-                    // the attempt. Log only the first - this retries every 10ms.
-                    recv_errors += 1;
-                    if recv_errors == 1 {
-                        log::debug!("UDP punch recv error (treated as loss): {e}");
-                    }
-                    hbb_common::sleep(0.01).await;
-                }
+                Err(e) => bail!("UDP punch failed, {packets_sent} packets sent: {e}"),
                Ok(n) => {
-                    let ack = punch_tid(&data[..n], &PUNCH_ACK);
-                    if ack == Some(tid) {
-                        if !listen {
-                            log::debug!(
-                                "UDP punch confirmed in {:?}, {probes_sent} probes sent, {probes_seen} received",
-                                tm.elapsed()
-                            );
-                            return Ok(None);
+                    // log::debug!("UDP punch succeeded after sending {} packets after {:?}", packets_sent, tm.elapsed());
+                    if listen {
+                        if n == 0 {
+                            continue;
                        }
-                        acked = true;
-                    } else if let Some(peer_tid) = punch_tid(&data[..n], &PUNCH_PROBE) {
-                        probes_seen += 1;
-                        socket.send(&punch_packet(&PUNCH_ACK, peer_tid)).await.ok();
-                    } else if ack.is_none() && n > 0 {
-                        log::debug!(
-                            "UDP punch confirmed by {n} bytes of peer data in {:?}, {probes_sent} probes sent",
-                            tm.elapsed()
-                        );
                        return Ok(Some(bytes::BytesMut::from(&data[..n])));
                    }
+                    return Ok(None);
                }
            }
        }
--- a/src/ipc/auth.rs
+++ b/src/ipc/auth.rs
@@ -24,6 +24,7 @@ use std::os::windows::io::AsRawHandle;
 use std::{
    fs,
    path::{Path, PathBuf},
+    sync::{Mutex, OnceLock},
 };
 #[cfg(windows)]
 use windows::Win32::{Foundation::HANDLE, System::Pipes::GetNamedPipeClientProcessId};
@@ -519,17 +520,66 @@ pub(crate) fn ensure_peer_executable_matches_current_by_fd(
 #[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
 const UNAUTHORIZED_IPC_LOG_INTERVAL: std::time::Duration = std::time::Duration::from_secs(5);

+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+#[derive(Default)]
+struct UnauthorizedIpcLogThrottle {
+    last_log_at: Option<std::time::Instant>,
+    suppressed: u64,
+}
+
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+impl UnauthorizedIpcLogThrottle {
+    #[inline]
+    fn on_reject(&mut self, now: std::time::Instant) -> Option<u64> {
+        if let Some(last) = self.last_log_at {
+            if now.saturating_duration_since(last) < UNAUTHORIZED_IPC_LOG_INTERVAL {
+                self.suppressed += 1;
+                return None;
+            }
+        }
+        self.last_log_at = Some(now);
+        Some(std::mem::take(&mut self.suppressed))
+    }
+}
+
+#[cfg(any(target_os = "windows", target_os = "linux", target_os = "macos"))]
+#[inline]
+fn throttled_unauthorized_ipc_log(
+    throttle_cell: &OnceLock<Mutex<UnauthorizedIpcLogThrottle>>,
+    emit: impl FnOnce(u64),
+) {
+    let throttle = throttle_cell.get_or_init(|| Mutex::new(UnauthorizedIpcLogThrottle::default()));
+    let should_log = match throttle.lock() {
+        Ok(mut throttle) => throttle.on_reject(std::time::Instant::now()),
+        Err(_) => Some(0),
+    };
+    if let Some(suppressed) = should_log {
+        emit(suppressed);
+    }
+}
+
 #[cfg(any(target_os = "linux", target_os = "macos"))]
 #[inline]
 fn log_rejected_service_connection(postfix: &str, peer_uid: Option<u32>, active_uid: Option<u32>) {
-    hbb_common::throttled_log!(
-        UNAUTHORIZED_IPC_LOG_INTERVAL,
-        warn,
-        "Rejected unauthorized connection on protected service-scoped IPC channel: postfix={}, peer_uid={:?}, active_uid={:?}",
-        postfix,
-        peer_uid,
-        active_uid
-    );
+    static LOG_THROTTLE: OnceLock<Mutex<UnauthorizedIpcLogThrottle>> = OnceLock::new();
+    throttled_unauthorized_ipc_log(&LOG_THROTTLE, |suppressed| {
+        if suppressed > 0 {
+            log::warn!(
+                "Rejected unauthorized connection on protected service-scoped IPC channel: postfix={}, peer_uid={:?}, active_uid={:?} (suppressed {} similar events)",
+                postfix,
+                peer_uid,
+                active_uid,
+                suppressed
+            );
+        } else {
+            log::warn!(
+                "Rejected unauthorized connection on protected service-scoped IPC channel: postfix={}, peer_uid={:?}, active_uid={:?}",
+                postfix,
+                peer_uid,
+                active_uid
+            );
+        }
+    });
 }

 #[cfg(target_os = "linux")]
@@ -539,14 +589,25 @@ pub(crate) fn log_rejected_uinput_connection(
    peer_uid: Option<u32>,
    active_uid: Option<u32>,
 ) {
-    hbb_common::throttled_log!(
-        UNAUTHORIZED_IPC_LOG_INTERVAL,
-        warn,
-        "Rejected unauthorized connection on uinput ipc channel: postfix={}, peer_uid={:?}, active_uid={:?}",
-        postfix,
-        peer_uid,
-        active_uid
-    );
+    static LOG_THROTTLE: OnceLock<Mutex<UnauthorizedIpcLogThrottle>> = OnceLock::new();
+    throttled_unauthorized_ipc_log(&LOG_THROTTLE, |suppressed| {
+        if suppressed > 0 {
+            log::warn!(
+                "Rejected unauthorized connection on uinput ipc channel: postfix={}, peer_uid={:?}, active_uid={:?} (suppressed {} similar events)",
+                postfix,
+                peer_uid,
+                active_uid,
+                suppressed
+            );
+        } else {
+            log::warn!(
+                "Rejected unauthorized connection on uinput ipc channel: postfix={}, peer_uid={:?}, active_uid={:?}",
+                postfix,
+                peer_uid,
+                active_uid
+            );
+        }
+    });
 }

 #[cfg(windows)]
@@ -559,17 +620,31 @@ pub(crate) fn log_rejected_windows_ipc_connection(
    peer_is_system: Option<bool>,
    peer_is_elevated: Option<bool>,
 ) {
-    hbb_common::throttled_log!(
-        UNAUTHORIZED_IPC_LOG_INTERVAL,
-        warn,
-        "Rejected unauthorized connection on ipc channel: postfix={}, peer_pid={:?}, peer_session_id={:?}, expected_session_id={:?}, peer_is_system={:?}, peer_is_elevated={:?}",
-        postfix,
-        peer_pid,
-        peer_session_id,
-        expected_session_id,
-        peer_is_system,
-        peer_is_elevated
-    );
+    static LOG_THROTTLE: OnceLock<Mutex<UnauthorizedIpcLogThrottle>> = OnceLock::new();
+    throttled_unauthorized_ipc_log(&LOG_THROTTLE, |suppressed| {
+        if suppressed > 0 {
+            log::warn!(
+                "Rejected unauthorized connection on ipc channel: postfix={}, peer_pid={:?}, peer_session_id={:?}, expected_session_id={:?}, peer_is_system={:?}, peer_is_elevated={:?} (suppressed {} similar events)",
+                postfix,
+                peer_pid,
+                peer_session_id,
+                expected_session_id,
+                peer_is_system,
+                peer_is_elevated,
+                suppressed
+            );
+        } else {
+            log::warn!(
+                "Rejected unauthorized connection on ipc channel: postfix={}, peer_pid={:?}, peer_session_id={:?}, expected_session_id={:?}, peer_is_system={:?}, peer_is_elevated={:?}",
+                postfix,
+                peer_pid,
+                peer_session_id,
+                expected_session_id,
+                peer_is_system,
+                peer_is_elevated
+            );
+        }
+    });
 }

 #[cfg(any(target_os = "linux", target_os = "macos"))]
--- a/src/kcp_stream.rs
+++ b/src/kcp_stream.rs
@@ -19,28 +19,7 @@ pub struct KcpStream {
    stop_sender: Option<oneshot::Sender<()>>,
 }

-const KCP_IO_ERR_LOG_INTERVAL: std::time::Duration = std::time::Duration::from_secs(5);
-static KCP_SEND_ERR_LOG: hbb_common::log_throttle::LogThrottle =
-    hbb_common::log_throttle::LogThrottle::new(KCP_IO_ERR_LOG_INTERVAL);
-static KCP_RECV_ERR_LOG: hbb_common::log_throttle::LogThrottle =
-    hbb_common::log_throttle::LogThrottle::new(KCP_IO_ERR_LOG_INTERVAL);
-
 impl KcpStream {
-    // Opt in to KCP's built-in congestion window (nc=0) instead of the pure turbo profile
-    // (nc=1) that has always shipped; see `get_kcp_cc_enabled` for why this is not the default.
-    // Sender-side only, so no wire negotiation is needed and either peer may run either profile.
-    // Requires kcp-sys from the `rustdesk-patches` branch, which wires the config factory into
-    // connection setup (on older revs the factory was stored but never consulted).
-    fn apply_kcp_config(endpoint: &mut KcpEndpoint) {
-        if crate::get_kcp_cc_enabled() {
-            endpoint.set_kcp_config_factory(Box::new(|conv| {
-                let mut config = kcp_sys::ffi_safe::KcpConfig::new_turbo(conv);
-                config.nc = Some(0);
-                config
-            }));
-        }
-    }
-
    fn create_framed(stream: stream::KcpStream, local_addr: Option<SocketAddr>) -> Stream {
        Stream::Tcp(FramedStream(
            tokio_util::codec::Framed::new(DynTcpStream(Box::new(stream)), BytesCodec::new()),
@@ -56,7 +35,6 @@ impl KcpStream {
        init_packet: Option<BytesMut>,
    ) -> ResultType<(Self, Stream)> {
        let mut endpoint = KcpEndpoint::new();
-        Self::apply_kcp_config(&mut endpoint);
        endpoint.run().await;

        let (input, output) = (
@@ -92,7 +70,6 @@ impl KcpStream {
        timeout: std::time::Duration,
    ) -> ResultType<(Self, Stream)> {
        let mut endpoint = KcpEndpoint::new();
-        Self::apply_kcp_config(&mut endpoint);
        endpoint.run().await;

        let (input, output) = (
@@ -127,10 +104,6 @@ impl KcpStream {
        let udp = udp_socket.clone();
        tokio::spawn(async move {
            let mut buf = vec![0; 1500];
-            // Socket errors are ICMP unreachable on a connected UDP socket — advisory, and
-            // routine while a hole forms — so treat them as loss and let KCP's pong timeout reap
-            // a link that is really dead. One throttle PER DIRECTION: the error is reported once
-            // and cleared, so send-ok/recv-err alternates and a shared counter never fires.
            loop {
                tokio::select! {
                    _ = &mut stop_receiver => {
@@ -139,10 +112,8 @@ impl KcpStream {
                    }
                    Some(data) = output.recv() => {
                        if let Err(e) = udp.send(&data.inner()).await {
-                            if let Some(n) = KCP_SEND_ERR_LOG.due() {
-                                log::debug!("KCP send error x{n} (treated as loss), last: {e}");
-                            }
-                            tokio::time::sleep(std::time::Duration::from_millis(10)).await;
+                            log::debug!("KCP send error: {:?}", e);
+                            break;
                        }
                    }
                    result = udp.recv_from(&mut buf) => {
@@ -156,10 +127,8 @@ impl KcpStream {
                                    .await.ok();
                            }
                            Err(e) => {
-                                if let Some(n) = KCP_RECV_ERR_LOG.due() {
-                                    log::debug!("KCP recv error x{n} (treated as loss), last: {e}");
-                                }
-                                tokio::time::sleep(std::time::Duration::from_millis(10)).await;
+                                log::debug!("KCP recv_from error: {:?}", e);
+                                break;
                            }
                        }
                    }
@@ -180,124 +149,3 @@ impl Drop for KcpStream {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::time::Duration;
-
-    async fn connected_pair() -> (Arc<UdpSocket>, Arc<UdpSocket>) {
-        let a = UdpSocket::bind("127.0.0.1:0").await.unwrap();
-        let b = UdpSocket::bind("127.0.0.1:0").await.unwrap();
-        a.connect(b.local_addr().unwrap()).await.unwrap();
-        b.connect(a.local_addr().unwrap()).await.unwrap();
-        (Arc::new(a), Arc::new(b))
-    }
-
-    async fn establish() -> ((KcpStream, Stream), (KcpStream, Stream)) {
-        let (a, b) = connected_pair().await;
-        let (accept_res, connect_res) = tokio::join!(
-            KcpStream::accept(b, Duration::from_secs(5), None),
-            KcpStream::connect(a, Duration::from_secs(5))
-        );
-        (
-            connect_res.expect("connect over loopback"),
-            accept_res.expect("accept over loopback"),
-        )
-    }
-
-    // The full client path over real loopback sockets: handshake through the kcp_io
-    // pumps, framed data both ways, then a graceful close. The endpoint guard stays
-    // alive across the stream drop so the FIN can go out, and the peer's framed
-    // stream must end (BrokenPipe from the kcp reader) instead of hanging.
-    #[tokio::test]
-    async fn test_kcp_stream_loopback_roundtrip_and_close() {
-        let ((_guard_a, mut stream_a), (_guard_b, mut stream_b)) = establish().await;
-
-        stream_a
-            .send_bytes(Bytes::from_static(b"ping"))
-            .await
-            .unwrap();
-        let got = stream_b.next_timeout(5000).await.unwrap().unwrap();
-        assert_eq!(&got[..], b"ping");
-
-        stream_b
-            .send_bytes(Bytes::from_static(b"pong"))
-            .await
-            .unwrap();
-        let got = stream_a.next_timeout(5000).await.unwrap().unwrap();
-        assert_eq!(&got[..], b"pong");
-
-        drop(stream_a);
-        match stream_b.next_timeout(10_000).await {
-            None | Some(Err(_)) => {}
-            Some(Ok(data)) => panic!("unexpected data after close: {:?}", data),
-        }
-    }
-
-    // A writer that queues many frames and closes immediately must not cost the
-    // reader any of them: every frame arrives intact, in order, before end-of-stream.
-    // This is the client-side pin for the kcp-sys close-tail-drain semantics, through
-    // the real BytesCodec framing rustdesk sessions use.
-    #[tokio::test]
-    async fn test_kcp_stream_close_delivers_all_frames() {
-        let ((_guard_a, mut tx), (_guard_b, mut rx)) = establish().await;
-
-        const N: usize = 50;
-        let payload = vec![7u8; 32 * 1024];
-        for _ in 0..N {
-            tx.send_bytes(Bytes::from(payload.clone())).await.unwrap();
-        }
-        drop(tx);
-
-        let mut got = 0usize;
-        loop {
-            match rx.next_timeout(10_000).await {
-                Some(Ok(data)) => {
-                    assert_eq!(data.len(), payload.len(), "frame boundary broken");
-                    assert!(data.iter().all(|&b| b == 7), "frame content corrupted");
-                    got += 1;
-                }
-                // BrokenPipe (kcp reader end) or timeout-None both end the stream.
-                None | Some(Err(_)) => break,
-            }
-        }
-        assert_eq!(got, N, "graceful close lost frames");
-    }
-
-    // Socket errors on the connected UDP socket (ICMP unreachable after the peer
-    // vanishes) are advisory: the io loop must treat them as loss - keep accepting
-    // writes, keep running - rather than tearing the session down. Whether the OS
-    // actually surfaces ECONNREFUSED here is platform-dependent; either way the
-    // session must stay alive for this window.
-    #[tokio::test]
-    async fn test_kcp_io_treats_socket_errors_as_loss() {
-        let ((_guard_a, mut stream_a), (guard_b, stream_b)) = establish().await;
-
-        // Kill the peer entirely: endpoint stops, socket closes.
-        drop(stream_b);
-        drop(guard_b);
-        tokio::time::sleep(Duration::from_millis(50)).await;
-
-        for _ in 0..10 {
-            stream_a
-                .send_bytes(Bytes::from_static(b"into the void"))
-                .await
-                .expect("socket errors must be treated as loss, not stream failure");
-            tokio::time::sleep(Duration::from_millis(20)).await;
-        }
-    }
-
-    // The connect deadline must hold when nothing answers: no hang, prompt error.
-    #[tokio::test]
-    async fn test_kcp_connect_timeout_without_peer() {
-        let (a, _b) = connected_pair().await;
-        let start = tokio::time::Instant::now();
-        let res = KcpStream::connect(a, Duration::from_millis(600)).await;
-        assert!(res.is_err(), "connect must fail with no peer endpoint");
-        assert!(
-            start.elapsed() < Duration::from_secs(5),
-            "connect did not honor its deadline"
-        );
-    }
-}
--- a/src/lang/ar.rs
+++ b/src/lang/ar.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "لقطة الشاشة للشاشات المدمجة غير مدعومة"),
        ("screenshot-action-tip", "إجراء لقطة الشاشة"),
        ("Save as", "حفظ باسم"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "تصدير"),
+        ("Export Logs", "تصدير السجلات"),
+        ("Import Folder", "استيراد مجلد"),
        ("Copy to clipboard", "نسخ إلى الحافظة"),
        ("Enable remote printer", "تمكين الطابعة عن بُعد"),
        ("Downloading {}", "جارٍ تنزيل {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "قفل اللوحة"),
        ("Sync clipboard between sessions", "مزامنة الحافظة بين الجلسات"),
        ("sync-clipboard-between-sessions-tip", "النص أو الصور المنسوخة في جلسة بعيدة واحدة تُرسَل أيضًا إلى حافظة جلساتك المتصلة الأخرى."),
-        ("Enable WebRTC P2P connection", "تمكين اتصال نظير إلى نظير عبر WebRTC"),
-        ("Enable TCP hole punching", "تمكين تقنية حفر الثغرات عبر TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "تفعيل"),
+        ("Reuse one connection for port forwarding", "إعادة استخدام اتصال واحد لإعادة توجيه المنافذ"),
+        ("port-forward-mux-tip", "تمرير جميع اتصالات إعادة توجيه المنافذ عبر اتصال واحد بالجهاز الآخر، بدلاً من الاتصال وتسجيل الدخول من جديد لكل اتصال."),
    ].iter().cloned().collect();
 }
--- a/src/lang/be.rs
+++ b/src/lang/be.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Аб’яднанне здымкаў экранаў з некалькіх дысплэяў у дадзены момант не падтрымліваецца. Пераключыцеся на адзін з дысплэяў і паўтарыце дзеянне."),
        ("screenshot-action-tip", "Выберыце, што рабіць з атрыманым здымкам экрана."),
        ("Save as", "Захаваць у файл"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Экспартаваць"),
+        ("Export Logs", "Экспартаваць журналы"),
+        ("Import Folder", "Імпартаваць папку"),
        ("Copy to clipboard", "Скапіяваць у буфер абмену"),
        ("Enable remote printer", "Выкарыстоўваць аддалены прынтар"),
        ("Downloading {}", "Ідзе спампоўванне {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Заблакіраваць палатно"),
        ("Sync clipboard between sessions", "Сінхранізаваць буфер абмену паміж сеансамі"),
        ("sync-clipboard-between-sessions-tip", "Тэкст або відарысы, скапіяваныя ў адным аддаленым сеансе, таксама адпраўляюцца ў буфер абмену іншых вашых падключаных сеансаў."),
-        ("Enable WebRTC P2P connection", "Выкарыстоўваць падключэнне WebRTC P2P"),
-        ("Enable TCP hole punching", "Выкарыстоўваць TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Уключыць"),
+        ("Reuse one connection for port forwarding", "Выкарыстоўваць адно злучэнне для перанакіравання партоў"),
+        ("port-forward-mux-tip", "Перадаваць усе злучэнні аднаго перанакіравання партоў праз адно злучэнне з аддаленай прыладай замест паўторнага падлучэння і ўваходу для кожнага з іх."),
    ].iter().cloned().collect();
 }
--- a/src/lang/bg.rs
+++ b/src/lang/bg.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Обединяването на снимки от няколко екрана в момента не се поддържа. Моля, превключете към един екран и опитайте отново."),
        ("screenshot-action-tip", "Моля, изберете как да продължите със снимката на екрана."),
        ("Save as", "Запазване като"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Изнасяне"),
+        ("Export Logs", "Изнасяне на дневниците"),
+        ("Import Folder", "Внасяне на папка"),
        ("Copy to clipboard", "Копиране в клипборда"),
        ("Enable remote printer", "Позволяване на отдалечен принтер"),
        ("Downloading {}", "Изтегляне на {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Заключване на платното"),
        ("Sync clipboard between sessions", "Синхронизиране на клипборда между сесиите"),
        ("sync-clipboard-between-sessions-tip", "Текст или изображения, копирани в една отдалечена сесия, се изпращат и към клипборда на другите ви свързани сесии."),
-        ("Enable WebRTC P2P connection", "Позволяване на WebRTC P2P връзка"),
-        ("Enable TCP hole punching", "Позволяване на TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Активирай"),
+        ("Reuse one connection for port forwarding", "Използване на една връзка за пренасочване на портове"),
+        ("port-forward-mux-tip", "Всички връзки на едно пренасочване на портове минават през една връзка към отсрещния компютър, вместо да се свързвате и влизате отново за всяка от тях."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Actualment no és possible combinar captures de pantalla de diverses pantalles. Canvieu a una sola pantalla i torneu a provar."),
        ("screenshot-action-tip", "Seleccioneu com voleu continuar amb la captura de pantalla."),
        ("Save as", "Anomena i desa"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exporta"),
+        ("Export Logs", "Exporta els registres"),
+        ("Import Folder", "Importa una carpeta"),
        ("Copy to clipboard", "Copia al porta-retalls"),
        ("Enable remote printer", "Habilita l'impressora remota"),
        ("Downloading {}", "Descarregant {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Bloca el llenç"),
        ("Sync clipboard between sessions", "Sincronitza el porta-retalls entre sessions"),
        ("sync-clipboard-between-sessions-tip", "El text o les imatges copiats en una sessió remota també s'envien al porta-retalls de les altres sessions connectades."),
-        ("Enable WebRTC P2P connection", "Habilita la connexió WebRTC P2P"),
-        ("Enable TCP hole punching", "Activa la perforació TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Habilita"),
+        ("Reuse one connection for port forwarding", "Reutilitza una connexió per a la redirecció de ports"),
+        ("port-forward-mux-tip", "Fa passar totes les connexions d'una redirecció de ports per una única connexió amb l'altre equip, en lloc de connectar i iniciar la sessió de nou per a cadascuna."),
    ].iter().cloned().collect();
 }
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "当前不支持多个屏幕的合并截屏，请切换到单个屏幕重试。"),
        ("screenshot-action-tip", "请选择如何继续截屏。"),
        ("Save as", "另存为"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "导出"),
+        ("Export Logs", "导出日志"),
+        ("Import Folder", "导入文件夹"),
        ("Copy to clipboard", "复制到剪贴板"),
        ("Enable remote printer", "启用远程打印机"),
        ("Downloading {}", "正在下载 {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "锁定画布"),
        ("Sync clipboard between sessions", "在会话间同步剪贴板"),
        ("sync-clipboard-between-sessions-tip", "在一个远程会话中复制的文本或图片也会发送到其他已连接会话的剪贴板。"),
-        ("Enable WebRTC P2P connection", "启用 WebRTC P2P 连接"),
-        ("Enable TCP hole punching", "启用 TCP 打洞"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", "允许终端应用复制到剪贴板"),
+        ("Enable", "启用"),
+        ("Reuse one connection for port forwarding", "端口转发复用同一条连接"),
+        ("port-forward-mux-tip", "同一条端口转发规则上的所有连接共用一条到对方的连接，而不是每条连接都重新连接并登录一次。"),
    ].iter().cloned().collect();
 }
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Sloučení snímků obrazovky z více displejů aktuálně není podporováno. Přepněte na jeden displej a zkuste to znovu."),
        ("screenshot-action-tip", "Vyberte, jak pokračovat se snímkem obrazovky."),
        ("Save as", "Uložit jako"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportovat"),
+        ("Export Logs", "Exportovat protokoly"),
+        ("Import Folder", "Importovat složku"),
        ("Copy to clipboard", "Kopírovat do schránky"),
        ("Enable remote printer", "Povolit vzdálenou tiskárnu"),
        ("Downloading {}", "Stahuje se {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Zamknout zobrazení"),
        ("Sync clipboard between sessions", "Synchronizovat schránku mezi relacemi"),
        ("sync-clipboard-between-sessions-tip", "Text nebo obrázky zkopírované v jedné vzdálené relaci se odešlou i do schránky ostatních připojených relací."),
-        ("Enable WebRTC P2P connection", "Povolit připojení WebRTC P2P"),
-        ("Enable TCP hole punching", "Povolit TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Povolit"),
+        ("Reuse one connection for port forwarding", "Znovu použít jedno připojení pro přesměrování portů"),
+        ("port-forward-mux-tip", "Vede všechna připojení jednoho přesměrování portů přes jediné připojení k protějšku místo opakovaného připojování a přihlašování pro každé z nich."),
    ].iter().cloned().collect();
 }
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Sammenfletning af skærmbilleder fra flere skærme understøttes ikke i øjeblikket. Skift venligst til en enkelt skærm og prøv igen."),
        ("screenshot-action-tip", "Vælg venligst, hvordan du vil fortsætte med skærmbilledet."),
        ("Save as", "Gem som"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksportér"),
+        ("Export Logs", "Eksportér logfiler"),
+        ("Import Folder", "Importér mappe"),
        ("Copy to clipboard", "Kopiér til udklipsholder"),
        ("Enable remote printer", "Aktivér fjernprinter"),
        ("Downloading {}", "Downloader {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Lås lærred"),
        ("Sync clipboard between sessions", "Synkroniser udklipsholder mellem sessioner"),
        ("sync-clipboard-between-sessions-tip", "Tekst eller billeder, der kopieres i én fjernsession, sendes også til udklipsholderen i dine andre forbundne sessioner."),
-        ("Enable WebRTC P2P connection", "Aktivér WebRTC P2P-forbindelse"),
-        ("Enable TCP hole punching", "Aktivér TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Aktivér"),
+        ("Reuse one connection for port forwarding", "Genbrug én forbindelse til portvideresendelse"),
+        ("port-forward-mux-tip", "Fører alle forbindelser i en portvideresendelse gennem én enkelt forbindelse til modparten i stedet for at forbinde og logge ind igen for hver enkelt."),
    ].iter().cloned().collect();
 }
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Das Zusammenführen von Screenshots von mehreren Bildschirmen wird derzeit nicht unterstützt. Bitte wechseln Sie zu einem einzelnen Bildschirm und versuchen Sie es erneut."),
        ("screenshot-action-tip", "Bitte wählen Sie aus, wie Sie mit dem Screenshot fortfahren möchten."),
        ("Save as", "Speichern unter"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportieren"),
+        ("Export Logs", "Protokolle exportieren"),
+        ("Import Folder", "Ordner importieren"),
        ("Copy to clipboard", "In Zwischenablage kopieren"),
        ("Enable remote printer", "Entfernten Drucker aktivieren"),
        ("Downloading {}", "{} herunterladen"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Sichtfeld sperren"),
        ("Sync clipboard between sessions", "Zwischenablage zwischen Sitzungen synchronisieren"),
        ("sync-clipboard-between-sessions-tip", "In einer Remote-Sitzung kopierter Text oder kopierte Bilder werden auch an die Zwischenablage Ihrer anderen verbundenen Sitzungen gesendet."),
-        ("Enable WebRTC P2P connection", "WebRTC-P2P-Verbindung aktivieren"),
-        ("Enable TCP hole punching", "TCP-Hole-Punching aktivieren"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Aktivieren"),
+        ("Reuse one connection for port forwarding", "Eine Verbindung für die Portweiterleitung wiederverwenden"),
+        ("port-forward-mux-tip", "Alle Verbindungen einer Portweiterleitung über eine einzige Verbindung zur Gegenstelle führen, statt sich für jede einzelne neu zu verbinden und anzumelden."),
    ].iter().cloned().collect();
 }
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Η συγχώνευση στιγμιότυπων οθόνης από πολλές οθόνες δεν υποστηρίζεται προς το παρόν. Αλλάξτε σε μία μόνο οθόνη και δοκιμάστε ξανά."),
        ("screenshot-action-tip", "Επιλέξτε πώς θα συνεχίσετε με το στιγμιότυπο οθόνης."),
        ("Save as", "Αποθήκευση ως"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Εξαγωγή"),
+        ("Export Logs", "Εξαγωγή αρχείων καταγραφής"),
+        ("Import Folder", "Εισαγωγή φακέλου"),
        ("Copy to clipboard", "Αντιγραφή στο πρόχειρο"),
        ("Enable remote printer", "Ενεργοποίηση απομακρυσμένου εκτυπωτή"),
        ("Downloading {}", "Γίνεται Λήψη {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Κλείδωμα καμβά"),
        ("Sync clipboard between sessions", "Συγχρονισμός προχείρου μεταξύ συνεδριών"),
        ("sync-clipboard-between-sessions-tip", "Κείμενο ή εικόνες που αντιγράφονται σε μία απομακρυσμένη συνεδρία αποστέλλονται και στο πρόχειρο των άλλων συνδεδεμένων συνεδριών σας."),
-        ("Enable WebRTC P2P connection", "Ενεργοποίηση σύνδεσης WebRTC P2P"),
-        ("Enable TCP hole punching", "Ενεργοποίηση διάτρησης οπών TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Ενεργοποίηση"),
+        ("Reuse one connection for port forwarding", "Επαναχρησιμοποίηση μίας σύνδεσης για την προώθηση θυρών"),
+        ("port-forward-mux-tip", "Όλες οι συνδέσεις μιας προώθησης θυρών περνούν από μία μόνο σύνδεση προς τον απομακρυσμένο υπολογιστή, αντί να πραγματοποιείται νέα σύνδεση και ταυτοποίηση για κάθε μία."),
    ].iter().cloned().collect();
 }
--- a/src/lang/en.rs
+++ b/src/lang/en.rs
@@ -276,5 +276,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("whitelist_cidr_tip", "CIDR notation is supported, e.g. 192.168.1.0/24"),
        ("Your ip is blocked by the peer", "Your IP is blocked by the peer"),
        ("sync-clipboard-between-sessions-tip", "Text or images copied in one remote session are also sent to the clipboard of your other connected sessions."),
+        ("terminal-clipboard-write-tip", "An app in the terminal wants to copy text to this device's clipboard. If granted, this permission applies to terminal apps in all connections until you turn it off in Settings. Manual copy and paste are unaffected."),
+        ("port-forward-mux-tip", "Carry every connection of a port-forward mapping over a single connection to the peer, instead of connecting and logging in again for each one."),
    ].iter().cloned().collect();
 }
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Kunfandi ekrankopiojn de pluraj ekranoj aktuale ne estas subtenata. Bonvolu ŝanĝi al unu ekrano kaj reprovi."),
        ("screenshot-action-tip", "Bonvolu elekti kiel daŭrigi kun la ekrankopio."),
        ("Save as", "Konservi kiel"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksporti"),
+        ("Export Logs", "Eksporti protokolojn"),
+        ("Import Folder", "Importi dosierujon"),
        ("Copy to clipboard", "Kopii al la poŝo"),
        ("Enable remote printer", "Ebligi foran presilon"),
        ("Downloading {}", "Elŝutas {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Ŝlosi kanvason"),
        ("Sync clipboard between sessions", "Sinkronigi poŝon inter seancoj"),
        ("sync-clipboard-between-sessions-tip", "Teksto aŭ bildoj kopiitaj en unu fora seanco ankaŭ sendiĝas al la poŝo de viaj aliaj konektitaj seancoj."),
-        ("Enable WebRTC P2P connection", "Ebligi WebRTC P2P-konekton"),
-        ("Enable TCP hole punching", "Ebligi TCP-trapikadon"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Ebligi"),
+        ("Reuse one connection for port forwarding", "Reuzi unu konekton por pordo-plusendado"),
+        ("port-forward-mux-tip", "Ĉiuj konektoj de unu pordo-plusendado iras tra unu sola konekto al la alia komputilo, anstataŭ konekti kaj ensaluti denove por ĉiu el ili."),
    ].iter().cloned().collect();
 }
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "La fusión de capturas de pantalla de múltiples monitores no está soportada. Por favor, cambie a un monitor e inténtelo de nuevo."),
        ("screenshot-action-tip", "Por favor, seleccione cómo continuar con la captura de pantalla."),
        ("Save as", "Guardar como"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportar"),
+        ("Export Logs", "Exportar registros"),
+        ("Import Folder", "Importar carpeta"),
        ("Copy to clipboard", "Copiar al portapapeles"),
        ("Enable remote printer", "Habilitar impresora remota"),
        ("Downloading {}", "Descargando {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Bloquear lienzo"),
        ("Sync clipboard between sessions", "Sincronizar portapapeles entre sesiones"),
        ("sync-clipboard-between-sessions-tip", "El texto o las imágenes copiados en una sesión remota también se envían al portapapeles de tus otras sesiones conectadas."),
-        ("Enable WebRTC P2P connection", "Habilitar conexión WebRTC P2P"),
-        ("Enable TCP hole punching", "Habilitar perforación de agujero TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Habilitar"),
+        ("Reuse one connection for port forwarding", "Reutilizar una conexión para la redirección de puertos"),
+        ("port-forward-mux-tip", "Llevar todas las conexiones de una redirección de puertos por una única conexión con el otro equipo, en lugar de conectar e iniciar sesión de nuevo para cada una."),
    ].iter().cloned().collect();
 }
--- a/src/lang/et.rs
+++ b/src/lang/et.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Mitme kuva kuvatõmmiste ühendamine pole praegu toetatud. Palun lülitu ühele kuvale ja proovi uuesti."),
        ("screenshot-action-tip", "Palun vali, kuidas kuvatõmmisega jätkata."),
        ("Save as", "Salvesta kui"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Ekspordi"),
+        ("Export Logs", "Ekspordi logid"),
+        ("Import Folder", "Impordi kaust"),
        ("Copy to clipboard", "Kopeeri lõikelauale"),
        ("Enable remote printer", "Luba kaugprinter"),
        ("Downloading {}", "Allalaadimine: {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Lukusta lõuend"),
        ("Sync clipboard between sessions", "Sünkrooni lõikelaud seansside vahel"),
        ("sync-clipboard-between-sessions-tip", "Ühes kaugseansis kopeeritud tekst või pildid saadetakse ka teiste ühendatud seansside lõikelauale."),
-        ("Enable WebRTC P2P connection", "Luba WebRTC P2P-ühendus"),
-        ("Enable TCP hole punching", "Luba TCP-augustamine"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Luba"),
+        ("Reuse one connection for port forwarding", "Kasuta pordi suunamiseks üht ühendust"),
+        ("port-forward-mux-tip", "Juhib ühe pordisuunamise kõik ühendused ühe teise arvutiga loodud ühenduse kaudu, selle asemel et iga ühenduse jaoks uuesti ühenduda ja sisse logida."),
    ].iter().cloned().collect();
 }
--- a/src/lang/eu.rs
+++ b/src/lang/eu.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Pantaila anitzen pantaila-argazkiak bateratzea ez da onartzen une honetan. Aldatu pantaila bakarrera eta saiatu berriro."),
        ("screenshot-action-tip", "Hautatu pantaila-argazkiarekin nola jarraitu."),
        ("Save as", "Gorde honela"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Esportatu"),
+        ("Export Logs", "Esportatu erregistroak"),
+        ("Import Folder", "Inportatu karpeta"),
        ("Copy to clipboard", "Kopiatu arbelera"),
        ("Enable remote printer", "Gaitu urruneko inprimagailua"),
        ("Downloading {}", "{} deskargatzen"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Blokeatu oihala"),
        ("Sync clipboard between sessions", "Sinkronizatu arbela saioen artean"),
        ("sync-clipboard-between-sessions-tip", "Urruneko saio batean kopiatutako testua edo irudiak konektatutako beste saioen arbelera ere bidaltzen dira."),
-        ("Enable WebRTC P2P connection", "Gaitu WebRTC P2P konexioa"),
-        ("Enable TCP hole punching", "Gaitu TCP zulo-egitea"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Gaitu"),
+        ("Reuse one connection for port forwarding", "Berrerabili konexio bakarra portuen birbideratzerako"),
+        ("port-forward-mux-tip", "Portu-birbideratze baten konexio guztiak beste ordenagailurako konexio bakar batetik eramaten ditu, bakoitzerako berriro konektatu eta saioa hasi beharrean."),
    ].iter().cloned().collect();
 }
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "ادغام تصاویر از نمایشگرهای متعدد در حال حاضر پشتیبانی نمی شود. لطفاً به یک صفحه نمایش واحد تغییر دهید و دوباره امتحان کنید."),
        ("screenshot-action-tip", "لطفاً نحوه ادامه با تصویر را انتخاب کنید."),
        ("Save as", "ذخیره به عنوان"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "خروجی گرفتن"),
+        ("Export Logs", "خروجی گرفتن از گزارش‌ها"),
+        ("Import Folder", "درون‌ریزی پوشه"),
        ("Copy to clipboard", "در کلیپ بورد کپی کنید"),
        ("Enable remote printer", "چاپگر از راه دور را فعال کنید"),
        ("Downloading {}", "بارگیری {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "قفل کردن صفحه"),
        ("Sync clipboard between sessions", "همگام‌سازی کلیپ‌بورد بین نشست‌ها"),
        ("sync-clipboard-between-sessions-tip", "متن یا تصاویری که در یک نشست راه دور کپی می‌شوند به کلیپ‌بورد سایر نشست‌های متصل شما نیز ارسال می‌شوند."),
-        ("Enable WebRTC P2P connection", "فعال‌سازی اتصال همتا‌به‌همتای WebRTC"),
-        ("Enable TCP hole punching", "فعال‌سازی تکنیک TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "فعال‌سازی"),
+        ("Reuse one connection for port forwarding", "استفاده مجدد از یک اتصال برای هدایت پورت"),
+        ("port-forward-mux-tip", "همه اتصال‌های یک هدایت پورت از یک اتصال واحد به دستگاه مقابل عبور می‌کنند، به‌جای اتصال و ورود دوباره برای هر کدام."),
    ].iter().cloned().collect();
 }
--- a/src/lang/fi.rs
+++ b/src/lang/fi.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Yhdistetyn näytön kuvakaappaus ei ole tuettu"),
        ("screenshot-action-tip", "Valitse, mitä haluat tehdä kuvakaappaukselle"),
        ("Save as", "Tallenna nimellä"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Vie"),
+        ("Export Logs", "Vie lokit"),
+        ("Import Folder", "Tuo kansio"),
        ("Copy to clipboard", "Kopioi leikepöydälle"),
        ("Enable remote printer", "Ota etätulostin käyttöön"),
        ("Downloading {}", "Ladataan {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Lukitse näkymä"),
        ("Sync clipboard between sessions", "Synkronoi leikepöytä istuntojen välillä"),
        ("sync-clipboard-between-sessions-tip", "Yhdessä etäistunnossa kopioitu teksti tai kuvat lähetetään myös muiden yhdistettyjen istuntojen leikepöydälle."),
-        ("Enable WebRTC P2P connection", "Ota WebRTC P2P yhteys käyttöön"),
-        ("Enable TCP hole punching", "Ota käyttöön TCP hole punching  tekniikka"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Ota käyttöön"),
+        ("Reuse one connection for port forwarding", "Käytä yhtä yhteyttä portin edelleenohjaukseen"),
+        ("port-forward-mux-tip", "Välittää kaikki yhden portin edelleenohjauksen yhteydet yhden vastapuoleen avatun yhteyden kautta sen sijaan, että jokaista varten muodostettaisiin yhteys ja kirjauduttaisiin uudelleen."),
    ].iter().cloned().collect();
 }
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Actuellement, la prise de capture d’écran ne prend pas en charge les affichages multiples. Veuillez réessayer après avoir sélectionné un seul affichage."),
        ("screenshot-action-tip", "Veuillez choisir l’action à effectuer avec la capture d’écran."),
        ("Save as", "Enregistrer sous"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exporter"),
+        ("Export Logs", "Exporter les journaux"),
+        ("Import Folder", "Importer un dossier"),
        ("Copy to clipboard", "Copier dans le presse-papier"),
        ("Enable remote printer", "Activer l’impression à distance"),
        ("Downloading {}", "Téléchargement de {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Verrouiller la vue"),
        ("Sync clipboard between sessions", "Synchroniser le presse-papiers entre les sessions"),
        ("sync-clipboard-between-sessions-tip", "Le texte ou les images copiés dans une session distante sont également envoyés au presse-papiers de vos autres sessions connectées."),
-        ("Enable WebRTC P2P connection", "Activer la connexion P2P WebRTC"),
-        ("Enable TCP hole punching", "Activer le « hole punching » TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Activer"),
+        ("Reuse one connection for port forwarding", "Réutiliser une seule connexion pour la redirection de ports"),
+        ("port-forward-mux-tip", "Faire passer toutes les connexions d'une redirection de ports par une seule connexion vers le pair, au lieu de se connecter et de s'authentifier à nouveau pour chacune."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ge.rs
+++ b/src/lang/ge.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "რამდენიმე ეკრანის სურათის გაერთიანება ამჟამად მხარდაჭერილი არ არის. გადართეთ ერთ ეკრანზე და სცადეთ ხელახლა."),
        ("screenshot-action-tip", "აირჩიეთ, როგორ გავაგრძელოთ ეკრანის სურათთან მუშაობა."),
        ("Save as", "შენახვა როგორც"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "ექსპორტი"),
+        ("Export Logs", "ჟურნალების ექსპორტი"),
+        ("Import Folder", "საქაღალდის იმპორტი"),
        ("Copy to clipboard", "ბუფერში კოპირება"),
        ("Enable remote printer", "დისტანციური პრინტერის ჩართვა"),
        ("Downloading {}", "მიმდინარეობს {}-ის ჩამოტვირთვა"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "ტილოს დაბლოკვა"),
        ("Sync clipboard between sessions", "გაცვლის ბუფერის სინქრონიზაცია სესიებს შორის"),
        ("sync-clipboard-between-sessions-tip", "ერთ დაშორებულ სესიაში დაკოპირებული ტექსტი ან სურათები ასევე იგზავნება თქვენი სხვა დაკავშირებული სესიების გაცვლის ბუფერში."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P კავშირის ჩართვა"),
-        ("Enable TCP hole punching", "TCP hole punching-ის ჩართვა"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "ჩართვა"),
+        ("Reuse one connection for port forwarding", "პორტის გადამისამართებისთვის ერთი კავშირის ხელახლა გამოყენება"),
+        ("port-forward-mux-tip", "ერთი პორტის გადამისამართების ყველა კავშირი გადის მეორე კომპიუტერთან დამყარებული ერთი კავშირით, ნაცვლად იმისა, რომ თითოეულისთვის თავიდან დაუკავშირდეს და შევიდეს სისტემაში."),
    ].iter().cloned().collect();
 }
--- a/src/lang/gu.rs
+++ b/src/lang/gu.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "મર્જ કરેલ સ્ક્રીનશોટ સપોર્ટેડ નથી."),
        ("screenshot-action-tip", "સ્ક્રીનશોટ પછીની ક્રિયા"),
        ("Save as", "તરીકે સાચવો"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "એક્સપોર્ટ કરો"),
+        ("Export Logs", "લોગ એક્સપોર્ટ કરો"),
+        ("Import Folder", "ફોલ્ડર ઇમ્પોર્ટ કરો"),
        ("Copy to clipboard", "ક્લિપબોર્ડમાં કોપી કરો"),
        ("Enable remote printer", "રિમોટ પ્રિન્ટર સક્ષમ કરો"),
        ("Downloading {}", "{} ડાઉનલોડ થઈ રહ્યું છે"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "કેનવાસ લોક કરો"),
        ("Sync clipboard between sessions", "સત્રો વચ્ચે ક્લિપબોર્ડ સિંક કરો"),
        ("sync-clipboard-between-sessions-tip", "એક રિમોટ સત્રમાં કૉપિ કરેલ ટેક્સ્ટ કે છબીઓ તમારા અન્ય જોડાયેલા સત્રોના ક્લિપબોર્ડ પર પણ મોકલવામાં આવે છે."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P કનેક્શન સક્ષમ કરો"),
-        ("Enable TCP hole punching", "TCP હોલ પંચિંગ સક્ષમ કરો"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "સક્ષમ કરો"),
+        ("Reuse one connection for port forwarding", "પોર્ટ ફોરવર્ડિંગ માટે એક જ કનેક્શન ફરી વાપરો"),
+        ("port-forward-mux-tip", "એક પોર્ટ ફોરવર્ડિંગનાં બધાં કનેક્શન સામેના કમ્પ્યુટર સાથેના એક જ કનેક્શન મારફતે જાય છે, દરેક માટે ફરીથી કનેક્ટ અને લોગિન કરવાને બદલે."),
    ].iter().cloned().collect();
 }
--- a/src/lang/he.rs
+++ b/src/lang/he.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "צילום מסך משולב מכל המסכים אינו נתמך"),
        ("screenshot-action-tip", "בחר פעולה לאחר צילום המסך"),
        ("Save as", "שמור בשם"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "ייצוא"),
+        ("Export Logs", "ייצוא יומנים"),
+        ("Import Folder", "ייבוא תיקייה"),
        ("Copy to clipboard", "העתק ללוח"),
        ("Enable remote printer", "אפשר מדפסת מרוחקת"),
        ("Downloading {}", "מוריד את {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "נעל לוח ציור"),
        ("Sync clipboard between sessions", "סנכרן לוח בין סשנים"),
        ("sync-clipboard-between-sessions-tip", "טקסט או תמונות שהועתקו בסשן מרוחק אחד נשלחים גם ללוח של שאר הסשנים המחוברים שלך."),
-        ("Enable WebRTC P2P connection", "אפשר חיבור WebRTC P2P"),
-        ("Enable TCP hole punching", "אפשר TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "הפעל"),
+        ("Reuse one connection for port forwarding", "שימוש חוזר בחיבור אחד להעברת פורטים"),
+        ("port-forward-mux-tip", "כל החיבורים של העברת פורטים אחת עוברים דרך חיבור יחיד למחשב המרוחק, במקום ליצור חיבור חדש ולהיכנס מחדש עבור כל אחד מהם."),
    ].iter().cloned().collect();
 }
--- a/src/lang/hi.rs
+++ b/src/lang/hi.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "मर्ज की गई स्क्रीन के स्क्रीनशॉट समर्थित नहीं हैं।"),
        ("screenshot-action-tip", "स्क्रीनशॉट लेने के बाद की कार्रवाई"),
        ("Save as", "इस रूप में सहेजें"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "एक्सपोर्ट करें"),
+        ("Export Logs", "लॉग एक्सपोर्ट करें"),
+        ("Import Folder", "फ़ोल्डर इंपोर्ट करें"),
        ("Copy to clipboard", "क्लिपबोर्ड पर कॉपी करें"),
        ("Enable remote printer", "रिमोट प्रिंटर सक्षम करें"),
        ("Downloading {}", "{} डाउनलोड हो रहा है"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "कैनवास लॉक करें"),
        ("Sync clipboard between sessions", "सत्रों के बीच क्लिपबोर्ड सिंक करें"),
        ("sync-clipboard-between-sessions-tip", "एक रिमोट सत्र में कॉपी किए गए टेक्स्ट या चित्र आपके अन्य जुड़े सत्रों के क्लिपबोर्ड पर भी भेजे जाते हैं।"),
-        ("Enable WebRTC P2P connection", "WebRTC P2P कनेक्शन सक्षम करें"),
-        ("Enable TCP hole punching", "TCP होल पंचिंग सक्षम करें"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "सक्षम करें"),
+        ("Reuse one connection for port forwarding", "पोर्ट फ़ॉरवर्डिंग के लिए एक ही कनेक्शन दोबारा उपयोग करें"),
+        ("port-forward-mux-tip", "एक पोर्ट फ़ॉरवर्डिंग के सभी कनेक्शन दूसरे कंप्यूटर से बने एक ही कनेक्शन से होकर जाते हैं, हर एक के लिए दोबारा कनेक्ट और लॉगिन करने के बजाय।"),
    ].iter().cloned().collect();
 }
--- a/src/lang/hr.rs
+++ b/src/lang/hr.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Spajanje snimaka zaslona s više zaslona trenutačno nije podržano. Prebacite se na jedan zaslon i pokušajte ponovno."),
        ("screenshot-action-tip", "Odaberite kako nastaviti sa snimkom zaslona."),
        ("Save as", "Spremi kao"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Izvoz"),
+        ("Export Logs", "Izvoz zapisnika"),
+        ("Import Folder", "Uvoz mape"),
        ("Copy to clipboard", "Kopiraj u međuspremnik"),
        ("Enable remote printer", "Omogući udaljeni pisač"),
        ("Downloading {}", "Preuzimanje {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Zaključaj pozadinu"),
        ("Sync clipboard between sessions", "Sinkroniziraj međuspremnik između sesija"),
        ("sync-clipboard-between-sessions-tip", "Tekst ili slike kopirani u jednoj udaljenoj sesiji šalju se i u međuspremnik vaših ostalih povezanih sesija."),
-        ("Enable WebRTC P2P connection", "Omogući WebRTC P2P vezu"),
-        ("Enable TCP hole punching", "Omogući TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Omogući"),
+        ("Reuse one connection for port forwarding", "Ponovno koristi jednu vezu za prosljeđivanje portova"),
+        ("port-forward-mux-tip", "Sve veze jednog prosljeđivanja portova idu kroz jednu vezu prema drugoj strani, umjesto ponovnog povezivanja i prijave za svaku od njih."),
    ].iter().cloned().collect();
 }
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Egyesített képernyőről nem támogatott a képernyőkép készítése"),
        ("screenshot-action-tip", "Képernyőkép-művelet"),
        ("Save as", "Mentés másként"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportálás"),
+        ("Export Logs", "Naplók exportálása"),
+        ("Import Folder", "Mappa importálása"),
        ("Copy to clipboard", "Másolás a vágólapra"),
        ("Enable remote printer", "Távoli nyomtatók engedélyezése"),
        ("Downloading {}", "{} letöltése"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Nézet zárolása"),
        ("Sync clipboard between sessions", "Vágólap szinkronizálása a munkamenetek között"),
        ("sync-clipboard-between-sessions-tip", "Az egyik távoli munkamenetben másolt szöveg vagy kép a többi csatlakoztatott munkamenet vágólapjára is elküldésre kerül."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P kapcsolat engedélyezése"),
-        ("Enable TCP hole punching", "TCP résszűrés engedélyezése"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Engedélyezés"),
+        ("Reuse one connection for port forwarding", "Egyetlen kapcsolat újrafelhasználása a portátirányításhoz"),
+        ("port-forward-mux-tip", "Egy portátirányítás összes kapcsolatát egyetlen, a másik géppel létesített kapcsolaton vezeti át, ahelyett hogy mindegyikhez újra csatlakozna és bejelentkezne."),
    ].iter().cloned().collect();
 }
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Menggabungkan tangkapan layar dari beberapa tampilan saat ini tidak didukung. Silakan beralih ke satu tampilan dan coba lagi."),
        ("screenshot-action-tip", "Silakan pilih cara melanjutkan dengan tangkapan layar."),
        ("Save as", "Simpan sebagai"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Ekspor"),
+        ("Export Logs", "Ekspor Log"),
+        ("Import Folder", "Impor Folder"),
        ("Copy to clipboard", "Salin ke papan klip"),
        ("Enable remote printer", "Aktifkan printer jarak jauh"),
        ("Downloading {}", "Mendownload {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Kunci kanvas"),
        ("Sync clipboard between sessions", "Sinkronkan papan klip antar sesi"),
        ("sync-clipboard-between-sessions-tip", "Teks atau gambar yang disalin di satu sesi jarak jauh juga dikirim ke papan klip sesi terhubung Anda yang lain."),
-        ("Enable WebRTC P2P connection", "Aktifkan koneksi P2P WebRTC"),
-        ("Enable TCP hole punching", "Aktifkan TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Aktifkan"),
+        ("Reuse one connection for port forwarding", "Gunakan ulang satu koneksi untuk penerusan port"),
+        ("port-forward-mux-tip", "Menyalurkan semua koneksi dari satu penerusan port melalui satu koneksi ke perangkat lain, alih-alih menyambung dan masuk lagi untuk setiap koneksi."),
    ].iter().cloned().collect();
 }
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "L'unione della cattura di schermate di più display non è attualmente supportata.\nPassa ad un singolo display e riprova."),
        ("screenshot-action-tip", "Seleziona come continuare con la schermata."),
        ("Save as", "Salva come"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Esporta"),
+        ("Export Logs", "Esporta i log"),
+        ("Import Folder", "Importa cartella"),
        ("Copy to clipboard", "Copia negli appunti"),
        ("Enable remote printer", "Abilita stampante remota"),
        ("Downloading {}", "Download {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Blocca tela"),
        ("Sync clipboard between sessions", "Sincronizza gli appunti tra le sessioni"),
        ("sync-clipboard-between-sessions-tip", "Il testo o le immagini copiati in una sessione remota vengono inviati anche agli appunti delle altre sessioni connesse."),
-        ("Enable WebRTC P2P connection", "Abilita connessione P2P WebRTC"),
-        ("Enable TCP hole punching", "Abilita  hole punching TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Abilita"),
+        ("Reuse one connection for port forwarding", "Riutilizza una sola connessione per l'inoltro delle porte"),
+        ("port-forward-mux-tip", "Fa passare tutte le connessioni di un inoltro di porte su un'unica connessione verso il dispositivo remoto, invece di connettersi e autenticarsi di nuovo per ognuna."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "複数のディスプレイのスクリーンショットの結合は、現在非対応です。単一のディスプレイに切り替えてもう一度お試しください。"),
        ("screenshot-action-tip", "スクリーンショットを続行する方法を選択してください。"),
        ("Save as", "保存先"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "エクスポート"),
+        ("Export Logs", "ログをエクスポート"),
+        ("Import Folder", "フォルダをインポート"),
        ("Copy to clipboard", "クリップボードにコピー"),
        ("Enable remote printer", "リモートプリンターを有効化する"),
        ("Downloading {}", "{} をダウンロード中"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "キャンバスをロック"),
        ("Sync clipboard between sessions", "セッション間でクリップボードを同期"),
        ("sync-clipboard-between-sessions-tip", "1つのリモートセッションでコピーしたテキストや画像は、接続中の他のセッションのクリップボードにも送信されます。"),
-        ("Enable WebRTC P2P connection", "WebRTC P2P 接続を有効化する"),
-        ("Enable TCP hole punching", "TCP ホールパンチを有効化する"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "有効にする"),
+        ("Reuse one connection for port forwarding", "ポート転送で 1 つの接続を再利用する"),
+        ("port-forward-mux-tip", "1 つのポート転送のすべての接続を、相手への 1 本の接続にまとめます。接続ごとに接続とログインをやり直しません。"),
    ].iter().cloned().collect();
 }
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -378,7 +378,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Screen Share", "화면 공유"),
        ("ubuntu-21-04-required", "Wayland는 Ubuntu 21.04 이상 버전이 필요합니다."),
        ("wayland-requires-higher-linux-version", "Wayland는 상위 버전의 Linux 배포판이 필요합니다. X11 데스크탑을 사용하거나 OS를 변경하세요."),
-        ("xdp-portal-unavailable", ""),
+        ("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 표시"),
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "현재 다중 디스플레이의 스크린샷 병합이 지원되지 않습니다. 단일 디스플레이로 전환한 후 다시 시도해 주세요."),
        ("screenshot-action-tip", "스크린샷을 계속 진행할 방법을 선택해 주세요."),
        ("Save as", "다른 이름으로 저장"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "내보내기"),
+        ("Export Logs", "로그 내보내기"),
+        ("Import Folder", "폴더 가져오기"),
        ("Copy to clipboard", "클립보드에 복사"),
        ("Enable remote printer", "원격 프린터 허용"),
        ("Downloading {}", "{} 다운로드 중"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "캔버스 잠금"),
        ("Sync clipboard between sessions", "세션 간 클립보드 동기화"),
        ("sync-clipboard-between-sessions-tip", "하나의 원격 세션에서 복사한 텍스트나 이미지는 연결된 다른 세션의 클립보드에도 전송됩니다."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P 연결 사용"),
-        ("Enable TCP hole punching", "TCP 홀 펀칭 사용"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "활성화"),
+        ("Reuse one connection for port forwarding", "포트 포워딩에 연결 하나를 재사용"),
+        ("port-forward-mux-tip", "포트 포워딩 하나의 모든 연결을 상대방과의 단일 연결로 전달합니다. 연결마다 다시 접속하고 로그인하지 않습니다."),
    ].iter().cloned().collect();
 }
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Бірнеше дисплейдің скриншоттарын біріктіруге қазір қолдау көрсетілмейді. Жеке дисплейге ауысып, қайталап көруді өтінеміз."),
        ("screenshot-action-tip", "Скриншотпен қалай жалғастыру керектігін таңдауды өтінеміз."),
        ("Save as", "Басқаша сақтау"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Экспорттау"),
+        ("Export Logs", "Журналдарды экспорттау"),
+        ("Import Folder", "Қалтаны импорттау"),
        ("Copy to clipboard", "Көшіру-тақтаға көшіру"),
        ("Enable remote printer", "Қашықтағы принтерді іске қосу"),
        ("Downloading {}", "{} жүктелуде"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Кенепті құлыптау"),
        ("Sync clipboard between sessions", "Сеанстар арасында көшіру-тақтасын синхрондау"),
        ("sync-clipboard-between-sessions-tip", "Бір қашықтағы сеанста көшірілген мәтін немесе суреттер басқа қосылған сеанстардың көшіру-тақтасына да жіберіледі."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P қосылымын іске қосу"),
-        ("Enable TCP hole punching", "TCP hole punching'ті іске қосу"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Қосу"),
+        ("Reuse one connection for port forwarding", "Порт бағыттау үшін бір қосылымды қайта пайдалану"),
+        ("port-forward-mux-tip", "Бір порт бағыттаудың барлық қосылымдары әрқайсысы үшін қайта қосылып кірудің орнына қарсы құрылғымен орнатылған бір қосылым арқылы өтеді."),
    ].iter().cloned().collect();
 }
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Kelių ekranų nuotraukų sujungimas šiuo metu nepalaikomas. Perjunkite į vieną ekraną ir bandykite dar kartą."),
        ("screenshot-action-tip", "Pasirinkite, ką daryti su ekrano nuotrauka."),
        ("Save as", "Įrašyti kaip"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksportuoti"),
+        ("Export Logs", "Eksportuoti žurnalus"),
+        ("Import Folder", "Importuoti aplanką"),
        ("Copy to clipboard", "Kopijuoti į iškarpinę"),
        ("Enable remote printer", "Įgalinti nuotolinį spausdintuvą"),
        ("Downloading {}", "Atsisiunčiama {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Užrakinti drobę"),
        ("Sync clipboard between sessions", "Sinchronizuoti iškarpinę tarp seansų"),
        ("sync-clipboard-between-sessions-tip", "Viename nuotoliniame seanse nukopijuotas tekstas ar vaizdai taip pat siunčiami į kitų prijungtų seansų iškarpinę."),
-        ("Enable WebRTC P2P connection", "Įgalinti WebRTC P2P ryšį"),
-        ("Enable TCP hole punching", "Įgalinti TCP gręžimą (hole punching)"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Įgalinti"),
+        ("Reuse one connection for port forwarding", "Prievadų peradresavimui naudoti vieną ryšį"),
+        ("port-forward-mux-tip", "Visi vieno prievadų peradresavimo ryšiai eina per vieną ryšį su kitu kompiuteriu, užuot kiekvienam iš jų jungiantis ir prisijungiant iš naujo."),
    ].iter().cloned().collect();
 }
--- a/src/lang/lv.rs
+++ b/src/lang/lv.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Vairāku displeju ekrānuzņēmumu apvienošana pašlaik netiek atbalstīta. Lūdzu, pārslēdzieties uz vienu displeju un mēģiniet vēlreiz."),
        ("screenshot-action-tip", "Lūdzu, atlasiet, kā turpināt darbu ar ekrānuzņēmumu."),
        ("Save as", "Saglabāt kā"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksportēt"),
+        ("Export Logs", "Eksportēt žurnālus"),
+        ("Import Folder", "Importēt mapi"),
        ("Copy to clipboard", "Kopēt starpliktuvē"),
        ("Enable remote printer", "Iespējot attālo printeri"),
        ("Downloading {}", "Notiek {} lejupielāde"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Bloķēt audeklu"),
        ("Sync clipboard between sessions", "Sinhronizēt starpliktuvi starp sesijām"),
        ("sync-clipboard-between-sessions-tip", "Vienā attālajā sesijā nokopētais teksts vai attēli tiek nosūtīti arī uz pārējo pievienoto sesiju starpliktuvi."),
-        ("Enable WebRTC P2P connection", "Iespējot WebRTC P2P savienojumu"),
-        ("Enable TCP hole punching", "Iespējot TCP caurumu veidošanu"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Iespējot"),
+        ("Reuse one connection for port forwarding", "Atkārtoti izmantot vienu savienojumu portu pārsūtīšanai"),
+        ("port-forward-mux-tip", "Visi viena portu pārsūtījuma savienojumi tiek novadīti pa vienu savienojumu ar otru datoru, nevis katram no tiem izveidojot jaunu savienojumu un pieteikšanos."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ml.rs
+++ b/src/lang/ml.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "മെർജ് ചെയ്ത സ്ക്രീൻഷോട്ട് പിന്തുണയ്ക്കുന്നില്ല."),
        ("screenshot-action-tip", "സ്ക്രീൻഷോട്ടിന് ശേഷമുള്ള നടപടി"),
        ("Save as", "പേരിൽ സേവ് ചെയ്യുക"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "എക്‌സ്‌പോർട്ട് ചെയ്യുക"),
+        ("Export Logs", "ലോഗുകൾ എക്‌സ്‌പോർട്ട് ചെയ്യുക"),
+        ("Import Folder", "ഫോൾഡർ ഇംപോർട്ട് ചെയ്യുക"),
        ("Copy to clipboard", "ക്ലിപ്പ്ബോർഡിലേക്ക് കോപ്പി ചെയ്യുക"),
        ("Enable remote printer", "റിമോട്ട് പ്രിന്റർ അനുവദിക്കുക"),
        ("Downloading {}", "{} ഡൗൺലോഡ് ചെയ്യുന്നു"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "ക്യാൻവാസ് ലോക്ക് ചെയ്യുക"),
        ("Sync clipboard between sessions", "സെഷനുകൾക്കിടയിൽ ക്ലിപ്പ്ബോർഡ് സമന്വയിപ്പിക്കുക"),
        ("sync-clipboard-between-sessions-tip", "ഒരു റിമോട്ട് സെഷനിൽ പകർത്തിയ ടെക്സ്റ്റോ ചിത്രങ്ങളോ നിങ്ങളുടെ മറ്റ് കണക്റ്റുചെയ്ത സെഷനുകളുടെ ക്ലിപ്പ്ബോർഡിലേക്കും അയയ്ക്കപ്പെടും."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P കണക്ഷൻ അനുവദിക്കുക"),
-        ("Enable TCP hole punching", "TCP ഹോൾ പഞ്ചിംഗ് അനുവദിക്കുക"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "അനുവദിക്കുക"),
+        ("Reuse one connection for port forwarding", "പോർട്ട് ഫോർവേഡിംഗിന് ഒരേ കണക്ഷൻ വീണ്ടും ഉപയോഗിക്കുക"),
+        ("port-forward-mux-tip", "ഒരു പോർട്ട് ഫോർവേഡിംഗിന്റെ എല്ലാ കണക്ഷനുകളും മറ്റേ കമ്പ്യൂട്ടറിലേക്കുള്ള ഒരൊറ്റ കണക്ഷനിലൂടെ കടന്നുപോകുന്നു, ഓരോന്നിനും വീണ്ടും കണക്റ്റ് ചെയ്ത് ലോഗിൻ ചെയ്യുന്നതിനു പകരം."),
    ].iter().cloned().collect();
 }
--- a/src/lang/nb.rs
+++ b/src/lang/nb.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Sammenslåing av skjermbilder fra flere skjermer støttes for øyeblikket ikke. Bytt til én enkelt skjerm og prøv igjen."),
        ("screenshot-action-tip", "Velg hvordan du vil fortsette med skjermbildet."),
        ("Save as", "Lagre som"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksporter"),
+        ("Export Logs", "Eksporter logger"),
+        ("Import Folder", "Importer mappe"),
        ("Copy to clipboard", "Kopier til utklipstavlen"),
        ("Enable remote printer", "Aktiver fjernskriver"),
        ("Downloading {}", "Laster ned {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Lås lerret"),
        ("Sync clipboard between sessions", "Synkroniser utklippstavlen mellom økter"),
        ("sync-clipboard-between-sessions-tip", "Tekst eller bilder som kopieres i én ekstern økt, sendes også til utklippstavlen i de andre tilkoblede øktene dine."),
-        ("Enable WebRTC P2P connection", "Aktiver WebRTC P2P-tilkobling"),
-        ("Enable TCP hole punching", "Aktiver TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Aktiver"),
+        ("Reuse one connection for port forwarding", "Gjenbruk én tilkobling for portvideresending"),
+        ("port-forward-mux-tip", "Fører alle tilkoblinger i en portvideresending gjennom én enkelt tilkobling til motparten i stedet for å koble til og logge inn på nytt for hver enkelt."),
    ].iter().cloned().collect();
 }
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Schermopnames van meerdere schermen samenvoegen wordt momenteel niet ondersteund. Schakel over naar een enkel scherm en herhaal de actie."),
        ("screenshot-action-tip", "Kies wat je met de gemaakte schermopname wilt doen."),
        ("Save as", "Opslaan als"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exporteren"),
+        ("Export Logs", "Logboeken exporteren"),
+        ("Import Folder", "Map importeren"),
        ("Copy to clipboard", "Kopiëren naar het klembord"),
        ("Enable remote printer", "Printer op afstand inschakelen"),
        ("Downloading {}", "Downloaden {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Canvas vergrendelen"),
        ("Sync clipboard between sessions", "Klembord synchroniseren tussen sessies"),
        ("sync-clipboard-between-sessions-tip", "Tekst of afbeeldingen die in één externe sessie worden gekopieerd, worden ook naar het klembord van uw andere verbonden sessies gestuurd."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P-verbinding inschakelen"),
-        ("Enable TCP hole punching", "TCP-hole punching inschakelen"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Inschakelen"),
+        ("Reuse one connection for port forwarding", "Eén verbinding hergebruiken voor poortdoorschakeling"),
+        ("port-forward-mux-tip", "Alle verbindingen van een poortdoorschakeling via één enkele verbinding met de andere computer laten lopen, in plaats van voor elke verbinding opnieuw verbinding te maken en in te loggen."),
    ].iter().cloned().collect();
 }
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Łączenie zrzutów ekranu z wielu wyświetlaczy nie jest obecnie obsługiwane. Przełącz się na pojedynczy wyświetlacz i spróbuj ponownie."),
        ("screenshot-action-tip", "Wybierz sposób kontynuacji zrzutu ekranu."),
        ("Save as", "Zapisz jako"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksportuj"),
+        ("Export Logs", "Eksportuj dzienniki"),
+        ("Import Folder", "Importuj folder"),
        ("Copy to clipboard", "Kopiuj do schowka"),
        ("Enable remote printer", "Włącz zdalne drukowanie"),
        ("Downloading {}", "Pobieranie {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Zablokuj ekran"),
        ("Sync clipboard between sessions", "Synchronizuj schowek między sesjami"),
        ("sync-clipboard-between-sessions-tip", "Tekst lub obrazy skopiowane w jednej sesji zdalnej są wysyłane także do schowka pozostałych połączonych sesji."),
-        ("Enable WebRTC P2P connection", "Włącz połączenie P2P WebRTC"),
-        ("Enable TCP hole punching", "Włącz tworzenie tunelu TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Włącz"),
+        ("Reuse one connection for port forwarding", "Użyj ponownie jednego połączenia do przekierowania portów"),
+        ("port-forward-mux-tip", "Przekazuj wszystkie połączenia jednego przekierowania portów przez jedno połączenie ze zdalnym komputerem, zamiast łączyć się i logować od nowa dla każdego z nich."),
    ].iter().cloned().collect();
 }
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "A junção de capturas de ecrã de vários ecrãs não é atualmente suportada. Mude para um único ecrã e tente novamente."),
        ("screenshot-action-tip", "Selecione como pretende continuar com a captura de ecrã."),
        ("Save as", "Guardar como"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportar"),
+        ("Export Logs", "Exportar Registos"),
+        ("Import Folder", "Importar Pasta"),
        ("Copy to clipboard", "Copiar para a área de transferência"),
        ("Enable remote printer", "Ativar impressora remota"),
        ("Downloading {}", "A transferir {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Bloquear tela"),
        ("Sync clipboard between sessions", "Sincronizar área de transferência entre sessões"),
        ("sync-clipboard-between-sessions-tip", "O texto ou as imagens copiados numa sessão remota também são enviados para a área de transferência das suas outras sessões ligadas."),
-        ("Enable WebRTC P2P connection", "Ativar ligação P2P por WebRTC"),
-        ("Enable TCP hole punching", "Ativar TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Ativar"),
+        ("Reuse one connection for port forwarding", "Reutilizar uma ligação para o reencaminhamento de portas"),
+        ("port-forward-mux-tip", "Encaminhar todas as ligações de um reencaminhamento de portas por uma única ligação ao outro computador, em vez de ligar e iniciar sessão novamente para cada uma."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("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-action-tip", "Por favor, selecione como deseja continuar com a captura de tela."),
        ("Save as", "Salvar como"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportar"),
+        ("Export Logs", "Exportar logs"),
+        ("Import Folder", "Importar pasta"),
        ("Copy to clipboard", "Copiar para área de transferência"),
        ("Enable remote printer", "Habilitar impressora remota"),
        ("Downloading {}", "Baixando {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Bloquear tela"),
        ("Sync clipboard between sessions", "Sincronizar área de transferência entre sessões"),
        ("sync-clipboard-between-sessions-tip", "Texto ou imagens copiados em uma sessão remota também são enviados para a área de transferência das suas outras sessões conectadas."),
-        ("Enable WebRTC P2P connection", "Habilitar conexão WebRTC P2P"),
-        ("Enable TCP hole punching", "Habilitar TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Habilitar"),
+        ("Reuse one connection for port forwarding", "Reutilizar uma conexão para encaminhamento de portas"),
+        ("port-forward-mux-tip", "Levar todas as conexões de um encaminhamento de portas por uma única conexão com o outro computador, em vez de conectar e fazer login novamente para cada uma."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Captura de ecran a ecranului combinat nu este suportată în prezent."),
        ("screenshot-action-tip", "Selectează acțiunea pentru captura de ecran: salvează ca fișier sau copiază în clipboard."),
        ("Save as", "Salvează ca"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportă"),
+        ("Export Logs", "Exportă jurnalele"),
+        ("Import Folder", "Importă folder"),
        ("Copy to clipboard", "Copiază în clipboard"),
        ("Enable remote printer", "Activează imprimanta la distanță"),
        ("Downloading {}", "Se descarcă {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Blochează ecranul"),
        ("Sync clipboard between sessions", "Sincronizează clipboardul între sesiuni"),
        ("sync-clipboard-between-sessions-tip", "Textul sau imaginile copiate într-o sesiune la distanță sunt trimise și în clipboardul celorlalte sesiuni conectate."),
-        ("Enable WebRTC P2P connection", "Activează conexiunea P2P prin WebRTC"),
-        ("Enable TCP hole punching", "Activează traversarea TCP (hole punching)"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Activează"),
+        ("Reuse one connection for port forwarding", "Reutilizează o singură conexiune pentru redirecționarea porturilor"),
+        ("port-forward-mux-tip", "Trece toate conexiunile unei redirecționări de porturi printr-o singură conexiune către celălalt calculator, în loc să se conecteze și să se autentifice din nou pentru fiecare."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Объединение снимков экранов с нескольких дисплеев в настоящее время не поддерживается. Переключитесь на один дисплей и повторите действие."),
        ("screenshot-action-tip", "Выберите, что делать с полученным снимком экрана."),
        ("Save as", "Сохранить в файл"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Экспортировать"),
+        ("Export Logs", "Экспортировать журналы"),
+        ("Import Folder", "Импортировать папку"),
        ("Copy to clipboard", "Копировать в буфер обмена"),
        ("Enable remote printer", "Использовать удалённый принтер"),
        ("Downloading {}", "Скачивание"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Заблокировать холст"),
        ("Sync clipboard between sessions", "Синхронизировать буфер обмена между сеансами"),
        ("sync-clipboard-between-sessions-tip", "Текст или изображения, скопированные в одном удалённом сеансе, также отправляются в буфер обмена других подключённых сеансов."),
-        ("Enable WebRTC P2P connection", "Использовать подключение WebRTC P2P"),
-        ("Enable TCP hole punching", "Использовать TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Включить"),
+        ("Reuse one connection for port forwarding", "Использовать одно подключение для перенаправления портов"),
+        ("port-forward-mux-tip", "Передавать все соединения одного перенаправления портов через одно подключение к удалённому устройству вместо повторного подключения и входа для каждого из них."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sc.rs
+++ b/src/lang/sc.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "S'unione de sa catura de ischermadas de prus ischermos como no est suportada.\nCola a un'ischermu ebbia e torra a proare."),
        ("screenshot-action-tip", "Seletziona comente sighire cun s'ischermada."),
        ("Save as", "Sarva comente"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Esporta"),
+        ("Export Logs", "Esporta is registros"),
+        ("Import Folder", "Importa cartella"),
        ("Copy to clipboard", "Còpia in punta de billete"),
        ("Enable remote printer", "Abìlita imprentadora remota"),
        ("Downloading {}", "Iscarrighende {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Bloca sa tela"),
        ("Sync clipboard between sessions", "Sincroniza sa punta de billete intre is sessiones"),
        ("sync-clipboard-between-sessions-tip", "Su testu o is immàgines copiadas in una sessione remota sunt imbiadas fintzas a sa punta de billete de is àteras sessiones connètidas."),
-        ("Enable WebRTC P2P connection", "Abìlita connessione P2P WebRTC"),
-        ("Enable TCP hole punching", "Abìlita s'istampadura TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Abìlita"),
+        ("Reuse one connection for port forwarding", "Torra a impreare una connessione pro s'imbiu de is portas"),
+        ("port-forward-mux-tip", "Totu is connessiones de un'imbiu de portas passant in una connessione ebbia a s'àteru computadore, in logu de si connètere e intrare torra pro dontzi una."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Zlučovanie snímok obrazovky z viacerých displejov nie je momentálne podporované. Prepnite na jeden displej a skúste to znova."),
        ("screenshot-action-tip", "Vyberte, ako pokračovať so snímkou obrazovky."),
        ("Save as", "Uložiť ako"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportovať"),
+        ("Export Logs", "Exportovať protokoly"),
+        ("Import Folder", "Importovať priečinok"),
        ("Copy to clipboard", "Kopírovať do schránky"),
        ("Enable remote printer", "Povoliť vzdialenú tlačiareň"),
        ("Downloading {}", "Sťahuje sa {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Uzamknúť zobrazenie"),
        ("Sync clipboard between sessions", "Synchronizovať schránku medzi reláciami"),
        ("sync-clipboard-between-sessions-tip", "Text alebo obrázky skopírované v jednej vzdialenej relácii sa odošlú aj do schránky ostatných pripojených relácií."),
-        ("Enable WebRTC P2P connection", "Povoliť pripojenie WebRTC P2P"),
-        ("Enable TCP hole punching", "Povoliť TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Povoliť"),
+        ("Reuse one connection for port forwarding", "Znovu použiť jedno pripojenie na presmerovanie portov"),
+        ("port-forward-mux-tip", "Vedie všetky pripojenia jedného presmerovania portov cez jediné pripojenie k druhej strane namiesto opakovaného pripájania a prihlasovania pre každé z nich."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Združevanje posnetkov zaslona z več zaslonov trenutno ni podprto. Preklopite na en zaslon in poskusite znova."),
        ("screenshot-action-tip", "Izberite, kako nadaljevati s posnetkom zaslona."),
        ("Save as", "Shrani kot"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Izvozi"),
+        ("Export Logs", "Izvozi dnevnike"),
+        ("Import Folder", "Uvozi mapo"),
        ("Copy to clipboard", "Kopiraj v odložišče"),
        ("Enable remote printer", "Omogoči oddaljeni tiskalnik"),
        ("Downloading {}", "Prenašanje {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Zakleni platno"),
        ("Sync clipboard between sessions", "Sinhroniziraj odložišče med sejami"),
        ("sync-clipboard-between-sessions-tip", "Besedilo ali slike, kopirane v eni oddaljeni seji, se pošljejo tudi v odložišče vaših drugih povezanih sej."),
-        ("Enable WebRTC P2P connection", "Omogoči povezavo WebRTC P2P"),
-        ("Enable TCP hole punching", "Omogoči preboj lukenj TCP"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Omogoči"),
+        ("Reuse one connection for port forwarding", "Ponovno uporabi eno povezavo za posredovanje vrat"),
+        ("port-forward-mux-tip", "Vse povezave enega posredovanja vrat potekajo prek ene same povezave do druge strani, namesto ponovnega povezovanja in prijave za vsako od njih."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Bashkimi i pamjeve të ekranit nga disa ekrane aktualisht nuk mbështetet. Ju lutemi kaloni te një ekran i vetëm dhe provoni përsëri."),
        ("screenshot-action-tip", "Ju lutemi zgjidhni si të vazhdoni me pamjen e ekranit."),
        ("Save as", "Ruaj si"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Eksporto"),
+        ("Export Logs", "Eksporto regjistrat"),
+        ("Import Folder", "Importo dosjen"),
        ("Copy to clipboard", "Kopjo te clipboard"),
        ("Enable remote printer", "Aktivizo printerin në distancë"),
        ("Downloading {}", "Duke shkarkuar {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Kyç canvas"),
        ("Sync clipboard between sessions", "Sinkronizo clipboard-in midis sesioneve"),
        ("sync-clipboard-between-sessions-tip", "Teksti ose imazhet e kopjuara në një sesion të largët dërgohen edhe në clipboard-in e sesioneve të tjera të lidhura."),
-        ("Enable WebRTC P2P connection", "Aktivizo lidhjen WebRTC P2P"),
-        ("Enable TCP hole punching", "Aktivizo TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Aktivizo"),
+        ("Reuse one connection for port forwarding", "Ripërdor një lidhje për përcjelljen e porteve"),
+        ("port-forward-mux-tip", "Të gjitha lidhjet e një përcjelljeje portesh kalojnë përmes një lidhjeje të vetme me kompjuterin tjetër, në vend që të lidhet dhe të hyjë sërish për secilën prej tyre."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Spajanje snimaka ekrana sa više prikaza trenutno nije podržano. Molimo prebacite na jedan prikaz i pokušajte ponovo."),
        ("screenshot-action-tip", "Molimo izaberite kako da nastavite sa snimkom ekrana."),
        ("Save as", "Sačuvaj kao"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Izvoz"),
+        ("Export Logs", "Izvoz dnevnika"),
+        ("Import Folder", "Uvoz fascikle"),
        ("Copy to clipboard", "Kopiraj u clipboard"),
        ("Enable remote printer", "Omogući udaljeni štampač"),
        ("Downloading {}", "Preuzimanje {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Zaključaj pozadinu"),
        ("Sync clipboard between sessions", "Sinhronizuj klipbord između sesija"),
        ("sync-clipboard-between-sessions-tip", "Tekst ili slike kopirane u jednoj udaljenoj sesiji šalju se i u klipbord vaših ostalih povezanih sesija."),
-        ("Enable WebRTC P2P connection", "Omogući WebRTC P2P konekciju"),
-        ("Enable TCP hole punching", "Omogući TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Omogući"),
+        ("Reuse one connection for port forwarding", "Ponovo koristi jednu vezu za prosleđivanje portova"),
+        ("port-forward-mux-tip", "Sve veze jednog prosleđivanja portova idu kroz jednu vezu ka drugoj strani, umesto povezivanja i prijavljivanja iznova za svaku od njih."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Sammanslagning av skärmdumpar från flera skärmar stöds för närvarande inte. Byt till en enda skärm och försök igen."),
        ("screenshot-action-tip", "Välj hur du vill fortsätta med skärmdumpen."),
        ("Save as", "Spara som"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Exportera"),
+        ("Export Logs", "Exportera loggar"),
+        ("Import Folder", "Importera mapp"),
        ("Copy to clipboard", "Kppiera till urklipp"),
        ("Enable remote printer", "Aktivera fjärrskrivare"),
        ("Downloading {}", "Laddar ner {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Lås canvas"),
        ("Sync clipboard between sessions", "Synkronisera urklipp mellan sessioner"),
        ("sync-clipboard-between-sessions-tip", "Text eller bilder som kopieras i en fjärrsession skickas även till urklipp i dina andra anslutna sessioner."),
-        ("Enable WebRTC P2P connection", "Aktivera WebRTC P2P anslutning"),
-        ("Enable TCP hole punching", "Aktivera TCP hålslagning"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Aktivera"),
+        ("Reuse one connection for port forwarding", "Återanvänd en anslutning för portvidarebefordran"),
+        ("port-forward-mux-tip", "Låt alla anslutningar i en portvidarebefordran gå via en enda anslutning till motparten, i stället för att ansluta och logga in på nytt för varje anslutning."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ta.rs
+++ b/src/lang/ta.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "ஸ்கிரீன்ஷாட்_இணைக்கப்பட்ட_திரை_ஆதரவற்ற_குறிப்பு"),
        ("screenshot-action-tip", "ஸ்கிரீன்ஷாட்_செயல்_குறிப்பு"),
        ("Save as", "இப்படி சேமி"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "ஏற்றுமதி"),
+        ("Export Logs", "பதிவுகளை ஏற்றுமதி செய்"),
+        ("Import Folder", "கோப்புறையை இறக்குமதி செய்"),
        ("Copy to clipboard", "கிளிப்போர்டில் நகல்"),
        ("Enable remote printer", "தொலை அச்சுப்பொறி இயக்கு"),
        ("Downloading {}", "{} பதிவிறக்குகிறது"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "கேன்வாஸைப் பூட்டு"),
        ("Sync clipboard between sessions", "அமர்வுகளுக்கு இடையே கிளிப்போர்டை ஒத்திசைக்கவும்"),
        ("sync-clipboard-between-sessions-tip", "ஒரு தொலை அமர்வில் நகலெடுக்கப்பட்ட உரை அல்லது படங்கள் உங்கள் பிற இணைக்கப்பட்ட அமர்வுகளின் கிளிப்போர்டுக்கும் அனுப்பப்படும்."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P இணைப்பு இயக்கு"),
-        ("Enable TCP hole punching", "TCP hole punching இயக்கு"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "இயக்கு"),
+        ("Reuse one connection for port forwarding", "போர்ட் ஃபார்வேர்டிங்கிற்கு ஒரே இணைப்பை மீண்டும் பயன்படுத்து"),
+        ("port-forward-mux-tip", "ஒரு போர்ட் ஃபார்வேர்டிங்கின் அனைத்து இணைப்புகளும் மறுமுனைக்கான ஒரே இணைப்பின் வழியாகச் செல்லும், ஒவ்வொன்றுக்கும் மீண்டும் இணைந்து உள்நுழைவதற்குப் பதிலாக."),
    ].iter().cloned().collect();
 }
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", ""),
        ("Sync clipboard between sessions", ""),
        ("sync-clipboard-between-sessions-tip", ""),
-        ("Enable WebRTC P2P connection", ""),
-        ("Enable TCP hole punching", ""),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", ""),
+        ("Reuse one connection for port forwarding", ""),
+        ("port-forward-mux-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "ขณะนี้ยังไม่รองรับการรวมภาพหน้าจอจากหลายจอแสดงผล กรุณาสลับไปใช้จอแสดงผลเดียวแล้วลองใหม่"),
        ("screenshot-action-tip", "กรุณาเลือกวิธีดำเนินการต่อกับภาพหน้าจอ"),
        ("Save as", "บันทึกเป็น"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "ส่งออก"),
+        ("Export Logs", "ส่งออกบันทึกการทำงาน"),
+        ("Import Folder", "นำเข้าโฟลเดอร์"),
        ("Copy to clipboard", "คัดลอกไปยังคลิปบอร์ด"),
        ("Enable remote printer", "เปิดใช้งานเครื่องพิมพ์ระยะไกล"),
        ("Downloading {}", "กำลังดาวน์โหลด {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "ล็อคแคนวาส"),
        ("Sync clipboard between sessions", "ซิงค์คลิปบอร์ดระหว่างเซสชัน"),
        ("sync-clipboard-between-sessions-tip", "ข้อความหรือรูปภาพที่คัดลอกในเซสชันระยะไกลหนึ่งจะถูกส่งไปยังคลิปบอร์ดของเซสชันอื่นที่เชื่อมต่ออยู่ด้วย"),
-        ("Enable WebRTC P2P connection", "เปิดใช้งานการเชื่อมต่อ P2P แบบ WebRTC"),
-        ("Enable TCP hole punching", "เปิดใช้งาน TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "เปิดใช้งาน"),
+        ("Reuse one connection for port forwarding", "ใช้การเชื่อมต่อเดียวร่วมกันสำหรับการส่งต่อพอร์ต"),
+        ("port-forward-mux-tip", "ส่งการเชื่อมต่อทั้งหมดของการส่งต่อพอร์ตหนึ่งรายการผ่านการเชื่อมต่อเดียวไปยังอีกฝ่าย แทนการเชื่อมต่อและเข้าสู่ระบบใหม่ทุกครั้ง"),
    ].iter().cloned().collect();
 }
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Birden fazla ekranın ekran görüntülerinin birleştirilmesi şu anda desteklenmiyor. Lütfen tek bir ekrana geçin ve tekrar deneyin."),
        ("screenshot-action-tip", "Lütfen ekran görüntüsüyle nasıl devam edeceğinizi seçin."),
        ("Save as", "Farklı kaydet"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Dışa aktar"),
+        ("Export Logs", "Günlükleri dışa aktar"),
+        ("Import Folder", "Klasör içe aktar"),
        ("Copy to clipboard", "Panoya kopyala"),
        ("Enable remote printer", "Uzak yazıcıyı etkinleştir"),
        ("Downloading {}", "{} indiriliyor"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Tuvali kilitle"),
        ("Sync clipboard between sessions", "Oturumlar arasında panoyu senkronize et"),
        ("sync-clipboard-between-sessions-tip", "Bir uzak oturumda kopyalanan metin veya görseller, bağlı diğer oturumlarınızın panosuna da gönderilir."),
-        ("Enable WebRTC P2P connection", "WebRTC P2P bağlantısını etkinleştir"),
-        ("Enable TCP hole punching", "TCP delik açmayı etkinleştir"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Etkinleştir"),
+        ("Reuse one connection for port forwarding", "Port yönlendirme için tek bağlantıyı yeniden kullan"),
+        ("port-forward-mux-tip", "Bir port yönlendirmesindeki tüm bağlantıları, her biri için yeniden bağlanıp oturum açmak yerine karşı tarafa açılan tek bir bağlantı üzerinden taşır."),
    ].iter().cloned().collect();
 }
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -187,7 +187,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Enter your password", "輸入您的密碼"),
        ("Logging in...", "正在登入..."),
        ("Enable RDP session sharing", "啟用 RDP 工作階段分享"),
-        ("Auto Login", "自動登入 (只在您設定「工作階段結束後鎖定」時有效)"),
+        ("Auto Login", "自動登入（只在您設定「工作階段結束後鎖定」時有效）"),
        ("Enable direct IP access", "啟用 IP 直接存取"),
        ("Rename", "重新命名"),
        ("Space", "空白"),
@@ -300,7 +300,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Language", "語言"),
        ("Keep RustDesk background service", "保持 RustDesk 後台服務"),
        ("Ignore Battery Optimizations", "忽略電池最佳化"),
-        ("android_open_battery_optimizations_tip", "如果您想要停用此功能，請前往下一個 RustDesk 應用程式設定頁面，找到並進入「電池」，取消勾選「不受限制」"),
+        ("android_open_battery_optimizations_tip", "如果您想要停用此功能，請前往下一個 RustDesk 應用程式設定頁面，找到並進入「電池」，取消勾選「不受限制」。"),
        ("Start on boot", "開機時啟動"),
        ("Start the screen sharing service on boot, requires special permissions", "開機時啟動螢幕分享服務，需要特殊權限。"),
        ("Connection not allowed", "不允許連線"),
@@ -519,11 +519,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("I Agree", "同意"),
        ("Decline", "拒絕"),
        ("Timeout in minutes", "超時（分鐘）"),
-        ("auto_disconnect_option_tip", "自動在連入的使用者不活躍時關閉工作階段"),
+        ("auto_disconnect_option_tip", "自動關閉不活躍的連入工作階段"),
        ("Connection failed due to inactivity", "由於長時間沒有操作，已自動關閉工作階段"),
        ("Check for software update on startup", "啟動時檢查更新"),
        ("upgrade_rustdesk_server_pro_to_{}_tip", "請升級專業版伺服器到{}或更高版本！"),
-        ("pull_group_failed_tip", "獲取群組訊息失敗"),
+        ("pull_group_failed_tip", "重新整理群組失敗"),
        ("Filter by intersection", "按照交集篩選"),
        ("Remove wallpaper during incoming sessions", "在接受連入連線時移除桌布"),
        ("Test", "測試"),
@@ -639,7 +639,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Use D3D rendering", "使用 D3D 渲染"),
        ("Printer", "印表機"),
        ("printer-os-requirement-tip", "印表機的傳出功能需要 Windows 10 或更高版本。"),
-        ("printer-requires-installed-{}-client-tip", "為了使用遠端列印功能，請安裝 {} 到此設備。"),
+        ("printer-requires-installed-{}-client-tip", "為了使用遠端列印功能，請安裝 {} 到此裝置。"),
        ("printer-{}-not-installed-tip", "{} 印表機未安裝。"),
        ("printer-{}-ready-tip", "{} 印表機已安裝，您可以使用列印功能了。"),
        ("Install {} Printer", "安裝 {} 印表機"),
@@ -659,17 +659,17 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "目前不支援合併多個螢幕的截圖。請切換至單一螢幕後再試。"),
        ("screenshot-action-tip", "請選擇要如何處理這張截圖。"),
        ("Save as", "另存為"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "匯出"),
+        ("Export Logs", "匯出日誌"),
+        ("Import Folder", "匯入資料夾"),
        ("Copy to clipboard", "複製到剪貼簿"),
        ("Enable remote printer", "啟用遠端列印"),
        ("Downloading {}", "正在下載 {} 並安裝新版本。"),
        ("{} Update", "{} 更新"),
        ("{}-to-update-tip", "即將關閉 {} 並安裝新版本。"),
-        ("download-new-version-failed-tip", "下載失敗，您可以重試或點擊\"下載\"按鈕以從發布網址下載，並手動升級。"),
+        ("download-new-version-failed-tip", "下載失敗，您可以重試或點選\"下載\"按鈕以從發布網址下載，並手動升級。"),
        ("Auto update", "自動更新"),
-        ("update-failed-check-msi-tip", "安裝方式偵測失敗，請點擊\"下載\"按鈕以從發布網址下載，並手動升級。"),
+        ("update-failed-check-msi-tip", "安裝方式偵測失敗，請點選\"下載\"按鈕以從發布網址下載，並手動升級。"),
        ("websocket_tip", "使用 WebSocket 時，只支援使用中繼連接。"),
        ("Use WebSocket", "使用 WebSocket"),
        ("Trackpad speed", "觸控板速度"),
@@ -680,7 +680,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", "新分頁"),
@@ -690,7 +690,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Failed to get user token.", "取得使用者權杖失敗"),
        ("Incorrect username or password.", "使用者名稱或密碼不正確"),
        ("The user is not an administrator.", "使用者並不是系統管理員"),
-        ("Failed to check if the user is an administrator.", "檢查使用者是否是系統管理員時失敗了"),
+        ("Failed to check if the user is an administrator.", "無法確認使用者是否為系統管理員"),
        ("Supported only in the installed version.", "僅支援於已安裝的版本"),
        ("elevation_username_tip", "輸入使用者名稱或網域\\使用者名稱"),
        ("Preparing for installation ...", "正在準備安裝..."),
@@ -747,23 +747,26 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Show monitor switch button on the main toolbar", "在主工具列上顯示螢幕切換按鈕"),
        ("Show on the minimized toolbar", "在最小化工具列上顯示"),
        ("All monitors", "所有顯示器"),
-        ("#{} monitor", "{}號顯示器"),
-        ("conn-e2ee-unavailable-tip", "無法驗證端對端加密。\n遠端裝置可能仍在準備中，請稍後重試。\n如果此問題持續發生，伺服器可能不受信任。\n仍要繼續嗎？"),
+        ("#{} monitor", "{} 號顯示器"),
+        ("conn-e2ee-unavailable-tip", "無法驗證端到端加密。\n遠端裝置可能仍在準備中，請稍後再試。\n如果此問題持續發生，伺服器可能不受信任。\n仍要繼續嗎？"),
        ("ID whitelisting", "ID 白名單"),
        ("Use ID whitelisting", "只允許白名單上的 ID 進行連線"),
        ("id_whitelist_tip", "只有白名單上的 ID 可以存取"),
-        ("id_whitelist_wildcard_tip", "支援萬用字元：'*' 符合任意數量的字元，'?' 符合單一字元"),
+        ("id_whitelist_wildcard_tip", "支援萬用字元：'*' 以符合任意數量的字元，'?' 以符合單一字元"),
        ("Invalid ID", "ID 無效"),
-        ("Your ID is blocked by the peer", "你的 ID 已被對方封鎖"),
-        ("Your ip is blocked by the peer", "你的 IP 已被對方封鎖"),
-        ("id_whitelist_caveat_tip", "ID 由對端用戶端回報，白名單用於減少暴露面，不能取代密碼或 2FA"),
+        ("Your ID is blocked by the peer", "您的 ID 已被對方封鎖"),
+        ("Your ip is blocked by the peer", "您的 IP 已被對方封鎖"),
+        ("id_whitelist_caveat_tip", "ID 由對端客戶端回報。此白名單用於減少暴露面，不能取代密碼或 2FA。"),
        ("whitelist_cidr_tip", "支援 CIDR 寫法，例如 192.168.1.0/24"),
        ("Continue", "繼續"),
        ("Browser didn't open? Use the url below to sign in.", "瀏覽器未開啟？請使用下方網址登入。"),
        ("Lock canvas", "鎖定畫布"),
        ("Sync clipboard between sessions", "在工作階段間同步剪貼簿"),
        ("sync-clipboard-between-sessions-tip", "在一個遠端工作階段中複製的文字或圖片也會傳送到其他已連線工作階段的剪貼簿。"),
-        ("Enable WebRTC P2P connection", "啟用 WebRTC P2P 連線"),
-        ("Enable TCP hole punching", "啟用 TCP 打洞"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "啟用"),
+        ("Reuse one connection for port forwarding", "連接埠轉送重複使用同一條連線"),
+        ("port-forward-mux-tip", "同一條連接埠轉送規則上的所有連線共用一條到對方的連線，而不是每條連線都重新連線並登入一次。"),
    ].iter().cloned().collect();
 }
--- a/src/lang/uk.rs
+++ b/src/lang/uk.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Об'єднання знімків кількох дисплеїв наразі не підтримується. Перейдіть на один дисплей і спробуйте знову."),
        ("screenshot-action-tip", "Виберіть, що робити зі знімком екрана."),
        ("Save as", "Зберегти як"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Експортувати"),
+        ("Export Logs", "Експортувати журнали"),
+        ("Import Folder", "Імпортувати теку"),
        ("Copy to clipboard", "Скопіювати до буфера обміну"),
        ("Enable remote printer", "Увімкнути віддалений принтер"),
        ("Downloading {}", "Завантаження {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Блокування полотна"),
        ("Sync clipboard between sessions", "Синхронізувати буфер обміну між сеансами"),
        ("sync-clipboard-between-sessions-tip", "Текст або зображення, скопійовані в одному віддаленому сеансі, також надсилаються до буфера обміну інших підключених сеансів."),
-        ("Enable WebRTC P2P connection", "Увімкнути P2P-підключення через WebRTC"),
-        ("Enable TCP hole punching", "Увімкнути TCP hole punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Увімкнути"),
+        ("Reuse one connection for port forwarding", "Використовувати одне з'єднання для перенаправлення портів"),
+        ("port-forward-mux-tip", "Передавати всі з'єднання одного перенаправлення портів через одне з'єднання з віддаленим пристроєм замість повторного під'єднання та входу для кожного з них."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ur.rs
+++ b/src/lang/ur.rs
@@ -3,7 +3,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
    [
        ("Status", "حالت"),
        ("Your Desktop", "آپ کا ڈیسک ٹاپ"),
-        ("desk_tip", ""),
+        ("desk_tip", "آپ کے ڈیسک ٹاپ تک اس ID اور پاس ورڈ کے ذریعے رسائی حاصل کی جا سکتی ہے۔"),
        ("Password", "پاس ورڈ"),
        ("Ready", "تیار"),
        ("Established", "قائم کیا گیا"),
@@ -12,7 +12,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Start service", "سروس شروع کریں"),
        ("Service is running", "سروس چل رہی ہے"),
        ("Service is not running", "سروس نہیں چل رہی ہے"),
-        ("not_ready_status", ""),
+        ("not_ready_status", "تیار نہیں۔ براہِ کرم اپنا کنکشن جانچیں"),
        ("Control Remote Desktop", "ریموٹ ڈیسک ٹاپ کو کنٹرول کریں"),
        ("Transfer file", "فائل منتقل کریں"),
        ("Connect", "کنیکٹ کریں"),
@@ -41,12 +41,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("length %min% to %max%", "لمبائی %min% سے %max%"),
        ("starts with a letter", "حرف سے شروع ہوتا ہے"),
        ("allowed characters", "اجازت یافتہ حروف"),
-        ("id_change_tip", ""),
+        ("id_change_tip", "صرف a-z، A-Z، 0-9، - (ڈیش) اور _ (انڈر اسکور) حروف کی اجازت ہے۔ پہلا حرف a-z یا A-Z ہونا چاہیے۔ لمبائی 6 سے 16 کے درمیان ہو۔"),
        ("Website", "ویب سائٹ"),
        ("About", "کے بارے میں"),
        ("Slogan_tip", "سلوگن_ٹپ"),
        ("Privacy Statement", "رازداری کا بیان"),
-        ("License", "لائسنس"),
        ("Mute", "خاموش"),
        ("Build Date", "بنیاد کی تاریخ"),
        ("Version", "ورژن"),
@@ -149,21 +148,20 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("install_tip", "انسٹال کرنے کا مشورہ"),
        ("Click to upgrade", "اپگریڈ کرنے کے لئے کلک کریں"),
        ("Configure", "ترتیب دینا"),
-        ("config_acc", ""),
-        ("config_screen", ""),
+        ("config_acc", "اپنے ڈیسک ٹاپ کو دور سے کنٹرول کرنے کے لیے آپ کو RustDesk کو \"Accessibility\" کی اجازتیں دینا ہوں گی۔"),
+        ("config_screen", "اپنے ڈیسک ٹاپ تک دور سے رسائی کے لیے آپ کو RustDesk کو \"Screen Recording\" کی اجازتیں دینا ہوں گی۔"),
        ("Installing ...", "انسٹال ہو رہا ہے..."),
        ("Install", "انسٹال کریں"),
        ("Installation", "انسٹالیشن"),
        ("Installation Path", "انسٹالیشن کا راستہ"),
        ("Create start menu shortcuts", "اسٹارٹ مینو شارٹ کٹس بنائیں"),
        ("Create desktop icon", "ڈیسکٹاپ آئیکن بنائیں"),
-        ("agreement_tip", ""),
+        ("agreement_tip", "انسٹالیشن شروع کرنے سے آپ لائسنس معاہدہ قبول کرتے ہیں۔"),
        ("Accept and Install", "قبول کریں اور انسٹال کریں"),
        ("End-user license agreement", "اختتامی صارف کے لائسنس کا معاہدہ"),
        ("Generating ...", "بنا رہے ہیں..."),
        ("Your installation is lower version.", "آپ کی تنصیب کم ورژن ہے۔"),
-        ("Please install the latest version.", "براہِ مہربانی تازہ ترین ورژن انسٹال کریں۔"),
-        ("not_close_tcp_tip", ""),
+        ("not_close_tcp_tip", "جب تک آپ ٹنل استعمال کر رہے ہیں، یہ ونڈو بند نہ کریں"),
        ("Listening ...", "سن رہا ہے..."),
        ("Remote Host", "ریموٹ میزبان"),
        ("Remote Port", "ریموٹ پورٹ"),
@@ -212,7 +210,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Run without install", "انسٹال کے بغیر چلائیں"),
        ("Connect via relay", "ریلے کے ذریعے کنیکٹ کریں"),
        ("Always connect via relay", "ہمیشہ ریلے کے ذریعے کنیکٹ کریں"),
-        ("whitelist_tip", ""),
+        ("whitelist_tip", "صرف وائٹ لسٹ میں شامل IP مجھ تک رسائی حاصل کر سکتے ہیں"),
        ("Login", "لاگ ان کریں"),
        ("Verify", "تصدیق کریں"),
        ("Remember me", "یاد رکھیں"),
@@ -222,7 +220,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Logout", "لاگ آؤٹ"),
        ("Tags", "ٹیگز"),
        ("Search ID", "ID تلاش کریں"),
-        ("whitelist_sep", ""),
+        ("whitelist_sep", "کوما، سیمی کولن، خالی جگہ یا نئی سطر سے الگ کریں"),
        ("Add ID", "ID شامل کریں"),
        ("Add Tag", "ٹیگ شامل کریں"),
        ("Unselect all tags", "تمام ٹیگز کو غیر منتخب کریں"),
@@ -241,7 +239,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Socks5 Proxy", "پروکسی ساکس5"),
        ("Socks5/Http(s) Proxy", "ساکس5/Http(s) پروکسی"),
        ("Discovered", "دریافت شدہ"),
-        ("install_daemon_tip", ""),
+        ("install_daemon_tip", "بوٹ پر شروع ہونے کے لیے آپ کو سسٹم سروس انسٹال کرنا ہوگی۔"),
        ("Remote ID", "ریموٹ ID"),
        ("Paste", "چسپاں کریں"),
        ("Paste here?", "یہاں چسپاں کریں؟"),
@@ -278,14 +276,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Do you accept?", "کیا آپ قبول کرتے ہیں؟"),
        ("Open System Setting", "سسٹم کی ترتیبات کھولیں"),
        ("How to get Android input permission?", "Android کی درآمد کی اجازت کیسے حاصل کریں؟"),
-        ("android_input_permission_tip1", ""),
-        ("android_input_permission_tip2", ""),
-        ("android_new_connection_tip", ""),
-        ("android_service_will_start_tip", ""),
-        ("android_stop_service_tip", ""),
-        ("android_version_audio_tip", ""),
-        ("android_start_service_tip", ""),
-        ("android_permission_may_not_change_tip", ""),
+        ("android_input_permission_tip1", "کسی دور دراز آلے کو ماؤس یا ٹچ کے ذریعے آپ کے Android آلے کو کنٹرول کرنے کے لیے آپ کو RustDesk کو \"Accessibility\" سروس استعمال کرنے کی اجازت دینا ہوگی۔"),
+        ("android_input_permission_tip2", "براہِ کرم اگلے سسٹم سیٹنگز صفحے پر جائیں، [Installed Services] تلاش کر کے کھولیں اور [RustDesk Input] سروس آن کریں۔"),
+        ("android_new_connection_tip", "ایک نئی کنٹرول درخواست موصول ہوئی ہے، جو آپ کے موجودہ آلے کو کنٹرول کرنا چاہتی ہے۔"),
+        ("android_service_will_start_tip", "\"Screen Capture\" آن کرنے سے سروس خودکار طور پر شروع ہو جائے گی، جس سے دوسرے آلات آپ کے آلے سے کنکشن کی درخواست کر سکیں گے۔"),
+        ("android_stop_service_tip", "سروس بند کرنے سے تمام قائم شدہ کنکشن خودکار طور پر بند ہو جائیں گے۔"),
+        ("android_version_audio_tip", "موجودہ Android ورژن آڈیو کیپچر کی حمایت نہیں کرتا، براہِ کرم Android 10 یا اس سے نئے ورژن پر اپ گریڈ کریں۔"),
+        ("android_start_service_tip", "اسکرین شیئرنگ سروس شروع کرنے کے لیے [Start service] پر ٹیپ کریں یا [Screen Capture] کی اجازت فعال کریں۔"),
+        ("android_permission_may_not_change_tip", "قائم شدہ کنکشنز کی اجازتیں دوبارہ منسلک ہونے تک فوراً تبدیل نہیں ہو سکتیں۔"),
        ("Account", "کھاتا"),
        ("Overwrite", "اوور رائٹ کریں"),
        ("This file exists, skip or overwrite this file?", "یہ فائل موجود ہے، اس فائل کو چھوڑیں یا اوور رائٹ کریں؟"),
@@ -296,14 +294,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Someone turns on privacy mode, exit", "کوئی پرائیویسی موڈ آن کرتا ہے، باہر نکلیں"),
        ("Unsupported", "غیر معاون"),
        ("Peer denied", "ہم منسب نے انکار کر دیا"),
-        ("Please install plugins", "براہِ مہربانی پلگ ان انسٹال کریں"),
        ("Peer exit", "ہم منسب باہر نکل گیا"),
        ("Failed to turn off", "بند کرنے میں ناکام"),
        ("Turned off", "بند کر دیا"),
        ("Language", "زبان"),
        ("Keep RustDesk background service", "RustDesk پس منظر کی خدمت کو برقرار رکھیں"),
        ("Ignore Battery Optimizations", "بیٹری کی اصلاحات کو نظر انداز کریں"),
-        ("android_open_battery_optimizations_tip", ""),
+        ("android_open_battery_optimizations_tip", "اگر آپ یہ خصوصیت بند کرنا چاہتے ہیں تو براہِ کرم اگلے RustDesk ایپلیکیشن سیٹنگز صفحے پر جائیں، [Battery] تلاش کر کے کھولیں اور [Unrestricted] کا نشان ہٹا دیں"),
        ("Start on boot", "شروع کرنے پر شروع کریں"),
        ("Start the screen sharing service on boot, requires special permissions", "بوٹ پر سکرین شیئرنگ سروس شروع کریں، خاص اجازتوں کی ضرورت ہے"),
        ("Connection not allowed", "جڑنے کی اجازت نہیں ہے"),
@@ -317,7 +314,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Restart remote device", "ریموٹ ڈیوائس کو ری اسٹارٹ کریں"),
        ("Are you sure you want to restart", "کیا آپ واقعی ری اسٹارٹ کرنا چاہتے ہیں؟"),
        ("Restarting remote device", "ریموٹ ڈیوائس ری اسٹارٹ ہو رہی ہے"),
-        ("remote_restarting_tip", ""),
+        ("remote_restarting_tip", "دور دراز آلہ دوبارہ شروع ہو رہا ہے، براہِ کرم یہ پیغام بند کریں اور کچھ دیر بعد مستقل پاس ورڈ کے ساتھ دوبارہ منسلک ہوں"),
        ("Copied", "نقل ہو گیا"),
        ("Exit Fullscreen", "مکمل سکرین سے باہر نکلیں"),
        ("Fullscreen", "مکمل سکرین"),
@@ -408,19 +405,19 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Closed manually by web console", "ویب کنسول کے ذریعے دستی طور پر بند کیا گیا"),
        ("Local keyboard type", "مقامی کیبورڈ کا قسم"),
        ("Select local keyboard type", "مقامی کیبورڈ کا قسم منتخب کریں"),
-        ("software_render_tip", ""),
+        ("software_render_tip", "اگر آپ Linux پر Nvidia گرافکس کارڈ استعمال کر رہے ہیں اور منسلک ہونے کے فوراً بعد ریموٹ ونڈو بند ہو جاتی ہے، تو اوپن سورس Nouveau ڈرائیور پر منتقل ہونا اور سافٹ ویئر رینڈرنگ کا انتخاب مددگار ہو سکتا ہے۔ سافٹ ویئر کو دوبارہ شروع کرنا ضروری ہے۔"),
        ("Always use software rendering", "ہم sempre سافٹ ویر رینڈرنگ استعمال کریں"),
        ("config_input", "config_input"),
-        ("config_microphone", ""),
-        ("request_elevation_tip", ""),
+        ("config_microphone", "دور سے بات کرنے کے لیے آپ کو RustDesk کو \"Record Audio\" کی اجازتیں دینا ہوں گی۔"),
+        ("request_elevation_tip", "اگر دوسری طرف کوئی موجود ہے تو آپ اختیارات میں اضافے کی درخواست بھی کر سکتے ہیں۔"),
        ("Wait", "انتظار کریں"),
        ("Elevation Error", "علیٰ کرنے کی خرابی"),
        ("Ask the remote user for authentication", "ریموٹ صارف سے تصدیق کے لیے پوچھیں"),
        ("Choose this if the remote account is administrator", "ریموٹ اکاؤنٹ ایڈمنسٹریٹر ہو تو یہ منتخب کریں"),
        ("Transmit the username and password of administrator", "ایڈمنسٹریٹر کا صارف نام اور پاس ورڈ پروگرام کے ذریعے بھیجیں"),
-        ("still_click_uac_tip", ""),
+        ("still_click_uac_tip", "پھر بھی ضروری ہے کہ دور دراز صارف چل رہے RustDesk کی UAC ونڈو پر OK پر کلک کرے۔"),
        ("Request Elevation", "علیٰ کرنے کا درخواست دیں"),
-        ("wait_accept_uac_tip", ""),
+        ("wait_accept_uac_tip", "براہِ کرم انتظار کریں کہ دور دراز صارف UAC ڈائیلاگ قبول کرے۔"),
        ("Elevate successfully", "علیٰ کامیابی سے ہو گئے"),
        ("uppercase", "بڑے حروف"),
        ("lowercase", "چھوٹے حروف"),
@@ -438,7 +435,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Default Image Quality", "ڈیفالٹ تصویر کی معیار"),
        ("Default Codec", "ڈیفالٹ کوڈک"),
        ("Bitrate", "بٹ ریٹ"),
-        ("FPS", ""),
+        ("FPS", "FPS"),
        ("Auto", "خودکار"),
        ("Other Default Options", "دوسروں ڈیفالٹ اختیارات"),
        ("Voice call", "صوتی کال"),
@@ -464,20 +461,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Empty Username", "خالی صارف نام"),
        ("Empty Password", "خالی پاس ورڈ"),
        ("Me", "میں"),
-        ("identical_file_tip", ""),
-        ("show_monitors_tip", ""),
+        ("identical_file_tip", "یہ فائل دوسری طرف موجود فائل کے بالکل یکساں ہے۔"),
+        ("show_monitors_tip", "ٹول بار میں مانیٹر دکھائیں"),
        ("View Mode", "دیکھنے کا طریقہ"),
-        ("login_linux_tip", "login_linux_tip"),
-        ("verify_rustdesk_password_tip", ""),
-        ("remember_account_tip", ""),
-        ("os_account_desk_tip", ""),
-        ("OS Account", "OS اکاؤنٹ"),
-        ("another_user_login_title_tip", ""),
-        ("another_user_login_text_tip", ""),
-        ("xorg_not_found_title_tip", ""),
-        ("xorg_not_found_text_tip", ""),
-        ("no_desktop_title_tip", ""),
-        ("no_desktop_text_tip", ""),
+        ("verify_rustdesk_password_tip", "RustDesk پاس ورڈ کی تصدیق کریں"),
        ("No need to elevate", "اپنے کو ہیں نہیں"),
        ("System Sound", "سسٹم سائونڈ"),
        ("Default", "ڈیفالٹ"),
@@ -485,30 +472,24 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Fingerprint", "فنگر پرنٹ"),
        ("Copy Fingerprint", "فنگر پرنٹ کاپی کریں"),
        ("no fingerprints", "کوئی فنگر پرنٹ نہیں"),
-        ("Select a peer", "ایک پیر منتخب کریں"),
-        ("Select peers", "پیرز منتخب کریں"),
-        ("Plugins", "پلگ انز"),
-        ("Uninstall", "ان انسٹال کریں"),
        ("Update", "اپڈیٹ کریں"),
        ("Enable", "فعال کریں"),
-        ("Disable", "غیر فعال کریں"),
-        ("Options", "اختیارات"),
-        ("resolution_original_tip", ""),
-        ("resolution_fit_local_tip", ""),
-        ("resolution_custom_tip", ""),
+        ("resolution_original_tip", "اصل ریزولوشن"),
+        ("resolution_fit_local_tip", "مقامی ریزولوشن کے مطابق"),
+        ("resolution_custom_tip", "حسبِ ضرورت ریزولوشن"),
        ("Collapse toolbar", "ٹول بار کو سکڑیں"),
        ("Accept and Elevate", "قبول کریں اور علیٰ کریں"),
-        ("accept_and_elevate_btn_tooltip", ""),
-        ("clipboard_wait_response_timeout_tip", ""),
+        ("accept_and_elevate_btn_tooltip", "کنکشن قبول کریں اور UAC اجازتیں بڑھائیں۔"),
+        ("clipboard_wait_response_timeout_tip", "کاپی کے جواب کا انتظار ختم ہو گیا۔"),
        ("Incoming connection", "آنے والا کنکشن"),
        ("Outgoing connection", "جانے والا کنکشن"),
        ("Exit", "خارج ہوں"),
        ("Open", "کھولیں"),
-        ("logout_tip", ""),
+        ("logout_tip", "کیا آپ واقعی لاگ آؤٹ کرنا چاہتے ہیں؟"),
        ("Service", "سروس"),
        ("Start", "شروع کریں"),
        ("Stop", "روک دیں"),
-        ("exceed_max_devices", ""),
+        ("exceed_max_devices", "آپ زیرِ انتظام آلات کی زیادہ سے زیادہ تعداد تک پہنچ چکے ہیں۔"),
        ("Sync with recent sessions", "پچھلے سیشنز کے ساتھ ہم آہنگ کریں"),
        ("Sort tags", "ٹیگز کو ترتیب دیں"),
        ("Open connection in new tab", "کنکشن کو نئے ٹیب میں کھولیں"),
@@ -517,14 +498,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Already exists", "پہلے سے موجود ہے"),
        ("Change Password", "پاسورڈ تبدیل کریں"),
        ("Refresh Password", "پاسورڈ ریفریش کریں"),
-        ("ID", ""),
+        ("ID", "ID"),
        ("Grid View", "گوڈ ویو"),
        ("List View", "لسٹ ویو"),
        ("Select", "منتخب کریں"),
        ("Toggle Tags", "ٹیگز ٹوگل کریں"),
-        ("pull_ab_failed_tip", ""),
-        ("push_ab_failed_tip", ""),
-        ("synced_peer_readded_tip", ""),
+        ("pull_ab_failed_tip", "ایڈریس بک تازہ کرنے میں ناکامی"),
+        ("push_ab_failed_tip", "ایڈریس بک کو سرور سے ہم آہنگ کرنے میں ناکامی"),
+        ("synced_peer_readded_tip", "حالیہ سیشنز میں موجود آلات دوبارہ ایڈریس بک سے ہم آہنگ کر دیے جائیں گے۔"),
        ("Change Color", "رنگ تبدیل کریں"),
        ("Primary Color", "پرائمری رنگ"),
        ("HSV Color", "HSV رنگ"),
@@ -539,11 +520,11 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("I Agree", "میں قبول کرتا ہوں"),
        ("Decline", "ناکام کریں"),
        ("Timeout in minutes", "منٹوں میں ٹائیم آؤٹ"),
-        ("auto_disconnect_option_tip", ""),
+        ("auto_disconnect_option_tip", "صارف کی غیر فعالی پر آنے والے سیشنز خودکار طور پر بند کریں"),
        ("Connection failed due to inactivity", "انفعال کی وजہ سے کنکشن ناکام ہو گیا"),
        ("Check for software update on startup", "سٹارٹ اپ پر سافٹ ویر اپڈیٹ کے لیے چیک کریں"),
-        ("upgrade_rustdesk_server_pro_to_{}_tip", ""),
-        ("pull_group_failed_tip", ""),
+        ("upgrade_rustdesk_server_pro_to_{}_tip", "براہِ کرم RustDesk Server Pro کو ورژن {} یا اس سے نئے پر اپ گریڈ کریں!"),
+        ("pull_group_failed_tip", "گروپ تازہ کرنے میں ناکامی"),
        ("Filter by intersection", "فلٹر بائی انسٹریکشن"),
        ("Remove wallpaper during incoming sessions", "ان کلینگ سیشنز کے دوران والپیپر کو ہٹائیں"),
        ("Test", "ٹیسٹ"),
@@ -552,7 +533,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Open in new window", "نئی ونڈو میں کھولیں"),
        ("Show displays as individual windows", "ڈسپلے کو افراد کے طور پر دکھائیں"),
        ("Use all my displays for the remote session", "ریموٹ سیشن کے لیے میرے تمام ڈسپلے استعمال کریں"),
-        ("selinux_tip", ""),
+        ("selinux_tip", "آپ کے آلے پر SELinux فعال ہے، جو RustDesk کو بطور کنٹرول شدہ فریق درست طور پر چلنے سے روک سکتا ہے۔"),
        ("Change view", "ویو تبدیل کریں"),
        ("Big tiles", "بڑے ٹائل"),
        ("Small tiles", "چھوٹے ٹائل"),
@@ -561,14 +542,14 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Plug out all", "تمام پلگ آؤٹ کریں"),
        ("True color (4:4:4)", "اصل رنگ (4:4:4)"),
        ("Enable blocking user input", "صارف ان پٹ کو روکنے کی اجازت دیں"),
-        ("id_input_tip", ""),
-        ("privacy_mode_impl_mag_tip", ""),
-        ("privacy_mode_impl_virtual_display_tip", ""),
+        ("id_input_tip", "آپ ایک ID، براہِ راست IP، یا پورٹ کے ساتھ ڈومین (<domain>:<port>) درج کر سکتے ہیں۔\nاگر آپ کسی دوسرے سرور پر موجود آلے تک رسائی چاہتے ہیں تو سرور کا پتہ ساتھ لگائیں (<id>@<server_address>?key=<key_value>)، مثلاً،\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=۔\nاگر آپ کسی عوامی سرور پر موجود آلے تک رسائی چاہتے ہیں تو \"<id>@public\" درج کریں، عوامی سرور کے لیے کلید درکار نہیں۔\n\nاگر آپ پہلے کنکشن پر ریلے کنکشن کا استعمال لازمی کرنا چاہتے ہیں تو ID کے آخر میں \"/r\" شامل کریں، مثلاً، \"9123456234/r\"۔"),
+        ("privacy_mode_impl_mag_tip", "موڈ 1"),
+        ("privacy_mode_impl_virtual_display_tip", "موڈ 2"),
        ("Enter privacy mode", "خفیہ موڈ میں داخل ہوں"),
        ("Exit privacy mode", "خفیہ موڈ سے باہر نکلیں"),
-        ("idd_not_support_under_win10_2004_tip", ""),
-        ("input_source_1_tip", ""),
-        ("input_source_2_tip", ""),
+        ("idd_not_support_under_win10_2004_tip", "بالواسطہ ڈسپلے ڈرائیور معاون نہیں ہے۔ Windows 10 ورژن 2004 یا اس سے نیا درکار ہے۔"),
+        ("input_source_1_tip", "ان پٹ ماخذ 1"),
+        ("input_source_2_tip", "ان پٹ ماخذ 2"),
        ("Swap control-command key", "control-command کلید کو سوپ کریں"),
        ("swap-left-right-mouse", "بائی-دائی ماؤس کو سوپ کریں"),
        ("2FA code", "2FA کوڈ"),
@@ -582,8 +563,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Multiple Windows sessions found", "متعدد ونڈوز سیشن ملے"),
        ("Please select the session you want to connect to", "براہ کرم وہ سیشن منتخب کریں جس سے آپ منسلک ہونا چاہتے ہیں"),
        ("powered_by_me", "میں کی طرف سے طاقتور"),
-        ("outgoing_only_desk_tip", ""),
-        ("preset_password_warning", ""),
+        ("outgoing_only_desk_tip", "یہ ایک حسبِ ضرورت ایڈیشن ہے۔\nآپ دوسرے آلات سے منسلک ہو سکتے ہیں، لیکن دوسرے آلات آپ کے آلے سے منسلک نہیں ہو سکتے۔"),
+        ("preset_password_warning", "یہ حسبِ ضرورت ایڈیشن پہلے سے مقرر پاس ورڈ کے ساتھ آتا ہے۔ جو بھی یہ پاس ورڈ جانتا ہو وہ آپ کے آلے کا مکمل کنٹرول حاصل کر سکتا ہے۔ اگر آپ کو اس کی توقع نہیں تھی تو سافٹ ویئر فوراً ان انسٹال کر دیں۔"),
        ("Security Alert", "سیکورٹی الرٹ"),
        ("My address book", "میری ایڈریس بک"),
        ("Personal", "شخصی"),
@@ -593,25 +574,25 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Read-only", "صرف پڑھنے کے لیے"),
        ("Read/Write", "پڑھنے/لکھنے"),
        ("Full Control", "پورا کنٹرول"),
-        ("share_warning_tip", ""),
+        ("share_warning_tip", "اوپر دیے گئے خانے مشترکہ ہیں اور دوسروں کو نظر آتے ہیں۔"),
        ("Everyone", "ہر کوئی"),
-        ("ab_web_console_tip", ""),
-        ("allow-only-conn-window-open-tip", ""),
-        ("no_need_privacy_mode_no_physical_displays_tip", ""),
+        ("ab_web_console_tip", "ویب کنسول پر مزید"),
+        ("allow-only-conn-window-open-tip", "کنکشن کی اجازت صرف اس صورت میں دیں جب RustDesk ونڈو کھلی ہو"),
+        ("no_need_privacy_mode_no_physical_displays_tip", "کوئی طبعی ڈسپلے نہیں، پرائیویسی موڈ استعمال کرنے کی ضرورت نہیں۔"),
        ("Follow remote cursor", "ریموٹ کرسر کی پیروی کریں"),
        ("Follow remote window focus", "ریموٹ ونڈو فوکس کی پیروی کریں"),
-        ("default_proxy_tip", ""),
-        ("no_audio_input_device_tip", ""),
+        ("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", ""),
-        ("android_new_voice_call_tip", ""),
-        ("texture_render_tip", ""),
+        ("clear_Wayland_screen_selection_tip", "اسکرین کا انتخاب صاف کرنے کے بعد آپ شیئر کرنے کے لیے اسکرین دوبارہ منتخب کر سکتے ہیں۔"),
+        ("confirm_clear_Wayland_screen_selection_tip", "کیا آپ واقعی Wayland اسکرین کا انتخاب صاف کرنا چاہتے ہیں؟"),
+        ("android_new_voice_call_tip", "ایک نئی صوتی کال کی درخواست موصول ہوئی۔ اگر آپ قبول کرتے ہیں تو آڈیو صوتی رابطے پر منتقل ہو جائے گا۔"),
+        ("texture_render_tip", "تصاویر کو ہموار بنانے کے لیے ٹیکسچر رینڈرنگ استعمال کریں۔ اگر آپ کو رینڈرنگ کے مسائل درپیش ہوں تو یہ اختیار بند کر کے دیکھ سکتے ہیں۔"),
        ("Use texture rendering", "ٹیکسچر رینڈرنگ کا استعمال کریں"),
        ("Floating window", "فلوٹنگ ونڈو"),
-        ("floating_window_tip", ""),
+        ("floating_window_tip", "یہ RustDesk کی پس منظر سروس کو برقرار رکھنے میں مدد دیتا ہے"),
        ("Keep screen on", "سکرین کو آن رکھیں"),
        ("Never", "کبھی نہیں"),
        ("During controlled", "کنٹرول کے دوران"),
@@ -623,13 +604,13 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Volume down", "آواز کم کریں"),
        ("Power", "پاور"),
        ("Telegram bot", "ٹیلیگرام بات"),
-        ("enable-bot-tip", ""),
-        ("enable-bot-desc", ""),
-        ("cancel-2fa-confirm-tip", ""),
-        ("cancel-bot-confirm-tip", ""),
+        ("enable-bot-tip", "اگر آپ یہ خصوصیت فعال کریں تو آپ اپنے بوٹ سے 2FA کوڈ وصول کر سکتے ہیں۔ یہ کنکشن کی اطلاع کے طور پر بھی کام کر سکتا ہے۔"),
+        ("enable-bot-desc", "1. @BotFather کے ساتھ چیٹ کھولیں۔\n2. کمانڈ \"/newbot\" بھیجیں۔ یہ مرحلہ مکمل کرنے کے بعد آپ کو ایک ٹوکن ملے گا۔\n3. اپنے نئے بنائے گئے بوٹ کے ساتھ چیٹ شروع کریں۔ اسے فعال کرنے کے لیے فارورڈ سلیش (\"/\") سے شروع ہونے والا پیغام، جیسے \"/hello\"، بھیجیں۔\n"),
+        ("cancel-2fa-confirm-tip", "کیا آپ واقعی 2FA منسوخ کرنا چاہتے ہیں؟"),
+        ("cancel-bot-confirm-tip", "کیا آپ واقعی Telegram بوٹ منسوخ کرنا چاہتے ہیں؟"),
        ("About RustDesk", "رستڈیسک کے بارے میں"),
        ("Send clipboard keystrokes", "کلپ بورڈ کی چابیاں بھیجیں"),
-        ("network_error_tip", ""),
+        ("network_error_tip", "براہِ کرم اپنا نیٹ ورک کنکشن جانچیں، پھر دوبارہ کوشش پر کلک کریں۔"),
        ("Unlock with PIN", "PIN کے ساتھ انلاک کریں"),
        ("Requires at least {} characters", "کم از کم {} حروف کی ضرورت ہے"),
        ("Wrong PIN", "غلط PIN"),
@@ -638,56 +619,56 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Manage trusted devices", "معتبر آلے مینیج کریں"),
        ("Platform", "پلیٹ فارم"),
        ("Days remaining", "دن باقی"),
-        ("enable-trusted-devices-tip", ""),
+        ("enable-trusted-devices-tip", "قابلِ اعتماد آلات پر 2FA تصدیق چھوڑ دیں"),
        ("Parent directory", "والد ڈائرکٹری"),
        ("Resume", "جاری رکھیں"),
        ("Invalid file name", "غلط فائل کا نام"),
-        ("one-way-file-transfer-tip", ""),
+        ("one-way-file-transfer-tip", "کنٹرول شدہ فریق پر یک طرفہ فائل منتقلی فعال ہے۔"),
        ("Authentication Required", "توثیق کی ضرورت ہے"),
        ("Authenticate", "توثیق کریں"),
-        ("web_id_input_tip", ""),
+        ("web_id_input_tip", "آپ اسی سرور میں ایک ID درج کر سکتے ہیں، ویب کلائنٹ میں براہِ راست IP رسائی معاون نہیں ہے۔\nاگر آپ کسی دوسرے سرور پر موجود آلے تک رسائی چاہتے ہیں تو سرور کا پتہ ساتھ لگائیں (<id>@<server_address>?key=<key_value>)، مثلاً،\n9123456234@192.168.16.1:21117?key=5Qbwsde3unUcJBtrx9ZkvUmwFNoExHzpryHuPUdqlWM=۔\nاگر آپ کسی عوامی سرور پر موجود آلے تک رسائی چاہتے ہیں تو \"<id>@public\" درج کریں، عوامی سرور کے لیے کلید درکار نہیں۔"),
        ("Download", "ڈاؤن لوڈ کریں"),
        ("Upload folder", "اپ لوڈ فولڈر"),
        ("Upload files", "فائلیں اپ لوڈ کریں"),
        ("Clipboard is synchronized", "کلپ بورڈ مطابق ہے"),
        ("Update client clipboard", "کلپ بورڈ کو اپ ڈیٹ کریں"),
        ("Untagged", "غیر تعلق یافتہ"),
-        ("new-version-of-{}-tip", ""),
+        ("new-version-of-{}-tip", "{} کا ایک نیا ورژن دستیاب ہے"),
        ("Accessible devices", "قابلِ رسائی والے آلے"),
-        ("upgrade_remote_rustdesk_client_to_{}_tip", ""),
-        ("d3d_render_tip", ""),
+        ("upgrade_remote_rustdesk_client_to_{}_tip", "براہِ کرم دور دراز فریق پر RustDesk کلائنٹ کو ورژن {} یا اس سے نئے پر اپ گریڈ کریں!"),
+        ("d3d_render_tip", "جب D3D رینڈرنگ فعال ہو تو کچھ مشینوں پر ریموٹ کنٹرول اسکرین سیاہ ہو سکتی ہے۔"),
        ("Use D3D rendering", "D3D رینڈرنگ کا استعمال کریں"),
        ("Printer", "پرنٹر"),
-        ("printer-os-requirement-tip", ""),
-        ("printer-requires-installed-{}-client-tip", ""),
-        ("printer-{}-not-installed-tip", ""),
-        ("printer-{}-ready-tip", ""),
+        ("printer-os-requirement-tip", "پرنٹر کی بیرونی خصوصیت کے لیے Windows 10 یا اس سے نیا درکار ہے۔"),
+        ("printer-requires-installed-{}-client-tip", "دور دراز پرنٹنگ استعمال کرنے کے لیے اس آلے پر {} انسٹال ہونا ضروری ہے۔"),
+        ("printer-{}-not-installed-tip", "{} پرنٹر انسٹال نہیں ہے۔"),
+        ("printer-{}-ready-tip", "{} پرنٹر انسٹال ہے اور استعمال کے لیے تیار ہے۔"),
        ("Install {} Printer", " {} پرنٹر انسٹال کریں"),
        ("Outgoing Print Jobs", "بیرونی پرنٹ کام"),
        ("Incoming Print Jobs", "اندر کے پرنٹ کام"),
        ("Incoming Print Job", "اندر کا پرنٹ کام"),
-        ("use-the-default-printer-tip", ""),
-        ("use-the-selected-printer-tip", ""),
-        ("auto-print-tip", ""),
-        ("print-incoming-job-confirm-tip", ""),
-        ("remote-printing-disallowed-tile-tip", ""),
-        ("remote-printing-disallowed-text-tip", ""),
-        ("save-settings-tip", ""),
+        ("use-the-default-printer-tip", "پہلے سے طے شدہ پرنٹر استعمال کریں"),
+        ("use-the-selected-printer-tip", "منتخب کردہ پرنٹر استعمال کریں"),
+        ("auto-print-tip", "منتخب کردہ پرنٹر سے خودکار طور پر پرنٹ کریں۔"),
+        ("print-incoming-job-confirm-tip", "آپ کو دور دراز سے ایک پرنٹ جاب موصول ہوئی۔ کیا آپ اسے اپنی طرف چلانا چاہتے ہیں؟"),
+        ("remote-printing-disallowed-tile-tip", "دور دراز پرنٹنگ کی اجازت نہیں"),
+        ("remote-printing-disallowed-text-tip", "کنٹرول شدہ فریق کی اجازت کی ترتیبات دور دراز پرنٹنگ سے انکار کرتی ہیں۔"),
+        ("save-settings-tip", "ترتیبات محفوظ کریں"),
        ("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", "کلپ بورڈ پر کاپی کریں"),
        ("Enable remote printer", "ریموٹ پرنٹر کو فعال کریں"),
        ("Downloading {}", "ڈاؤن لوڈ ہو رہا ہے {}"),
        ("{} Update", "{} اپ ڈیٹ"),
-        ("{}-to-update-tip", ""),
-        ("download-new-version-failed-tip", ""),
+        ("{}-to-update-tip", "{} اب بند ہو کر نیا ورژن انسٹال کرے گا۔"),
+        ("download-new-version-failed-tip", "ڈاؤن لوڈ ناکام۔ آپ دوبارہ کوشش کر سکتے ہیں یا \"Download\" بٹن پر کلک کر کے ریلیز صفحے سے ڈاؤن لوڈ کر کے دستی طور پر اپ گریڈ کر سکتے ہیں۔"),
        ("Auto update", "خودکار اپ ڈیٹ"),
-        ("update-failed-check-msi-tip", ""),
-        ("websocket_tip", ""),
+        ("update-failed-check-msi-tip", "انسٹالیشن کے طریقے کی جانچ ناکام۔ براہِ کرم \"Download\" بٹن پر کلک کر کے ریلیز صفحے سے ڈاؤن لوڈ کریں اور دستی طور پر اپ گریڈ کریں۔"),
+        ("websocket_tip", "WebSocket استعمال کرتے وقت صرف ریلے کنکشنز معاون ہیں۔"),
        ("Use WebSocket", "WebSocket استعمال کریں"),
        ("Trackpad speed", "ٹریک پیڈ کی رفتار"),
        ("Default trackpad speed", "ڈیفالٹ ٹریک پیڈ کی رفتار"),
@@ -709,7 +690,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("The user is not an administrator.", "صارف ایڈمنسٹریٹر نہیں ہے"),
        ("Failed to check if the user is an administrator.", "صارف ایڈمنسٹریٹر ہے یا نہیں چیک کرنے میں ناکام"),
        ("Supported only in the installed version.", "صرف انسٹال شدہ ورژن میں معاونت کی جاتی ہے۔"),
-        ("elevation_username_tip", ""),
+        ("elevation_username_tip", "صارف نام یا ڈومین صارف نام درج کریں"),
        ("Preparing for installation ...", "انسٹالیشن کی تیاری ..."),
        ("Show my cursor", "میرا کرسر دکھائیں"),
        ("Scale custom", "اپنی مرضی کے مطابق پیمانہ"),
@@ -725,26 +706,68 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Alias", "عرف نام"),
        ("ScrollEdge", "اسکرول ایج"),
        ("Allow insecure TLS fallback", "غیر محفوظ TLS فالبیک کی اجازت دیں"),
-        ("allow-insecure-tls-fallback-tip", ""),
+        ("allow-insecure-tls-fallback-tip", "پہلے سے طے شدہ طور پر RustDesk TLS استعمال کرنے والے پروٹوکولز کے لیے سرور کے سرٹیفکیٹ کی تصدیق کرتا ہے۔\nیہ اختیار فعال ہونے پر، تصدیق ناکام ہونے کی صورت میں RustDesk تصدیق کا مرحلہ چھوڑ کر آگے بڑھ جائے گا۔"),
        ("Disable UDP", "UDP کو غیر فعال کریں"),
-        ("disable-udp-tip", ""),
-        ("server-oss-not-support-tip", ""),
+        ("disable-udp-tip", "طے کرتا ہے کہ صرف TCP استعمال کیا جائے یا نہیں۔\nیہ اختیار فعال ہونے پر RustDesk UDP 21116 مزید استعمال نہیں کرے گا، اس کی جگہ TCP 21116 استعمال ہوگا۔"),
+        ("server-oss-not-support-tip", "نوٹ: RustDesk سرور OSS میں یہ خصوصیت شامل نہیں ہے۔"),
        ("input note here", "نوٹ یہاں درج کریں"),
-        ("note-at-conn-end-tip", ""),
+        ("note-at-conn-end-tip", "کنکشن کے اختتام پر نوٹ کے لیے پوچھیں"),
        ("Show terminal extra keys", "ٹرمنل اضافی کیز دکھائیں"),
        ("Relative mouse mode", "رشتہ دار ماؤس موڈ"),
-        ("rel-mouse-not-supported-peer-tip", ""),
-        ("rel-mouse-not-ready-tip", ""),
-        ("rel-mouse-lock-failed-tip", ""),
-        ("rel-mouse-exit-{}-tip", ""),
-        ("rel-mouse-permission-lost-tip", ""),
+        ("rel-mouse-not-supported-peer-tip", "منسلک فریق نسبتی ماؤس موڈ کی حمایت نہیں کرتا۔"),
+        ("rel-mouse-not-ready-tip", "نسبتی ماؤس موڈ ابھی تیار نہیں۔ براہِ کرم دوبارہ کوشش کریں۔"),
+        ("rel-mouse-lock-failed-tip", "کرسر مقفل کرنے میں ناکامی۔ نسبتی ماؤس موڈ بند کر دیا گیا ہے۔"),
+        ("rel-mouse-exit-{}-tip", "باہر نکلنے کے لیے {} دبائیں۔"),
+        ("rel-mouse-permission-lost-tip", "کی بورڈ کی اجازت واپس لے لی گئی۔ نسبتی ماؤس موڈ بند کر دیا گیا ہے۔"),
        ("Changelog", "تبدیلی کا لاگ"),
-        ("keep-awake-during-outgoing-sessions-label", ""),
-        ("keep-awake-during-incoming-sessions-label", ""),
+        ("keep-awake-during-outgoing-sessions-label", "بیرونی سیشنز کے دوران اسکرین بیدار رکھیں"),
+        ("keep-awake-during-incoming-sessions-label", "آنے والے سیشنز کے دوران اسکرین بیدار رکھیں"),
        ("Continue with {}", "continue-with-{}"),
        ("Display Name", "display-name"),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
+        ("password-hidden-tip", "مستقل پاس ورڈ مقرر ہے (پوشیدہ)۔"),
+        ("preset-password-in-use-tip", "پہلے سے مقرر پاس ورڈ اس وقت استعمال میں ہے۔"),
+        ("terminal-clipboard-write-tip", "ٹرمنل میں ایک ایپ اس ڈیوائس کے کلپ بورڈ پر متن کاپی کرنا چاہتی ہے۔ اجازت دینے پر یہ اجازت تمام کنکشن کی ٹرمنل ایپس پر لاگو رہے گی جب تک آپ اسے ترتیبات میں بند نہ کر دیں۔ دستی کاپی اور پیسٹ متاثر نہیں ہوں گے۔"),
+        ("Allow terminal apps to copy to clipboard", "ٹرمنل ایپس کو کلپ بورڈ پر کاپی کرنے کی اجازت دیں"),
+        ("Export", "برآمد کریں"),
+        ("Export Logs", "لاگز برآمد کریں"),
+        ("Import Folder", "فولڈر درآمد کریں"),
+        ("Enable privacy mode", "پرائیویسی موڈ فعال کریں"),
+        ("allow-remote-toolbar-docking-any-edge", "ریموٹ ٹول بار کو ونڈو کے کسی بھی کنارے پر لگانے کی اجازت دیں"),
+        ("API Token", "API ٹوکن"),
+        ("Deploy", "تعینات کریں"),
+        ("Custom ID (optional)", "حسبِ ضرورت ID (اختیاری)"),
+        ("server_requires_deployment_tip", "سرور کا تقاضا ہے کہ یہ آلہ واضح طور پر تعینات کیا جائے۔ ابھی تعینات کریں؟"),
+        ("The server does not require explicit deployment.", "سرور کو واضح تعیناتی کی ضرورت نہیں۔"),
+        ("Unknown response.", "نامعلوم جواب۔"),
+        ("wayland-keyboard-input-disabled-tip", "کی بورڈ ان پٹ کی اجازت دیں؟"),
+        ("wayland-keyboard-input-consent-tip", "اس دور دراز کمپیوٹر پر آپ جو کچھ ٹائپ کریں گے (بشمول پاس ورڈ) اسے اس پر موجود دوسری ایپس پڑھ سکتی ہیں۔"),
+        ("wayland-keyboard-input-applies-to-tip", "یہ انتخاب اس پر لاگو ہوتا ہے:"),
+        ("wayland-soft-keyboard-input-label", "سافٹ کی بورڈ ان پٹ"),
+        ("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", "#{} مانیٹر"),
+        ("conn-e2ee-unavailable-tip", "اینڈ ٹو اینڈ خفیہ کاری کی تصدیق نہیں ہو سکی۔\nدور دراز آلہ ابھی ترتیب دیا جا رہا ہو سکتا ہے۔ بعد میں دوبارہ کوشش کریں۔\nاگر ایسا بار بار ہو تو ممکن ہے سرور قابلِ اعتماد نہ ہو۔\nپھر بھی جاری رکھیں؟"),
+        ("ID whitelisting", "ID وائٹ لسٹنگ"),
+        ("Use ID whitelisting", "ID وائٹ لسٹنگ استعمال کریں"),
+        ("id_whitelist_tip", "صرف وائٹ لسٹ میں شامل IDs مجھ تک رسائی حاصل کر سکتی ہیں"),
+        ("id_whitelist_wildcard_tip", "وائلڈ کارڈ معاون ہیں: '*' کسی بھی تعداد میں حروف سے مطابقت رکھتا ہے، '?' بالکل ایک حرف سے"),
+        ("Invalid ID", "غلط ID"),
+        ("Your ID is blocked by the peer", "آپ کی ID دوسرے فریق نے مسدود کر دی ہے"),
+        ("Your ip is blocked by the peer", "آپ کا IP دوسرے فریق نے مسدود کر دیا ہے"),
+        ("id_whitelist_caveat_tip", "ID کی اطلاع منسلک ہونے والا کلائنٹ خود دیتا ہے۔ یہ وائٹ لسٹ خطرے کو کم کرتی ہے، پاس ورڈ یا 2FA کا متبادل نہیں۔"),
+        ("whitelist_cidr_tip", "CIDR اشاریہ معاون ہے، مثلاً 192.168.1.0/24"),
+        ("Continue", "جاری رکھیں"),
+        ("Browser didn't open? Use the url below to sign in.", "براؤزر نہیں کھلا؟ سائن اِن کرنے کے لیے نیچے دیا گیا URL استعمال کریں۔"),
+        ("Lock canvas", "کینوس مقفل کریں"),
+        ("Sync clipboard between sessions", "سیشنز کے درمیان کلپ بورڈ ہم آہنگ کریں"),
+        ("sync-clipboard-between-sessions-tip", "ایک ریموٹ سیشن میں کاپی کیا گیا متن یا تصاویر آپ کے دیگر منسلک سیشنز کے کلپ بورڈ پر بھی بھیجی جاتی ہیں۔"),
+        ("Reuse one connection for port forwarding", "پورٹ فارورڈنگ کے لیے ایک ہی کنکشن دوبارہ استعمال کریں"),
+        ("port-forward-mux-tip", "ایک پورٹ فارورڈنگ کے تمام کنکشن دوسرے کمپیوٹر کے ساتھ بنے ایک ہی کنکشن سے گزرتے ہیں، ہر ایک کے لیے دوبارہ منسلک ہو کر لاگ اِن کرنے کے بجائے۔"),
    ].iter().cloned().collect();
 }

--- a/src/lang/vi.rs
+++ b/src/lang/vi.rs
@@ -659,9 +659,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("screenshot-merged-screen-not-supported-tip", "Không hỗ trợ chụp gộp nhiều màn hình."),
        ("screenshot-action-tip", "Hành động chụp màn hình"),
        ("Save as", "Lưu thành"),
-        ("Export", ""),
-        ("Export Logs", ""),
-        ("Import Folder", ""),
+        ("Export", "Xuất"),
+        ("Export Logs", "Xuất nhật ký"),
+        ("Import Folder", "Nhập thư mục"),
        ("Copy to clipboard", "Sao chép vào Clipboard"),
        ("Enable remote printer", "Bật máy in từ xa"),
        ("Downloading {}", "Đang tải xuống {}"),
@@ -763,7 +763,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Lock canvas", "Khóa khung hình"),
        ("Sync clipboard between sessions", "Đồng bộ clipboard giữa các phiên"),
        ("sync-clipboard-between-sessions-tip", "Văn bản hoặc hình ảnh được sao chép trong một phiên từ xa cũng được gửi đến clipboard của các phiên đã kết nối khác."),
-        ("Enable WebRTC P2P connection", "Cho phép kết nối WebRTC P2P"),
-        ("Enable TCP hole punching", "Bật TCP Hole Punching"),
+        ("terminal-clipboard-write-tip", ""),
+        ("Allow terminal apps to copy to clipboard", ""),
+        ("Enable", "Bật"),
+        ("Reuse one connection for port forwarding", "Dùng chung một kết nối cho chuyển tiếp cổng"),
+        ("port-forward-mux-tip", "Chuyển toàn bộ kết nối của một quy tắc chuyển tiếp cổng qua một kết nối duy nhất tới máy đối phương, thay vì kết nối và đăng nhập lại cho từng kết nối."),
    ].iter().cloned().collect();
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -45,6 +45,7 @@ mod custom_server;
 mod lang;
 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 mod port_forward;
+mod port_forward_mux;

 #[cfg(not(any(target_os = "android", target_os = "ios")))]
 mod tray;
--- a/src/platform/android_ifaddrs.c
+++ b/src/platform/android_ifaddrs.c
@@ -1,404 +0,0 @@
-/*
- * getifaddrs()/freeifaddrs() for Android: bionic only exports them from API 24,
- * while the jniLibs are built against the API 21 sysroot (flutter/ndk_*.sh) and
- * webrtc-util calls them whenever WebRTC gathers ICE candidates.
- *
- * Only AF_INET and AF_INET6 entries are reported; the AF_PACKET ones the real
- * getifaddrs() also returns have no reader in this build.
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include <ifaddrs.h>
-#include <net/if.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
-/* Refuse a single netlink datagram larger than this rather than grow forever. */
-#define RD_NL_MAX_BUF (1024 * 1024)
-/* A dump that never terminates must not hang the caller. */
-#define RD_NL_MAX_DATAGRAMS 4096
-
-typedef int (*rd_nl_cb)(struct nlmsghdr *nlh, void *ctx);
-
-struct rd_link_info {
-    unsigned int index;
-    unsigned int flags;
-    char name[IFNAMSIZ + 1];
-};
-
-struct rd_link_table {
-    struct rd_link_info *items;
-    size_t len;
-    size_t cap;
-};
-
-/* One allocation per reported address; `ifa` first so freeifaddrs() can free
- * the node it is handed. */
-struct rd_ifaddrs_storage {
-    struct ifaddrs ifa;
-    struct sockaddr_storage addr;
-    struct sockaddr_storage netmask;
-    struct sockaddr_storage ifu;
-    char name[IFNAMSIZ + 1];
-};
-
-struct rd_addr_ctx {
-    const struct rd_link_table *links;
-    struct ifaddrs *head;
-    struct ifaddrs *tail;
-};
-
-static void rd_parse_rtattr(struct rtattr *rta, int len, struct rtattr **tb, int max)
-{
-    memset(tb, 0, sizeof(*tb) * ((size_t)max + 1));
-    for (; RTA_OK(rta, len); rta = RTA_NEXT(rta, len)) {
-        if (rta->rta_type <= (unsigned short)max && tb[rta->rta_type] == NULL)
-            tb[rta->rta_type] = rta;
-    }
-}
-
-/* `len` must stay signed: NLMSG_NEXT subtracts the *aligned* length, which
- * overshoots on an unaligned trailing message, and only a negative remainder
- * stops NLMSG_OK from reading past the buffer. */
-static int rd_nl_parse(char *buf, int len, unsigned short reply_type, unsigned int seq,
-                       rd_nl_cb cb, void *ctx, int *done)
-{
-    struct nlmsghdr *nlh = (struct nlmsghdr *)buf;
-
-    for (; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) {
-        if (nlh->nlmsg_seq != seq)
-            continue;
-        if (nlh->nlmsg_type == NLMSG_DONE) {
-            *done = 1;
-            return 0;
-        }
-        if (nlh->nlmsg_type == NLMSG_ERROR) {
-            struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(nlh);
-            if (nlh->nlmsg_len >= NLMSG_LENGTH(sizeof(*err)) && err->error != 0)
-                errno = -err->error;
-            else
-                errno = EIO;
-            return -1;
-        }
-        if (nlh->nlmsg_type != reply_type)
-            continue;
-        if (cb(nlh, ctx) != 0)
-            return -1;
-        /* A non-multipart reply is the whole answer; nothing follows it. */
-        if ((nlh->nlmsg_flags & NLM_F_MULTI) == 0) {
-            *done = 1;
-            return 0;
-        }
-    }
-    return 0;
-}
-
-static int rd_nl_dump(int fd, unsigned short request_type, unsigned short reply_type,
-                      unsigned int seq, rd_nl_cb cb, void *ctx)
-{
-    struct {
-        struct nlmsghdr nlh;
-        struct rtgenmsg gen;
-    } req;
-    struct sockaddr_nl kernel;
-    char *buf;
-    size_t cap = 8192;
-    int datagrams = 0;
-    int done = 0;
-    int rc = -1;
-    int saved;
-
-    memset(&req, 0, sizeof(req));
-    req.nlh.nlmsg_len = NLMSG_LENGTH(sizeof(req.gen));
-    req.nlh.nlmsg_type = request_type;
-    req.nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
-    req.nlh.nlmsg_seq = seq;
-    req.gen.rtgen_family = AF_UNSPEC;
-
-    memset(&kernel, 0, sizeof(kernel));
-    kernel.nl_family = AF_NETLINK;
-
-    for (;;) {
-        if (sendto(fd, &req, req.nlh.nlmsg_len, 0, (struct sockaddr *)&kernel,
-                   sizeof(kernel)) >= 0)
-            break;
-        if (errno != EINTR)
-            return -1;
-    }
-
-    buf = (char *)malloc(cap);
-    if (buf == NULL) {
-        errno = ENOMEM;
-        return -1;
-    }
-
-    while (!done) {
-        /* MSG_PEEK|MSG_TRUNC reports the datagram's real size, so an
-         * undersized buffer costs a resize instead of a silent truncation. */
-        ssize_t n = recv(fd, buf, cap, MSG_PEEK | MSG_TRUNC);
-        if (n < 0) {
-            if (errno == EINTR)
-                continue;
-            goto out;
-        }
-        if ((size_t)n > cap) {
-            char *grown;
-            if ((size_t)n > RD_NL_MAX_BUF) {
-                errno = EMSGSIZE;
-                goto out;
-            }
-            grown = (char *)realloc(buf, (size_t)n);
-            if (grown == NULL) {
-                errno = ENOMEM;
-                goto out;
-            }
-            buf = grown;
-            cap = (size_t)n;
-            continue;
-        }
-        n = recv(fd, buf, cap, 0);
-        if (n < 0) {
-            if (errno == EINTR)
-                continue;
-            goto out;
-        }
-        if (n == 0 || ++datagrams > RD_NL_MAX_DATAGRAMS) {
-            errno = EIO;
-            goto out;
-        }
-        if (rd_nl_parse(buf, (int)n, reply_type, seq, cb, ctx, &done) != 0)
-            goto out;
-    }
-    rc = 0;
-
-out:
-    saved = errno;
-    free(buf);
-    errno = saved;
-    return rc;
-}
-
-static int rd_link_cb(struct nlmsghdr *nlh, void *ctx)
-{
-    struct rd_link_table *t = (struct rd_link_table *)ctx;
-    struct ifinfomsg *ifi;
-    struct rtattr *tb[IFLA_IFNAME + 1];
-    struct rd_link_info *slot;
-    int payload;
-    int namelen;
-
-    if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*ifi)))
-        return 0;
-    ifi = (struct ifinfomsg *)NLMSG_DATA(nlh);
-    payload = (int)nlh->nlmsg_len - (int)NLMSG_SPACE(sizeof(*ifi));
-    if (payload < 0)
-        payload = 0;
-    rd_parse_rtattr(IFLA_RTA(ifi), payload, tb, IFLA_IFNAME);
-
-    /* An interface we cannot name is of no use: callers dereference ifa_name. */
-    if (tb[IFLA_IFNAME] == NULL || (int)RTA_PAYLOAD(tb[IFLA_IFNAME]) <= 0)
-        return 0;
-
-    if (t->len == t->cap) {
-        size_t ncap = t->cap ? t->cap * 2 : 16;
-        struct rd_link_info *items =
-            (struct rd_link_info *)realloc(t->items, ncap * sizeof(*items));
-        if (items == NULL) {
-            errno = ENOMEM;
-            return -1;
-        }
-        t->items = items;
-        t->cap = ncap;
-    }
-
-    slot = &t->items[t->len];
-    memset(slot, 0, sizeof(*slot));
-    slot->index = (unsigned int)ifi->ifi_index;
-    slot->flags = ifi->ifi_flags;
-    namelen = (int)RTA_PAYLOAD(tb[IFLA_IFNAME]);
-    if (namelen > IFNAMSIZ)
-        namelen = IFNAMSIZ;
-    memcpy(slot->name, RTA_DATA(tb[IFLA_IFNAME]), (size_t)namelen);
-    slot->name[namelen] = '\0';
-    t->len++;
-    return 0;
-}
-
-static const struct rd_link_info *rd_link_find(const struct rd_link_table *t,
-                                               unsigned int index)
-{
-    size_t i;
-    for (i = 0; i < t->len; i++) {
-        if (t->items[i].index == index)
-            return &t->items[i];
-    }
-    return NULL;
-}
-
-static void rd_fill_mask(unsigned char *out, int len, unsigned int prefix)
-{
-    int i;
-    if (prefix > (unsigned int)len * 8)
-        prefix = (unsigned int)len * 8;
-    for (i = 0; i < len; i++) {
-        if (prefix >= 8) {
-            out[i] = 0xff;
-            prefix -= 8;
-        } else if (prefix > 0) {
-            out[i] = (unsigned char)(0xff << (8 - prefix));
-            prefix = 0;
-        } else {
-            out[i] = 0;
-        }
-    }
-}
-
-static void rd_set_in(struct sockaddr_storage *ss, const void *addr)
-{
-    struct sockaddr_in *sin = (struct sockaddr_in *)ss;
-    sin->sin_family = AF_INET;
-    memcpy(&sin->sin_addr, addr, 4);
-}
-
-static int rd_addr_cb(struct nlmsghdr *nlh, void *ctx)
-{
-    struct rd_addr_ctx *c = (struct rd_addr_ctx *)ctx;
-    struct ifaddrmsg *ifa;
-    struct rtattr *tb[IFA_BROADCAST + 1];
-    struct rtattr *ra;
-    const struct rd_link_info *link;
-    struct rd_ifaddrs_storage *st;
-    int payload;
-
-    if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*ifa)))
-        return 0;
-    ifa = (struct ifaddrmsg *)NLMSG_DATA(nlh);
-    if (ifa->ifa_family != AF_INET && ifa->ifa_family != AF_INET6)
-        return 0;
-
-    /* Without the link entry there is no name, and callers deref ifa_name. */
-    link = rd_link_find(c->links, ifa->ifa_index);
-    if (link == NULL)
-        return 0;
-
-    payload = (int)nlh->nlmsg_len - (int)NLMSG_SPACE(sizeof(*ifa));
-    if (payload < 0)
-        payload = 0;
-    rd_parse_rtattr(IFA_RTA(ifa), payload, tb, IFA_BROADCAST);
-
-    /* On a point-to-point link IFA_ADDRESS holds the peer and IFA_LOCAL the
-     * local address; ipv6 only ever sets IFA_ADDRESS. */
-    if (ifa->ifa_family == AF_INET)
-        ra = tb[IFA_LOCAL] ? tb[IFA_LOCAL] : tb[IFA_ADDRESS];
-    else
-        ra = tb[IFA_ADDRESS] ? tb[IFA_ADDRESS] : tb[IFA_LOCAL];
-    if (ra == NULL)
-        return 0;
-    if ((int)RTA_PAYLOAD(ra) < (ifa->ifa_family == AF_INET ? 4 : 16))
-        return 0;
-
-    st = (struct rd_ifaddrs_storage *)calloc(1, sizeof(*st));
-    if (st == NULL) {
-        errno = ENOMEM;
-        return -1;
-    }
-
-    memcpy(st->name, link->name, sizeof(st->name));
-    st->ifa.ifa_name = st->name;
-    st->ifa.ifa_flags = link->flags;
-    st->ifa.ifa_addr = (struct sockaddr *)&st->addr;
-    st->ifa.ifa_netmask = (struct sockaddr *)&st->netmask;
-
-    if (ifa->ifa_family == AF_INET) {
-        struct sockaddr_in *mask = (struct sockaddr_in *)&st->netmask;
-
-        rd_set_in(&st->addr, RTA_DATA(ra));
-        mask->sin_family = AF_INET;
-        rd_fill_mask((unsigned char *)&mask->sin_addr, 4, ifa->ifa_prefixlen);
-
-        if ((link->flags & IFF_POINTOPOINT) && tb[IFA_ADDRESS] && tb[IFA_LOCAL] &&
-            (int)RTA_PAYLOAD(tb[IFA_ADDRESS]) >= 4 &&
-            memcmp(RTA_DATA(tb[IFA_ADDRESS]), RTA_DATA(tb[IFA_LOCAL]), 4) != 0) {
-            rd_set_in(&st->ifu, RTA_DATA(tb[IFA_ADDRESS]));
-            st->ifa.ifa_dstaddr = (struct sockaddr *)&st->ifu;
-        } else if (tb[IFA_BROADCAST] && (int)RTA_PAYLOAD(tb[IFA_BROADCAST]) >= 4) {
-            rd_set_in(&st->ifu, RTA_DATA(tb[IFA_BROADCAST]));
-            st->ifa.ifa_broadaddr = (struct sockaddr *)&st->ifu;
-        }
-    } else {
-        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&st->addr;
-        struct sockaddr_in6 *mask = (struct sockaddr_in6 *)&st->netmask;
-
-        sin6->sin6_family = AF_INET6;
-        memcpy(&sin6->sin6_addr, RTA_DATA(ra), 16);
-        /* A link-local address is not routable without its scope id. */
-        if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr) ||
-            IN6_IS_ADDR_MC_LINKLOCAL(&sin6->sin6_addr))
-            sin6->sin6_scope_id = ifa->ifa_index;
-        mask->sin6_family = AF_INET6;
-        rd_fill_mask((unsigned char *)&mask->sin6_addr, 16, ifa->ifa_prefixlen);
-    }
-
-    if (c->tail != NULL)
-        c->tail->ifa_next = &st->ifa;
-    else
-        c->head = &st->ifa;
-    c->tail = &st->ifa;
-    return 0;
-}
-
-void freeifaddrs(struct ifaddrs *ifa)
-{
-    while (ifa != NULL) {
-        struct ifaddrs *next = ifa->ifa_next;
-        free(ifa);
-        ifa = next;
-    }
-}
-
-int getifaddrs(struct ifaddrs **ifap)
-{
-    struct rd_link_table links;
-    struct rd_addr_ctx ctx;
-    int fd;
-    int saved;
-
-    if (ifap == NULL) {
-        errno = EINVAL;
-        return -1;
-    }
-    *ifap = NULL;
-
-    memset(&links, 0, sizeof(links));
-    memset(&ctx, 0, sizeof(ctx));
-    ctx.links = &links;
-
-    fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, NETLINK_ROUTE);
-    if (fd < 0)
-        return -1;
-
-    if (rd_nl_dump(fd, RTM_GETLINK, RTM_NEWLINK, 1, rd_link_cb, &links) != 0)
-        goto fail;
-    if (rd_nl_dump(fd, RTM_GETADDR, RTM_NEWADDR, 2, rd_addr_cb, &ctx) != 0)
-        goto fail;
-
-    close(fd);
-    free(links.items);
-    *ifap = ctx.head;
-    return 0;
-
-fail:
-    saved = errno;
-    close(fd);
-    free(links.items);
-    freeifaddrs(ctx.head);
-    errno = saved;
-    return -1;
-}
--- a/src/platform/windows.rs
+++ b/src/platform/windows.rs
@@ -1496,8 +1496,8 @@ pub fn rename_exe_cmd(src_exe: &str, path: &str) -> ResultType<String> {
        .ok_or(anyhow!("Can't get file name of {src_exe}"))?
        .to_string_lossy()
        .to_string();
-    let app_name = crate::get_app_name().to_lowercase();
-    if src_exe_filename.to_lowercase() == format!("{app_name}.exe") {
+    let app_name = crate::get_app_name();
+    if src_exe_filename == format!("{app_name}.exe") {
        Ok("".to_owned())
    } else {
        Ok(format!(
--- a/Show More
+++ b/Show More