fix: don't clear audit_guid during reconnect, clear it after connection established

Signed-off-by: 21pages <sunboeasy@gmail.com>
Fix: show ask-for-note dialog when user clicks OK on reconnecting screen (#14527 )
2026-04-15 10:01:27 +03:00 · 2026-03-15 23:00:46 +08:00 · 2026-03-12 15:18:50 +00:00 · 2026-03-12 15:12:58 +00:00
77 changed files with 449 additions and 1160 deletions
--- a/.github/workflows/winget.yml
+++ b/.github/workflows/winget.yml
@@ -0,0 +1,15 @@
+name: Publish to WinGet
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: vedantmgoyal9/winget-releaser@main
+        with:
+          identifier: RustDesk.RustDesk
+          version: "1.4.6"
+          release-tag: "1.4.6"
+          token: ${{ secrets.WINGET_TOKEN }}
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -33,12 +33,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
 [[package]]
 name = "aead"
 version = "0.5.2"
@@ -299,8 +293,8 @@ dependencies = [
 "image 0.25.1",
 "log",
 "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2-app-kit",
+ "objc2-foundation",
 "parking_lot",
 "percent-encoding",
 "serde 1.0.228",
@@ -643,7 +637,7 @@ dependencies = [
 "cc",
 "cfg-if 1.0.0",
 "libc",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
 "object",
 "rustc-demangle",
 ]
@@ -866,15 +860,6 @@ dependencies = [
 "objc2 0.5.2",
 ]

-[[package]]
-name = "block2"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
-dependencies = [
- "objc2 0.6.4",
-]
-
 [[package]]
 name = "blocking"
 version = "1.6.1"
@@ -1197,7 +1182,7 @@ dependencies = [
 "js-sys",
 "num-traits 0.2.19",
 "wasm-bindgen",
- "windows-link 0.1.1",
+ "windows-link",
 ]

 [[package]]
@@ -1305,8 +1290,8 @@ dependencies = [
 "lazy_static",
 "libc",
 "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2-app-kit",
+ "objc2-foundation",
 "once_cell",
 "parking_lot",
 "percent-encoding",
@@ -2231,15 +2216,6 @@ dependencies = [
 "dirs-sys 0.4.1",
 ]

-[[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys 0.5.0",
-]
-
 [[package]]
 name = "dirs-next"
 version = "2.0.0"
@@ -2257,7 +2233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
 "libc",
- "redox_users 0.4.5",
+ "redox_users",
 "winapi 0.3.9",
 ]

@@ -2269,22 +2245,10 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
 "libc",
 "option-ext",
- "redox_users 0.4.5",
+ "redox_users",
 "windows-sys 0.48.0",
 ]

-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users 0.5.2",
- "windows-sys 0.61.2",
-]
-
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -2292,7 +2256,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
 "libc",
- "redox_users 0.4.5",
+ "redox_users",
 "winapi 0.3.9",
 ]

@@ -2302,16 +2266,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"

-[[package]]
-name = "dispatch2"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
-dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.4",
-]
-
 [[package]]
 name = "displaydoc"
 version = "0.2.5"
@@ -2761,7 +2715,7 @@ dependencies = [
 "flume",
 "half",
 "lebe",
- "miniz_oxide 0.7.4",
+ "miniz_oxide",
 "rayon-core",
 "smallvec",
 "zune-inflate",
@@ -2847,12 +2801,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"

 [[package]]
 name = "flate2"
-version = "1.1.9"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
 "crc32fast",
- "miniz_oxide 0.8.9",
+ "miniz_oxide",
 ]

 [[package]]
@@ -4087,7 +4041,7 @@ dependencies = [
 "gif",
 "jpeg-decoder",
 "num-traits 0.2.19",
- "png 0.17.13",
+ "png",
 "qoi",
 "tiff",
 ]
@@ -4101,7 +4055,7 @@ dependencies = [
 "bytemuck",
 "byteorder",
 "num-traits 0.2.19",
- "png 0.17.13",
+ "png",
 "tiff",
 ]

@@ -4812,16 +4766,6 @@ dependencies = [
 "simd-adler32",
 ]

-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
- "simd-adler32",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.11"
@@ -4872,23 +4816,21 @@ dependencies = [

 [[package]]
 name = "muda"
-version = "0.17.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a"
+checksum = "86b959f97c97044e4c96e32e1db292a7d594449546a3c6b77ae613dc3a5b5145"
 dependencies = [
+ "cocoa 0.25.0",
 "crossbeam-channel",
 "dpi",
 "gtk",
 "keyboard-types",
 "libxdo",
- "objc2 0.6.4",
- "objc2-app-kit 0.3.2",
- "objc2-core-foundation",
- "objc2-foundation 0.3.2",
+ "objc",
 "once_cell",
- "png 0.17.13",
- "thiserror 2.0.17",
- "windows-sys 0.60.2",
+ "png",
+ "thiserror 1.0.61",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -5432,16 +5374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
 dependencies = [
 "objc-sys 0.3.5",
- "objc2-encode 4.1.0",
-]
-
-[[package]]
-name = "objc2"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
-dependencies = [
- "objc2-encode 4.1.0",
+ "objc2-encode 4.0.3",
 ]

 [[package]]
@@ -5456,22 +5389,10 @@ dependencies = [
 "objc2 0.5.2",
 "objc2-core-data",
 "objc2-core-image",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 "objc2-quartz-core",
 ]

-[[package]]
-name = "objc2-app-kit"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
-dependencies = [
- "bitflags 2.9.1",
- "objc2 0.6.4",
- "objc2-core-foundation",
- "objc2-foundation 0.3.2",
-]
-
 [[package]]
 name = "objc2-cloud-kit"
 version = "0.2.2"
@@ -5482,7 +5403,7 @@ dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
 "objc2-core-location",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5493,7 +5414,7 @@ checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
 dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5505,28 +5426,7 @@ dependencies = [
 "bitflags 2.9.1",
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
-]
-
-[[package]]
-name = "objc2-core-foundation"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
-dependencies = [
- "bitflags 2.9.1",
- "dispatch2",
- "objc2 0.6.4",
-]
-
-[[package]]
-name = "objc2-core-graphics"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
-dependencies = [
- "bitflags 2.9.1",
- "objc2-core-foundation",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5537,7 +5437,7 @@ checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
 dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 "objc2-metal",
 ]

@@ -5550,7 +5450,7 @@ dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
 "objc2-contacts",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5564,9 +5464,9 @@ dependencies = [

 [[package]]
 name = "objc2-encode"
-version = "4.1.0"
+version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"

 [[package]]
 name = "objc2-foundation"
@@ -5581,18 +5481,6 @@ dependencies = [
 "objc2 0.5.2",
 ]

-[[package]]
-name = "objc2-foundation"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
-dependencies = [
- "bitflags 2.9.1",
- "block2 0.6.2",
- "objc2 0.6.4",
- "objc2-core-foundation",
-]
-
 [[package]]
 name = "objc2-link-presentation"
 version = "0.2.2"
@@ -5601,8 +5489,8 @@ checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
 dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2-app-kit",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5614,7 +5502,7 @@ dependencies = [
 "bitflags 2.9.1",
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5626,7 +5514,7 @@ dependencies = [
 "bitflags 2.9.1",
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 "objc2-metal",
 ]

@@ -5637,7 +5525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
 dependencies = [
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5653,7 +5541,7 @@ dependencies = [
 "objc2-core-data",
 "objc2-core-image",
 "objc2-core-location",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 "objc2-link-presentation",
 "objc2-quartz-core",
 "objc2-symbols",
@@ -5669,7 +5557,7 @@ checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
 dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -5682,7 +5570,7 @@ dependencies = [
 "block2 0.5.1",
 "objc2 0.5.2",
 "objc2-core-location",
- "objc2-foundation 0.2.2",
+ "objc2-foundation",
 ]

 [[package]]
@@ -6290,20 +6178,7 @@ dependencies = [
 "crc32fast",
 "fdeflate",
 "flate2",
- "miniz_oxide 0.7.4",
-]
-
-[[package]]
-name = "png"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
-dependencies = [
- "bitflags 2.9.1",
- "crc32fast",
- "fdeflate",
- "flate2",
- "miniz_oxide 0.8.9",
+ "miniz_oxide",
 ]

 [[package]]
@@ -6988,17 +6863,6 @@ dependencies = [
 "thiserror 1.0.61",
 ]

-[[package]]
-name = "redox_users"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror 2.0.17",
-]
-
 [[package]]
 name = "regex"
 version = "1.11.1"
@@ -8117,8 +7981,8 @@ dependencies = [
 "log",
 "memmap2",
 "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2-app-kit",
+ "objc2-foundation",
 "objc2-quartz-core",
 "raw-window-handle 0.6.2",
 "redox_syscall 0.5.2",
@@ -8448,7 +8312,7 @@ dependencies = [
 "objc",
 "once_cell",
 "parking_lot",
- "png 0.17.13",
+ "png",
 "raw-window-handle 0.6.2",
 "scopeguard",
 "tao-macros",
@@ -8702,7 +8566,7 @@ dependencies = [
 "bytemuck",
 "cfg-if 1.0.0",
 "log",
- "png 0.17.13",
+ "png",
 "tiny-skia-path",
 ]

@@ -9075,22 +8939,21 @@ dependencies = [

 [[package]]
 name = "tray-icon"
-version = "0.21.3"
-source = "git+https://github.com/tauri-apps/tray-icon#0a5835b0e6828e37a1f781de9c2d671ae7a939e6"
+version = "0.14.3"
+source = "git+https://github.com/tauri-apps/tray-icon#d4078696edba67b0ab42cef67e6a421a0332c96f"
 dependencies = [
+ "core-graphics 0.23.2",
 "crossbeam-channel",
- "dirs 6.0.0",
+ "dirs 5.0.1",
 "libappindicator",
 "muda",
- "objc2 0.6.4",
- "objc2-app-kit 0.3.2",
- "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-foundation 0.3.2",
+ "objc2 0.5.2",
+ "objc2-app-kit",
+ "objc2-foundation",
 "once_cell",
- "png 0.18.1",
- "thiserror 2.0.17",
- "windows-sys 0.60.2",
+ "png",
+ "thiserror 1.0.61",
+ "windows-sys 0.52.0",
 ]

 [[package]]
@@ -10195,7 +10058,7 @@ dependencies = [
 "windows-collections",
 "windows-core 0.61.0",
 "windows-future",
- "windows-link 0.1.1",
+ "windows-link",
 "windows-numerics",
 ]

@@ -10244,7 +10107,7 @@ checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
 dependencies = [
 "windows-implement 0.60.0",
 "windows-interface 0.59.1",
- "windows-link 0.1.1",
+ "windows-link",
 "windows-result 0.3.2",
 "windows-strings 0.4.0",
 ]
@@ -10256,7 +10119,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
 dependencies = [
 "windows-core 0.61.0",
- "windows-link 0.1.1",
+ "windows-link",
 ]

 [[package]]
@@ -10309,12 +10172,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"

-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
 [[package]]
 name = "windows-numerics"
 version = "0.2.0"
@@ -10322,7 +10179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
 dependencies = [
 "windows-core 0.61.0",
- "windows-link 0.1.1",
+ "windows-link",
 ]

 [[package]]
@@ -10340,7 +10197,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link",
 ]

 [[package]]
@@ -10360,7 +10217,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link",
 ]

 [[package]]
@@ -10369,7 +10226,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
 dependencies = [
- "windows-link 0.1.1",
+ "windows-link",
 ]

 [[package]]
@@ -10399,24 +10256,6 @@ dependencies = [
 "windows-targets 0.52.6",
 ]

-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
-dependencies = [
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.42.2"
@@ -10456,30 +10295,13 @@ dependencies = [
 "windows_aarch64_gnullvm 0.52.6",
 "windows_aarch64_msvc 0.52.6",
 "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
 "windows_i686_msvc 0.52.6",
 "windows_x86_64_gnu 0.52.6",
 "windows_x86_64_gnullvm 0.52.6",
 "windows_x86_64_msvc 0.52.6",
 ]

-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link 0.2.1",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
-]
-
 [[package]]
 name = "windows-version"
 version = "0.1.1"
@@ -10516,12 +10338,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.32.0"
@@ -10552,12 +10368,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.32.0"
@@ -10588,24 +10398,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.32.0"
@@ -10636,12 +10434,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.32.0"
@@ -10672,12 +10464,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
@@ -10696,12 +10482,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.32.0"
@@ -10732,12 +10512,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winit"
 version = "0.30.9"
@@ -10762,8 +10536,8 @@ dependencies = [
 "memmap2",
 "ndk 0.9.0",
 "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2-app-kit",
+ "objc2-foundation",
 "objc2-ui-kit",
 "orbclient",
 "percent-encoding",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -160,7 +160,7 @@ piet-coregraphics = "0.6"
 foreign-types = "0.3"

 [target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
-tray-icon = { git = "https://github.com/tauri-apps/tray-icon", version = "0.21.3" }
+tray-icon = { git = "https://github.com/tauri-apps/tray-icon" }
 tao = { git = "https://github.com/rustdesk-org/tao", branch = "dev" }
 image = "0.24"

--- a/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
+++ b/flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/FloatingWindowService.kt
@@ -311,10 +311,7 @@ class FloatingWindowService : Service(), View.OnTouchListener {
             popupMenu.menu.add(0, idSyncClipboard, 0, translate("Update client clipboard"))
         }
         val idStopService = 2
-         val hideStopService = FFI.getBuildinOption("hide-stop-service") == "Y"
-         if (!hideStopService) {
         popupMenu.menu.add(0, idStopService, 0, translate("Stop service"))
-         }
         popupMenu.setOnMenuItemClickListener { menuItem ->
             when (menuItem.itemId) {
                 idShowRustDesk -> {
@@ -392,3 +389,4 @@ class FloatingWindowService : Service(), View.OnTouchListener {
        return false
    }
 }
+
--- a/flutter/android/app/src/main/kotlin/ffi.kt
+++ b/flutter/android/app/src/main/kotlin/ffi.kt
@@ -24,7 +24,6 @@ object FFI {
    external fun setFrameRawEnable(name: String, value: Boolean)
    external fun setCodecInfo(info: String)
    external fun getLocalOption(key: String): String
-    external fun getBuildinOption(key: String): String
    external fun onClipboardUpdate(clips: ByteBuffer)
    external fun isServiceClipboardEnabled(): Boolean
 }
--- a/flutter/build_fdroid.sh
+++ b/flutter/build_fdroid.sh
@@ -7,7 +7,7 @@
 #               2024, Vasyl Gello <vasek.gello@gmail.com>
 #

-# The script is invoked by F-Droid builder system step-by-step.
+# The script is invoked by F-Droid builder system ste-by-step.
 #
 # It accepts the following arguments:
 #
@@ -16,6 +16,7 @@
 # - Android architecture to build APK for: armeabi-v7a arm64-v8av x86 x86_64
 # - The build step to execute:
 #
+#   + sudo-deps: as root, install needed Debian packages into builder VM
 #   + prebuild: patch sources and do other stuff before the build
 #   + build: perform actual build of APK file
 #
@@ -183,9 +184,13 @@ prebuild)
 	fi

 	# Map NDK version to revision
-	NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json |
-		jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" |
-		sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')"
+
+	NDK_VERSION="$(wget \
+		-qO- \
+		-H "Accept: application/vnd.github+json" \
+		-H "X-GitHub-Api-Version: 2022-11-28" \
+		'https://api.github.com/repos/android/ndk/releases' |
+		jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")"

 	if [ -z "${NDK_VERSION}" ]; then
 		echo "ERROR: Can not map Android NDK codename to revision!" >&2
@@ -311,18 +316,6 @@ prebuild)
 	# `FLUTTER_BRIDGE_VERSION` an restore the pubspec later

 	if [ "${FLUTTER_VERSION}" != "${FLUTTER_BRIDGE_VERSION}" ]; then
-		# Find first libclang.so and set BRIDGE_LLVM_PATH
-
-		BRIDGE_LLVM_PATH="$(find /usr/lib/ -name libclang.so | head -n1)"
-
-		if [ -z "${BRIDGE_LLVM_PATH}" ]; then
-			echo 'ERROR: Can not find libclang.so for bridge generator!' >&2
-			exit 1
-		fi
-
-		BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")"
-		BRIDGE_LLVM_PATH="$(dirname "${BRIDGE_LLVM_PATH}")"
-
 		# Install Flutter bridge version

 		prepare_flutter "${FLUTTER_BRIDGE_VERSION}" "${HOME}/flutter"
@@ -351,8 +344,7 @@ prebuild)

 		flutter_rust_bridge_codegen \
 			--rust-input ./src/flutter_ffi.rs \
-			--dart-output ./flutter/lib/generated_bridge.dart \
-			--llvm-path "${BRIDGE_LLVM_PATH}"
+			--dart-output ./flutter/lib/generated_bridge.dart

 		# Add bridge files to save-list

@@ -363,15 +355,13 @@ prebuild)
 		git checkout '*'
 		git clean -dffx
 		git reset
-
-		unset BRIDGE_LLVM_PATH
 	fi

 	# Install Flutter version for RustDesk library build

 	prepare_flutter "${FLUTTER_VERSION}" "${HOME}/flutter"

-	# gms is not in these files now, but we still keep the following line for future reference(maybe).
+	# gms is not in thoes files now, but we still keep the following line for future reference(maybe).

 	sed \
 		-i \
@@ -424,9 +414,13 @@ build)
 		.github/workflows/flutter-build.yml)"

 	# Map NDK version to revision
-	NDK_VERSION="$(curl https://gitlab.com/fdroid/android-sdk-transparency-log/-/raw/master/signed/checksums.json |
-		jq -r ".\"https://dl.google.com/android/repository/android-ndk-${NDK_VERSION}-linux.zip\"[0].\"source.properties\"" |
-		sed -n -E 's/.*Pkg.Revision = ([0-9.]+).*/\1/p')"
+
+	NDK_VERSION="$(wget \
+		-qO- \
+		-H "Accept: application/vnd.github+json" \
+		-H "X-GitHub-Api-Version: 2022-11-28" \
+		'https://api.github.com/repos/android/ndk/releases' |
+		jq -r ".[] | select(.tag_name == \"${NDK_VERSION}\") | .body | match(\"ndkVersion \\\"(.*)\\\"\").captures[0].string")"

 	if [ -z "${NDK_VERSION}" ]; then
 		echo "ERROR: Can not map Android NDK codename to revision!" >&2
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -2377,9 +2377,8 @@ List<String>? urlLinkToCmdArgs(Uri uri) {
      final password = uri.path.substring("/".length);
      if (password.isNotEmpty) {
        Timer(Duration(seconds: 1), () async {
-          final ok =
-              await bind.mainSetPermanentPasswordWithResult(password: password);
-          showToast(translate(ok ? 'Successful' : 'Failed'));
+          await bind.mainSetPermanentPassword(password: password);
+          showToast(translate('Successful'));
        });
      }
    }
--- a/flutter/lib/consts.dart
+++ b/flutter/lib/consts.dart
@@ -175,7 +175,6 @@ const String kOptionEnableFlutterHttpOnRust = "enable-flutter-http-on-rust";
 const String kOptionHideServerSetting = "hide-server-settings";
 const String kOptionHideProxySetting = "hide-proxy-settings";
 const String kOptionHideWebSocketSetting = "hide-websocket-settings";
-const String kOptionHideStopService = "hide-stop-service";
 const String kOptionHideRemotePrinterSetting = "hide-remote-printer-settings";
 const String kOptionHideSecuritySetting = "hide-security-settings";
 const String kOptionHideNetworkSetting = "hide-network-settings";
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
@@ -908,17 +908,12 @@ class _DesktopHomePageState extends State<DesktopHomePage>
 }

 void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
-  final p0 = TextEditingController(text: "");
-  final p1 = TextEditingController(text: "");
+  final pw = await bind.mainGetPermanentPassword();
+  final p0 = TextEditingController(text: pw);
+  final p1 = TextEditingController(text: pw);
  var errMsg0 = "";
  var errMsg1 = "";
-  final localPasswordSet =
-      (await bind.mainGetCommon(key: "local-permanent-password-set")) == "true";
-  final permanentPasswordSet =
-      (await bind.mainGetCommon(key: "permanent-password-set")) == "true";
-  final presetPassword = permanentPasswordSet && !localPasswordSet;
-  var canSubmit = false;
-  final RxString rxPass = "".obs;
+  final RxString rxPass = pw.trim().obs;
  final rules = [
    DigitValidationRule(),
    UppercaseValidationRule(),
@@ -927,21 +922,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
    MinCharactersValidationRule(8),
  ];
  final maxLength = bind.mainMaxEncryptLen();
-  final statusTip = localPasswordSet
-      ? translate('password-hidden-tip')
-      : (presetPassword ? translate('preset-password-in-use-tip') : '');
-  final showStatusTipOnMobile =
-      statusTip.isNotEmpty && !isDesktop && !isWebDesktop;

  gFFI.dialogManager.show((setState, close, context) {
-    updateCanSubmit() {
-      canSubmit = p0.text.trim().isNotEmpty || p1.text.trim().isNotEmpty;
-    }
-
-    submit() async {
-      if (!canSubmit) {
-        return;
-      }
+    submit() {
      setState(() {
        errMsg0 = "";
        errMsg1 = "";
@@ -964,13 +947,7 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
        });
        return;
      }
-      final ok = await bind.mainSetPermanentPasswordWithResult(password: pass);
-      if (!ok) {
-        setState(() {
-          errMsg0 = '${translate('Prompt')}: ${translate("Failed")}';
-        });
-        return;
-      }
+      bind.mainSetPermanentPassword(password: pass);
      if (pass.isNotEmpty) {
        notEmptyCallback?.call();
      }
@@ -978,20 +955,14 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
    }

    return CustomAlertDialog(
-      title: Row(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Icon(Icons.key, color: MyTheme.accent),
-          Text(translate("Set Password")).paddingOnly(left: 10),
-        ],
-      ),
+      title: Text(translate("Set Password")),
      content: ConstrainedBox(
        constraints: const BoxConstraints(minWidth: 500),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
-            SizedBox(
-              height: showStatusTipOnMobile ? 0.0 : 6.0,
+            const SizedBox(
+              height: 8.0,
            ),
            Row(
              children: [
@@ -1007,7 +978,6 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
                      rxPass.value = value.trim();
                      setState(() {
                        errMsg0 = '';
-                        updateCanSubmit();
                      });
                    },
                    maxLength: maxLength,
@@ -1019,9 +989,9 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
              children: [
                Expanded(child: PasswordStrengthIndicator(password: rxPass)),
              ],
-            ).marginOnly(top: 2, bottom: showStatusTipOnMobile ? 2 : 8),
-            SizedBox(
-              height: showStatusTipOnMobile ? 0.0 : 8.0,
+            ).marginSymmetric(vertical: 8),
+            const SizedBox(
+              height: 8.0,
            ),
            Row(
              children: [
@@ -1035,7 +1005,6 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
                    onChanged: (value) {
                      setState(() {
                        errMsg1 = '';
-                        updateCanSubmit();
                      });
                    },
                    maxLength: maxLength,
@@ -1043,23 +1012,11 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
                ),
              ],
            ),
-            if (statusTip.isNotEmpty)
-              Row(
-                children: [
-                  Icon(Icons.info, color: Colors.amber, size: 18)
-                      .marginOnly(right: 6),
-                  Expanded(
-                      child: Text(
-                    statusTip,
-                    style: const TextStyle(fontSize: 13, height: 1.1),
-                  ))
-                ],
-              ).marginOnly(top: 6, bottom: 2),
-            SizedBox(
-              height: showStatusTipOnMobile ? 0.0 : 8.0,
+            const SizedBox(
+              height: 8.0,
            ),
            Obx(() => Wrap(
-                  runSpacing: showStatusTipOnMobile ? 2.0 : 8.0,
+                  runSpacing: 8,
                  spacing: 4,
                  children: rules.map((e) {
                    var checked = e.validate(rxPass.value.trim());
@@ -1079,67 +1036,11 @@ void setPasswordDialog({VoidCallback? notEmptyCallback}) async {
          ],
        ),
      ),
-      actions: (() {
-        final cancelButton = dialogButton(
-          "Cancel",
-          icon: Icon(Icons.close_rounded),
-          onPressed: close,
-          isOutline: true,
-        );
-        final removeButton = dialogButton(
-          "Remove",
-          icon: Icon(Icons.delete_outline_rounded),
-          onPressed: () async {
-            setState(() {
-              errMsg0 = "";
-              errMsg1 = "";
-            });
-            final ok =
-                await bind.mainSetPermanentPasswordWithResult(password: "");
-            if (!ok) {
-              setState(() {
-                errMsg0 = '${translate('Prompt')}: ${translate("Failed")}';
-              });
-              return;
-            }
-            close();
-          },
-          buttonStyle: ButtonStyle(
-              backgroundColor: MaterialStatePropertyAll(Colors.red)),
-        );
-        final okButton = dialogButton(
-          "OK",
-          icon: Icon(Icons.done_rounded),
-          onPressed: canSubmit ? submit : null,
-        );
-        if (!isDesktop && !isWebDesktop && localPasswordSet) {
-          return [
-            Align(
-              alignment: Alignment.centerRight,
-              child: FittedBox(
-                fit: BoxFit.scaleDown,
-                alignment: Alignment.centerRight,
-                child: Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    cancelButton,
-                    const SizedBox(width: 4),
-                    removeButton,
-                    const SizedBox(width: 4),
-                    okButton,
+      actions: [
+        dialogButton("Cancel", onPressed: close, isOutline: true),
+        dialogButton("OK", onPressed: submit),
      ],
-                ),
-              ),
-            ),
-          ];
-        }
-        return [
-          cancelButton,
-          if (localPasswordSet) removeButton,
-          okButton,
-        ];
-      })(),
-      onSubmit: canSubmit ? submit : null,
+      onSubmit: submit,
      onCancel: close,
    );
  });
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -458,16 +458,8 @@ class _GeneralState extends State<_General> {
      return const Offstage();
    }

-    final hideStopService =
-        bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
-
-    return Obx(() {
-      if (hideStopService && !serviceStop.value) {
-        return const Offstage();
-      }
-
    return _Card(title: 'Service', children: [
-        _Button(serviceStop.value ? 'Start' : 'Stop', () {
+      Obx(() => _Button(serviceStop.value ? 'Start' : 'Stop', () {
            () async {
              serviceBtnEnabled.value = false;
              await start_service(serviceStop.value);
@@ -476,9 +468,8 @@ class _GeneralState extends State<_General> {
                serviceBtnEnabled.value = true;
              });
            }();
-        }, enabled: serviceBtnEnabled.value)
+          }, enabled: serviceBtnEnabled.value))
    ]);
-    });
  }

  Widget other() {
@@ -1109,9 +1100,8 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
                            if (value ==
                                    passwordValues[passwordKeys
                                        .indexOf(kUsePermanentPassword)] &&
-                                (await bind.mainGetCommon(
-                                        key: "permanent-password-set")) !=
-                                    "true") {
+                                (await bind.mainGetPermanentPassword())
+                                    .isEmpty) {
                              if (isChangePermanentPasswordDisabled()) {
                                await callback();
                                return;
--- a/flutter/lib/mobile/pages/server_page.dart
+++ b/flutter/lib/mobile/pages/server_page.dart
@@ -150,8 +150,7 @@ class _DropDownAction extends StatelessWidget {
            }

            if (value == kUsePermanentPassword &&
-                (await bind.mainGetCommon(key: "permanent-password-set")) !=
-                    "true") {
+                (await bind.mainGetPermanentPassword()).isEmpty) {
              if (isChangePermanentPasswordDisabled()) {
                callback();
                return;
@@ -583,13 +582,10 @@ class _PermissionCheckerState extends State<PermissionChecker> {
  Widget build(BuildContext context) {
    final serverModel = Provider.of<ServerModel>(context);
    final hasAudioPermission = androidVersion >= 30;
-    final hideStopService =
-        isAndroid &&
-            bind.mainGetBuildinOption(key: kOptionHideStopService) == 'Y';
    return PaddingCard(
        title: translate("Permissions"),
        child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
-          serverModel.mediaOk && !hideStopService
+          serverModel.mediaOk
              ? ElevatedButton.icon(
                      style: ButtonStyle(
                          backgroundColor:
@@ -599,7 +595,6 @@ class _PermissionCheckerState extends State<PermissionChecker> {
                      label: Text(translate("Stop service")))
                  .marginOnly(bottom: 8)
              : SizedBox.shrink(),
-          if (!hideStopService || !serverModel.mediaOk)
          PermissionRow(
              translate("Screen Capture"),
              serverModel.mediaOk,
--- a/flutter/lib/mobile/widgets/dialog.dart
+++ b/flutter/lib/mobile/widgets/dialog.dart
@@ -12,6 +12,100 @@ void _showSuccess() {
  showToast(translate("Successful"));
 }

+void _showError() {
+  showToast(translate("Error"));
+}
+
+void setPermanentPasswordDialog(OverlayDialogManager dialogManager) async {
+  final pw = await bind.mainGetPermanentPassword();
+  final p0 = TextEditingController(text: pw);
+  final p1 = TextEditingController(text: pw);
+  var validateLength = false;
+  var validateSame = false;
+  dialogManager.show((setState, close, context) {
+    submit() async {
+      close();
+      dialogManager.showLoading(translate("Waiting"));
+      if (await gFFI.serverModel.setPermanentPassword(p0.text)) {
+        dialogManager.dismissAll();
+        _showSuccess();
+      } else {
+        dialogManager.dismissAll();
+        _showError();
+      }
+    }
+
+    return CustomAlertDialog(
+      title: Column(
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          Icon(Icons.password_rounded, color: MyTheme.accent),
+          Text(translate('Set your own password')).paddingOnly(left: 10),
+        ],
+      ),
+      content: Form(
+          autovalidateMode: AutovalidateMode.onUserInteraction,
+          child: Column(mainAxisSize: MainAxisSize.min, children: [
+            TextFormField(
+              autofocus: true,
+              obscureText: true,
+              keyboardType: TextInputType.visiblePassword,
+              decoration: InputDecoration(
+                labelText: translate('Password'),
+              ),
+              controller: p0,
+              validator: (v) {
+                if (v == null) return null;
+                final val = v.trim().length > 5;
+                if (validateLength != val) {
+                  // use delay to make setState success
+                  Future.delayed(Duration(microseconds: 1),
+                      () => setState(() => validateLength = val));
+                }
+                return val
+                    ? null
+                    : translate('Too short, at least 6 characters.');
+              },
+            ).workaroundFreezeLinuxMint(),
+            TextFormField(
+              obscureText: true,
+              keyboardType: TextInputType.visiblePassword,
+              decoration: InputDecoration(
+                labelText: translate('Confirmation'),
+              ),
+              controller: p1,
+              validator: (v) {
+                if (v == null) return null;
+                final val = p0.text == v;
+                if (validateSame != val) {
+                  Future.delayed(Duration(microseconds: 1),
+                      () => setState(() => validateSame = val));
+                }
+                return val
+                    ? null
+                    : translate('The confirmation is not identical.');
+              },
+            ).workaroundFreezeLinuxMint(),
+          ])),
+      onCancel: close,
+      onSubmit: (validateLength && validateSame) ? submit : null,
+      actions: [
+        dialogButton(
+          'Cancel',
+          icon: Icon(Icons.close_rounded),
+          onPressed: close,
+          isOutline: true,
+        ),
+        dialogButton(
+          'OK',
+          icon: Icon(Icons.done_rounded),
+          onPressed: (validateLength && validateSame) ? submit : null,
+        ),
+      ],
+    );
+  });
+}
+
 void setTemporaryPasswordLengthDialog(
    OverlayDialogManager dialogManager) async {
  List<String> lengths = ['6', '8', '10'];
--- a/flutter/lib/models/server_model.dart
+++ b/flutter/lib/models/server_model.dart
@@ -471,6 +471,17 @@ class ServerModel with ChangeNotifier {
    WakelockManager.disable(_wakelockKey);
  }

+  Future<bool> setPermanentPassword(String newPW) async {
+    await bind.mainSetPermanentPassword(password: newPW);
+    await Future.delayed(Duration(milliseconds: 500));
+    final pw = await bind.mainGetPermanentPassword();
+    if (newPW == pw) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
  fetchID() async {
    final id = await bind.mainGetMyId();
    if (id != _serverId.id) {
--- a/flutter/lib/web/bridge.dart
+++ b/flutter/lib/web/bridge.dart
@@ -1159,6 +1159,10 @@ class RustdeskImpl {
    return Future.value('');
  }

+  Future<String> mainGetPermanentPassword({dynamic hint}) {
+    return Future.value('');
+  }
+
  Future<String> mainGetFingerprint({dynamic hint}) {
    return Future.value('');
  }
@@ -1342,9 +1346,9 @@ class RustdeskImpl {
    throw UnimplementedError("mainUpdateTemporaryPassword");
  }

-  Future<bool> mainSetPermanentPasswordWithResult(
+  Future<void> mainSetPermanentPassword(
      {required String password, dynamic hint}) {
-    throw UnimplementedError("mainSetPermanentPasswordWithResult");
+    throw UnimplementedError("mainSetPermanentPassword");
  }

  Future<bool> mainCheckSuperUserPermission({dynamic hint}) {
--- a/libs/hbb_common
+++ b/libs/hbb_common
--- a/src/client.rs
+++ b/src/client.rs
@@ -119,13 +119,10 @@ pub const LOGIN_MSG_NO_PASSWORD_ACCESS: &str = "No Password Access";
 pub const LOGIN_MSG_OFFLINE: &str = "Offline";
 pub const LOGIN_SCREEN_WAYLAND: &str = "Wayland login screen is not supported";
 #[cfg(target_os = "linux")]
-pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "ubuntu-21-04-required";
+pub const SCRAP_UBUNTU_HIGHER_REQUIRED: &str = "Wayland requires Ubuntu 21.04 or higher version.";
 #[cfg(target_os = "linux")]
 pub const SCRAP_OTHER_VERSION_OR_X11_REQUIRED: &str =
-    "wayland-requires-higher-linux-version";
-#[cfg(target_os = "linux")]
-pub const SCRAP_XDP_PORTAL_UNAVAILABLE: &str =
-    "xdp-portal-unavailable";
+    "Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.";
 pub const SCRAP_X11_REQUIRED: &str = "x11 expected";
 pub const SCRAP_X11_REF_URL: &str = "https://rustdesk.com/docs/en/manual/linux/#x11-required";

--- a/src/core_main.rs
+++ b/src/core_main.rs
@@ -213,7 +213,7 @@ pub fn core_main() -> Option<Vec<String>> {
                    }
                    Ok(false) => "Update failed!".to_string(),
                    Ok(true) => match platform::update_me(false) {
-                        Ok(_) => "Updated successfully!".to_string(),
+                        Ok(_) => "Update successfully!".to_string(),
                        Err(err) => {
                            log::error!("Failed with error: {err}");
                            "Update failed!".to_string()
@@ -335,8 +335,8 @@ pub fn core_main() -> Option<Vec<String>> {
                    log::info!("Starting update process...");
                    let _text = match platform::update_me() {
                        Ok(_) => {
-                            println!("{}", translate("Updated successfully!".to_string()));
-                            log::info!("Updated successfully!");
+                            println!("{}", translate("Update successfully!".to_string()));
+                            log::info!("Update successfully!");
                        }
                        Err(err) => {
                            eprintln!("Update failed with error: {}", err);
--- a/src/flutter_ffi.rs
+++ b/src/flutter_ffi.rs
@@ -1693,8 +1693,8 @@ pub fn main_get_temporary_password() -> String {
    ui_interface::temporary_password()
 }

-pub fn main_set_permanent_password_with_result(password: String) -> bool {
-    ui_interface::set_permanent_password_with_result(password)
+pub fn main_get_permanent_password() -> String {
+    ui_interface::permanent_password()
 }

 pub fn main_get_fingerprint() -> String {
@@ -2072,6 +2072,10 @@ pub fn main_update_temporary_password() {
    update_temporary_password();
 }

+pub fn main_set_permanent_password(password: String) {
+    set_permanent_password(password);
+}
+
 pub fn main_check_super_user_permission() -> bool {
    check_super_user_permission()
 }
@@ -2419,23 +2423,16 @@ pub fn is_disable_installation() -> SyncReturn<bool> {
 }

 pub fn is_preset_password() -> bool {
-    let hard = config::HARD_SETTINGS
+    config::HARD_SETTINGS
        .read()
        .unwrap()
        .get("password")
-        .cloned()
-        .unwrap_or_default();
-    if hard.is_empty() {
-        return false;
-    }
-
-    // On desktop, service owns the authoritative config; query it via IPC and return only a boolean.
+        .map_or(false, |p| {
            #[cfg(not(any(target_os = "android", target_os = "ios")))]
-    return crate::ipc::is_permanent_password_preset();
-
-    // On mobile, we have no service IPC; verify against local storage.
+            return p == &crate::ipc::get_permanent_password();
            #[cfg(any(target_os = "android", target_os = "ios"))]
-    return config::Config::matches_permanent_password_plain(&hard);
+            return p == &config::Config::get_permanent_password();
+        })
 }

 // Don't call this function for desktop version.
@@ -2771,10 +2768,6 @@ pub fn main_get_common(key: String) -> String {
        return crate::platform::linux::has_gnome_shortcuts_inhibitor_permission().to_string();
        #[cfg(not(target_os = "linux"))]
        return false.to_string();
-    } else if key == "permanent-password-set" {
-        return ui_interface::is_permanent_password_set().to_string();
-    } else if key == "local-permanent-password-set" {
-        return ui_interface::is_local_permanent_password_set().to_string();
    } else {
        if key.starts_with("download-data-") {
            let id = key.replace("download-data-", "");
@@ -3056,22 +3049,6 @@ pub mod server_side {
        return env.new_string(res).unwrap_or_default().into_raw();
    }

-    #[no_mangle]
-    pub unsafe extern "system" fn Java_ffi_FFI_getBuildinOption(
-        env: JNIEnv,
-        _class: JClass,
-        key: JString,
-    ) -> jstring {
-        let mut env = env;
-        let res = if let Ok(key) = env.get_string(&key) {
-            let key: String = key.into();
-            super::get_builtin_option(&key)
-        } else {
-            "".into()
-        };
-        return env.new_string(res).unwrap_or_default().into_raw();
-    }
-
    #[no_mangle]
    pub unsafe extern "system" fn Java_ffi_FFI_isServiceClipboardEnabled(
        env: JNIEnv,
--- a/src/ipc.rs
+++ b/src/ipc.rs
@@ -632,29 +632,8 @@ async fn handle(data: Data, stream: &mut Connection) {
                    value = Some(Config::get_id());
                } else if name == "temporary-password" {
                    value = Some(password::temporary_password());
-                } else if name == "permanent-password-storage-and-salt" {
-                    let (storage, salt) = Config::get_local_permanent_password_storage_and_salt();
-                    value = Some(storage + "\n" + &salt);
-                } else if name == "permanent-password-set" {
-                    value = Some(if Config::has_permanent_password() {
-                        "Y".to_owned()
-                    } else {
-                        "N".to_owned()
-                    });
-                } else if name == "permanent-password-is-preset" {
-                    let hard = config::HARD_SETTINGS
-                        .read()
-                        .unwrap()
-                        .get("password")
-                        .cloned()
-                        .unwrap_or_default();
-                    let is_preset =
-                        !hard.is_empty() && Config::matches_permanent_password_plain(&hard);
-                    value = Some(if is_preset {
-                        "Y".to_owned()
-                    } else {
-                        "N".to_owned()
-                    });
+                } else if name == "permanent-password" {
+                    value = Some(Config::get_permanent_password());
                } else if name == "salt" {
                    value = Some(Config::get_salt());
                } else if name == "rendezvous_server" {
@@ -690,24 +669,13 @@ async fn handle(data: Data, stream: &mut Connection) {
                allow_err!(stream.send(&Data::Config((name, value))).await);
            }
            Some(value) => {
-                let mut updated = true;
                if name == "id" {
                    Config::set_key_confirmed(false);
                    Config::set_id(&value);
                } else if name == "temporary-password" {
                    password::update_temporary_password();
                } else if name == "permanent-password" {
-                    if Config::is_disable_change_permanent_password() {
-                        log::warn!("Changing permanent password is disabled");
-                        updated = false;
-                    } else {
                    Config::set_permanent_password(&value);
-                    }
-                    // Explicitly ACK/NACK permanent-password writes. This allows UIs/FFI to
-                    // distinguish "accepted by daemon" vs "IPC send succeeded" without
-                    // reading back any secret.
-                    let ack = if updated { "Y" } else { "N" }.to_owned();
-                    allow_err!(stream.send(&Data::Config((name.clone(), Some(ack)))).await);
                } else if name == "salt" {
                    Config::set_salt(&value);
                } else if name == "voice-call-input" {
@@ -717,10 +685,8 @@ async fn handle(data: Data, stream: &mut Connection) {
                } else {
                    return;
                }
-                if updated {
                log::info!("{} updated", name);
            }
-            }
        },
        Data::Options(value) => match value {
            None => {
@@ -1177,57 +1143,13 @@ pub fn update_temporary_password() -> ResultType<()> {
    set_config("temporary-password", "".to_owned())
 }

-fn apply_permanent_password_storage_and_salt_payload(payload: Option<&str>) -> ResultType<()> {
-    let Some(payload) = payload else {
-        return Ok(());
-    };
-    let Some((storage, salt)) = payload.split_once('\n') else {
-        bail!("Invalid permanent-password-storage-and-salt payload");
-    };
-
-    if storage.is_empty() {
-        Config::set_permanent_password_storage_for_sync("", "")?;
-        return Ok(());
+pub fn get_permanent_password() -> String {
+    if let Ok(Some(v)) = get_config("permanent-password") {
+        Config::set_permanent_password(&v);
+        v
+    } else {
+        Config::get_permanent_password()
    }
-
-    Config::set_permanent_password_storage_for_sync(storage, salt)?;
-    Ok(())
-}
-
-pub fn sync_permanent_password_storage_from_daemon() -> ResultType<()> {
-    let v = get_config("permanent-password-storage-and-salt")?;
-    apply_permanent_password_storage_and_salt_payload(v.as_deref())
-}
-
-async fn sync_permanent_password_storage_from_daemon_async() -> ResultType<()> {
-    let ms_timeout = 1_000;
-    let v = get_config_async("permanent-password-storage-and-salt", ms_timeout).await?;
-    apply_permanent_password_storage_and_salt_payload(v.as_deref())
-}
-
-pub fn is_permanent_password_set() -> bool {
-    match get_config("permanent-password-set") {
-        Ok(Some(v)) => {
-            let v = v.trim();
-            return v == "Y";
-        }
-        Ok(None) => {
-            // No response/value (timeout).
-        }
-        Err(_) => {
-            // Connection error.
-        }
-    }
-    log::warn!("Failed to query permanent password state from daemon");
-    false
-}
-
-pub fn is_permanent_password_preset() -> bool {
-    if let Ok(Some(v)) = get_config("permanent-password-is-preset") {
-        let v = v.trim();
-        return v == "Y";
-    }
-    false
 }

 pub fn get_fingerprint() -> String {
@@ -1237,41 +1159,8 @@ pub fn get_fingerprint() -> String {
 }

 pub fn set_permanent_password(v: String) -> ResultType<()> {
-    if Config::is_disable_change_permanent_password() {
-        bail!("Changing permanent password is disabled");
-    }
-    if set_permanent_password_with_ack(v)? {
-        Ok(())
-    } else {
-        bail!("Changing permanent password was rejected by daemon");
-    }
-}
-
-#[tokio::main(flavor = "current_thread")]
-pub async fn set_permanent_password_with_ack(v: String) -> ResultType<bool> {
-    set_permanent_password_with_ack_async(v).await
-}
-
-async fn set_permanent_password_with_ack_async(v: String) -> ResultType<bool> {
-    // The daemon ACK/NACK is expected quickly since it applies the config in-process.
-    let ms_timeout = 1_000;
-    let mut c = connect(ms_timeout, "").await?;
-    c.send_config("permanent-password", v).await?;
-    if let Some(Data::Config((name2, Some(v)))) = c.next_timeout(ms_timeout).await? {
-        if name2 == "permanent-password" {
-            let v = v.trim();
-            let ok = v == "Y";
-            if ok {
-                // Ensure the hashed permanent password storage is written to the user config file.
-                // This sync must not affect the daemon ACK outcome.
-                if let Err(err) = sync_permanent_password_storage_from_daemon_async().await {
-                    log::warn!("Failed to sync permanent password storage from daemon: {err}");
-                }
-            }
-            return Ok(ok);
-        }
-    }
-    Ok(false)
+    Config::set_permanent_password(&v);
+    set_config("permanent-password", v)
 }

 #[cfg(feature = "flutter")]
--- a/src/lang/ar.rs
+++ b/src/lang/ar.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "اعدادات لوحة المفاتيح"),
        ("Full Access", "وصول كامل"),
        ("Screen Share", "مشاركة الشاشة"),
-        ("ubuntu-21-04-required", "Wayland يتطلب نسخة ابونتو 21.04 او اعلى."),
-        ("wayland-requires-higher-linux-version", "Wayland يتطلب نسخة اعلى من توزيعة لينكس. الرجاء تجربة سطح مكتب X11 او غير نظام تشغيلك."),
-        ("xdp-portal-unavailable", "لاقط شاشة Wayland فشل. بوابة سطح مكتب XDG ربما توقفت عن العمل او حدث خطأ بها. جرب اعادة تشغليها عن طريق 'systemctl --user restart xdg-desktop-portal'."),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland يتطلب نسخة ابونتو 21.04 او اعلى."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland يتطلب نسخة اعلى من توزيعة لينكس. الرجاء تجربة سطح مكتب X11 او غير نظام تشغيلك."),
        ("JumpLink", "رابط القفز"),
        ("Please Select the screen to be shared(Operate on the peer side).", "الرجاء اختيار شاشة لمشاركتها (تعمل على جانب القرين)."),
        ("Show RustDesk", "عرض RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "متابعة مع {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/be.rs
+++ b/src/lang/be.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Налады клавіятуры"),
        ("Full Access", "Поўны доступ"),
        ("Screen Share", "Дэманстрацыя экрана"),
-        ("ubuntu-21-04-required", "Wayland патрабуе Ubuntu версіі 21.04 або навейшай."),
-        ("wayland-requires-higher-linux-version", "Для Wayland патрабуецца вышэйшая версія дыстрыбутыву Linux. Карыстайцеся працоўным сталом X11 або зменіце сваю АС."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland патрабуе Ubuntu версіі 21.04 або навейшай."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Для Wayland патрабуецца вышэйшая версія дыстрыбутыву Linux. Карыстайцеся працоўным сталом X11 або зменіце сваю АС."),
        ("JumpLink", "Перайсці па спасылцы"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Выберыце экран для дэманстрацыі (кіруецца аддаленай стараной)."),
        ("Show RustDesk", "Паказаць RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Працягнуць з {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/bg.rs
+++ b/src/lang/bg.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Настройки на клавиатурата"),
        ("Full Access", "Пълен достъп"),
        ("Screen Share", "Споделяне на екрана"),
-        ("ubuntu-21-04-required", "Wayland изисква Ubuntu 21.04 или по-нов"),
-        ("wayland-requires-higher-linux-version", "Wayland изисква по-нов Linux. Моля, опитайте с X11 или сменете операционната система."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland изисква Ubuntu 21.04 или по-нов"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland изисква по-нов Linux. Моля, опитайте с X11 или сменете операционната система."),
        ("JumpLink", "Препратка"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Моля, изберете екрана, който да бъде споделен (спрямо отдалечената страна)."),
        ("Show RustDesk", "Покажи RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Продължи с {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ca.rs
+++ b/src/lang/ca.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Configuració del teclat"),
        ("Full Access", "Accés complet"),
        ("Screen Share", "Compartició de pantalla"),
-        ("ubuntu-21-04-required", "Wayland requereix Ubuntu 21.04 o superior"),
-        ("wayland-requires-higher-linux-version", "Wayland requereix una versió superior de sistema Linux per a funcionar. Proveu iniciant un entorn d'escriptori amb x11 o actualitzeu el vostre sistema operatiu."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requereix Ubuntu 21.04 o superior"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requereix una versió superior de sistema Linux per a funcionar. Proveu iniciant un entorn d'escriptori amb x11 o actualitzeu el vostre sistema operatiu."),
        ("JumpLink", "Marcador"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Seleccioneu la pantalla que compartireu (quina serà visible al client)"),
        ("Show RustDesk", "Mostra el RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Continua amb {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "键盘设置"),
        ("Full Access", "完全访问"),
        ("Screen Share", "仅共享屏幕"),
-        ("ubuntu-21-04-required", "Wayland 需要 Ubuntu 21.04 或更高版本。"),
-        ("wayland-requires-higher-linux-version", "Wayland 需要更高版本的 linux 发行版。 请尝试 X11 桌面或更改您的操作系统。"),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland 需要 Ubuntu 21.04 或更高版本。"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland 需要更高版本的 linux 发行版。 请尝试 X11 桌面或更改您的操作系统。"),
        ("JumpLink", "查看"),
        ("Please Select the screen to be shared(Operate on the peer side).", "请选择要分享的画面（对端操作）。"),
        ("Show RustDesk", "显示 RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "传入会话期间保持屏幕常亮"),
        ("Continue with {}", "使用 {} 登录"),
        ("Display Name", "显示名称"),
-        ("password-hidden-tip", "永久密码已设置（已隐藏）"),
-        ("preset-password-in-use-tip", "当前使用预设密码"),
    ].iter().cloned().collect();
 }
--- a/src/lang/cs.rs
+++ b/src/lang/cs.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Nastavení klávesnice"),
        ("Full Access", "Úplný přístup"),
        ("Screen Share", "Sdílení obrazovky"),
-        ("ubuntu-21-04-required", "Wayland vyžaduje Ubuntu 21.04, nebo vyšší verzi."),
-        ("wayland-requires-higher-linux-version", "Wayland vyžaduje vyšší verzi linuxové distribuce. Zkuste prosím X11 desktop, nebo změňte OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vyžaduje Ubuntu 21.04, nebo vyšší verzi."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vyžaduje vyšší verzi linuxové distribuce. Zkuste prosím X11 desktop, nebo změňte OS."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Vyberte prosím obrazovku, kterou chcete sdílet (Ovládejte na straně protistrany)."),
        ("Show RustDesk", "Zobrazit RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Pokračovat s {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/da.rs
+++ b/src/lang/da.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Tastaturindstillinger"),
        ("Full Access", "Fuld adgang"),
        ("Screen Share", "Skærmdeling"),
-        ("ubuntu-21-04-required", "Wayland kræver Ubuntu version 21.04 eller nyere."),
-        ("wayland-requires-higher-linux-version", "Wayland kræver en højere version af Linux distro. Prøv venligst X11 desktop eller skift dit OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland kræver Ubuntu version 21.04 eller nyere."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland kræver en højere version af Linux distro. Prøv venligst X11 desktop eller skift dit OS."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Vælg venligst den skærm, der skal deles (Betjen på modtagersiden)."),
        ("Show RustDesk", "Vis RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Fortsæt med {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/de.rs
+++ b/src/lang/de.rs
@@ -377,10 +377,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Tastatureinstellungen"),
        ("Full Access", "Vollzugriff"),
        ("Screen Share", "Bildschirmfreigabe"),
-        ("ubuntu-21-04-required", "Wayland erfordert Ubuntu 21.04 oder eine höhere Version."),
-        ("wayland-requires-higher-linux-version", "Wayland erfordert eine höhere Version der Linux-Distribution. Bitte versuchen Sie den X11-Desktop oder ändern Sie Ihr Betriebssystem."),
-        ("xdp-portal-unavailable", "Die Bildschirmaufnahme mit Wayland ist fehlgeschlagen. Das XDG-Desktop-Portal ist möglicherweise abgestürzt oder nicht verfügbar. Versuchen Sie, es mit `systemctl --user restart xdg-desktop-portal` neu zu starten."),
-        ("JumpLink", "Anzeigen"),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland erfordert Ubuntu 21.04 oder eine höhere Version."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland erfordert eine höhere Version der Linux-Distribution. Bitte versuchen Sie den X11-Desktop oder ändern Sie Ihr Betriebssystem."),
+        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Bitte wählen Sie den freizugebenden Bildschirm aus (Bedienung auf der Gegenseite)."),
        ("Show RustDesk", "RustDesk anzeigen"),
        ("This PC", "Dieser PC"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Bildschirm während eingehender Sitzungen aktiv halten"),
        ("Continue with {}", "Fortfahren mit {}"),
        ("Display Name", "Anzeigename"),
-        ("password-hidden-tip", "Ein permanentes Passwort wurde festgelegt (ausgeblendet)."),
-        ("preset-password-in-use-tip", "Das voreingestellte Passwort wird derzeit verwendet."),
    ].iter().cloned().collect();
 }
--- a/src/lang/el.rs
+++ b/src/lang/el.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Ρυθμίσεις πληκτρολογίου"),
        ("Full Access", "Πλήρης πρόσβαση"),
        ("Screen Share", "Κοινή χρήση οθόνης"),
-        ("ubuntu-21-04-required", "Το Wayland απαιτεί Ubuntu 21.04 ή νεότερη έκδοση."),
-        ("wayland-requires-higher-linux-version", "Το Wayland απαιτεί υψηλότερη έκδοση διανομής του linux. Δοκιμάστε την επιφάνεια εργασίας X11 ή αλλάξτε το λειτουργικό σας σύστημα."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Το Wayland απαιτεί Ubuntu 21.04 ή νεότερη έκδοση."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Το Wayland απαιτεί υψηλότερη έκδοση διανομής του linux. Δοκιμάστε την επιφάνεια εργασίας X11 ή αλλάξτε το λειτουργικό σας σύστημα."),
        ("JumpLink", "Σύνδεσμος μετάβασης"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Επιλέξτε την οθόνη που θέλετε να μοιραστείτε (Λειτουργία στην πλευρά του απομακρυσμένου σταθμού)."),
        ("Show RustDesk", "Εμφάνιση του RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Διατήρηση ενεργής οθόνης κατά τη διάρκεια των εισερχόμενων συνεδριών"),
        ("Continue with {}", "Συνέχεια με {}"),
        ("Display Name", "Εμφανιζόμενο όνομα"),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/en.rs
+++ b/src/lang/en.rs
@@ -120,9 +120,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Keyboard settings"),
        ("Full Access", "Full access"),
        ("Screen Share", "Screen share"),
-        ("ubuntu-21-04-required", "Wayland requires Ubuntu 21.04 or higher version."),
-        ("wayland-requires-higher-linux-version", "Wayland requires higher version of linux distro. Please try X11 desktop or change your OS."),
-        ("xdp-portal-unavailable", "Wayland screen capture failed. The XDG Desktop Portal may have crashed or is unavailable. Try restarting it with `systemctl --user restart xdg-desktop-portal`."),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Please select the screen to be shared(Operate on the peer side)."),
        ("One-time Password", "One-time password"),
@@ -272,7 +269,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("rel-mouse-permission-lost-tip", "Keyboard permission was revoked. Relative Mouse Mode has been disabled."),
        ("keep-awake-during-outgoing-sessions-label", "Keep screen awake during outgoing sessions"),
        ("keep-awake-during-incoming-sessions-label", "Keep screen awake during incoming sessions"),
-        ("password-hidden-tip", "Permanent password is set (hidden)."),
-        ("preset-password-in-use-tip", "Preset password is currently in use."),
    ].iter().cloned().collect();
 }
--- a/src/lang/eo.rs
+++ b/src/lang/eo.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", ""),
        ("Full Access", ""),
        ("Screen Share", ""),
-        ("ubuntu-21-04-required", "Wayland postulas Ubuntu 21.04 aŭ pli altan version."),
-        ("wayland-requires-higher-linux-version", "Wayland postulas pli altan version de linuksa distro. Bonvolu provi X11-labortablon aŭ ŝanĝi vian OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland postulas Ubuntu 21.04 aŭ pli altan version."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland postulas pli altan version de linuksa distro. Bonvolu provi X11-labortablon aŭ ŝanĝi vian OS."),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Bonvolu Elekti la ekranon por esti dividita (Funkciu ĉe la sama flanko)."),
        ("Show RustDesk", ""),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/es.rs
+++ b/src/lang/es.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Ajustes de teclado"),
        ("Full Access", "Acceso completo"),
        ("Screen Share", "Compartir pantalla"),
-        ("ubuntu-21-04-required", "Wayland requiere Ubuntu 21.04 o una versión superior."),
-        ("wayland-requires-higher-linux-version", "Wayland requiere una versión superior de la distribución de Linux. Pruebe el escritorio X11 o cambie su sistema operativo."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requiere Ubuntu 21.04 o una versión superior."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requiere una versión superior de la distribución de Linux. Pruebe el escritorio X11 o cambie su sistema operativo."),
        ("JumpLink", "Ver"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Seleccione la pantalla que se compartirá (Operar en el lado del par)."),
        ("Show RustDesk", "Mostrar RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Continuar con {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/et.rs
+++ b/src/lang/et.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Klaviatuurisätted"),
        ("Full Access", "Täielik ligipääs"),
        ("Screen Share", "Ekraanijagamine"),
-        ("ubuntu-21-04-required", "Wayland nõuab Ubuntu 21.04 või uuemat versiooni."),
-        ("wayland-requires-higher-linux-version", "Wayland nõuab Linuxi distributsiooni uuemat versiooni. Palun proovi X11 töölaual või muuda oma operatsioonisüsteemi."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland nõuab Ubuntu 21.04 või uuemat versiooni."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland nõuab Linuxi distributsiooni uuemat versiooni. Palun proovi X11 töölaual või muuda oma operatsioonisüsteemi."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Palun vali jagatav ekraan (tegutse partneri poolel)."),
        ("Show RustDesk", "Kuva RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Jätka koos {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/eu.rs
+++ b/src/lang/eu.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Teklatuaren ezarpenak"),
        ("Full Access", "Sarbide osoa"),
        ("Screen Share", "Pantailaren partekatzea"),
-        ("ubuntu-21-04-required", "Wayland Ubuntu 21.04 edo bertsio berriagoa behar du."),
-        ("wayland-requires-higher-linux-version", "Wayland-ek linux banaketa berriago bat behar du. Saiatu X11 mahaigainarekin edo aldatu zure sistema eragilea."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland Ubuntu 21.04 edo bertsio berriagoa behar du."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland-ek linux banaketa berriago bat behar du. Saiatu X11 mahaigainarekin edo aldatu zure sistema eragilea."),
        ("JumpLink", "Ikusi"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Mesedez, hautatu partekatuko den pantaila (Kudeatu parekidearen aldean)"),
        ("Show RustDesk", "Erakutsi RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{} honekin jarraitu"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/fa.rs
+++ b/src/lang/fa.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "تنظیمات صفحه کلید"),
        ("Full Access", "دسترسی کامل"),
        ("Screen Share", "اشتراک گذاری صفحه"),
-        ("ubuntu-21-04-required", "نیازمند اوبونتو نسخه 21.04 یا بالاتر است Wayland"),
-        ("wayland-requires-higher-linux-version", "استفاده کنید و یا سیستم عامل خود را تغییر دهید X11 نیازمند نسخه بالاتری از توزیع لینوکس است. لطفا از دسکتاپ با سیستم"),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "نیازمند اوبونتو نسخه 21.04 یا بالاتر است Wayland"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "استفاده کنید و یا سیستم عامل خود را تغییر دهید X11 نیازمند نسخه بالاتری از توزیع لینوکس است. لطفا از دسکتاپ با سیستم"),
        ("JumpLink", "چشم انداز"),
        ("Please Select the screen to be shared(Operate on the peer side).", "لطفاً صفحه‌ای را برای اشتراک‌گذاری انتخاب کنید (در سمت همتا به همتا کار کنید)."),
        ("Show RustDesk", "RustDesk نمایش"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "ادامه با {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/fi.rs
+++ b/src/lang/fi.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Näppäimistöasetukset"),
        ("Full Access", "Täysi käyttöoikeus"),
        ("Screen Share", "Näytönjako"),
-        ("ubuntu-21-04-required", "Wayland vaatii Ubuntu 21.04:n tai uudemman version."),
-        ("wayland-requires-higher-linux-version", "Wayland vaatii uudemman Linux jakelun version. Kokeile X11 työpöytää tai vaihda käyttöjärjestelmää."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vaatii Ubuntu 21.04:n tai uudemman version."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vaatii uudemman Linux jakelun version. Kokeile X11 työpöytää tai vaihda käyttöjärjestelmää."),
        ("JumpLink", "Pikalinkki"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Valitse jaettava näyttö (toiminto etäpäässä)."),
        ("Show RustDesk", "Näytä RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Jatka käyttäen {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/fr.rs
+++ b/src/lang/fr.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Paramètres du clavier"),
        ("Full Access", "Accès total"),
        ("Screen Share", "Partage d’écran"),
-        ("ubuntu-21-04-required", "Wayland nécessite Ubuntu 21.04 ou une version ultérieure."),
-        ("wayland-requires-higher-linux-version", "Wayland nécessite une version ultérieure de votre distribution Linux. Veuillez essayer le bureau X11 ou changer de système d’exploitation."),
-        ("xdp-portal-unavailable", "Échec de la capture de l’écran Wayland. Le portail de bureau XDG a peut-être planté ou n’est pas disponible. Essayez de le redémarrer avec la commande `systemctl --user restart xdg-desktop-portal`."),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland nécessite Ubuntu 21.04 ou une version ultérieure."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland nécessite une version ultérieure de votre distribution Linux. Veuillez essayer le bureau X11 ou changer de système d’exploitation."),
        ("JumpLink", "Afficher"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Veuillez sélectionner l’écran à partager (côté appareil distant)."),
        ("Show RustDesk", "Afficher RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Maintenir l’écran allumé lors des sessions entrantes"),
        ("Continue with {}", "Continuer avec {}"),
        ("Display Name", "Nom d’affichage"),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ge.rs
+++ b/src/lang/ge.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "კლავიატურის პარამეტრები"),
        ("Full Access", "სრული წვდომა"),
        ("Screen Share", "ეკრანის გაზიარება"),
-        ("ubuntu-21-04-required", "Wayland საჭიროებს Ubuntu 21.04 ან უფრო ახალ ვერსიას."),
-        ("wayland-requires-higher-linux-version", "Wayland-ს სჭირდება Linux-ის დისტრიბუტივის უფრო ახალი ვერსია. გამოიყენეთ X11 სამუშაო მაგიდა ან შეცვალეთ ოპერაციული სისტემა."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland საჭიროებს Ubuntu 21.04 ან უფრო ახალ ვერსიას."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland-ს სჭირდება Linux-ის დისტრიბუტივის უფრო ახალი ვერსია. გამოიყენეთ X11 სამუშაო მაგიდა ან შეცვალეთ ოპერაციული სისტემა."),
        ("JumpLink", "ნახვა"),
        ("Please Select the screen to be shared(Operate on the peer side).", "აირჩიეთ ეკრანი გასაზიარებლად (იმუშავეთ პარტნიორის მხარეს)."),
        ("Show RustDesk", "RustDesk-ის ჩვენება"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{}-ით გაგრძელება"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/he.rs
+++ b/src/lang/he.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "הגדרות מקלדת"),
        ("Full Access", "גישה מלאה"),
        ("Screen Share", "שיתוף מסך"),
-        ("ubuntu-21-04-required", "Wayland דורש Ubuntu 21.04 או גרסה גבוהה יותר"),
-        ("wayland-requires-higher-linux-version", "Wayland דורש גרסת הפצת לינוקס גבוהה יותר. אנא נסה שולחן עבודה מסוג X11 או החלף מערכת הפעלה"),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland דורש Ubuntu 21.04 או גרסה גבוהה יותר"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland דורש גרסת הפצת לינוקס גבוהה יותר. אנא נסה שולחן עבודה מסוג X11 או החלף מערכת הפעלה"),
        ("JumpLink", "קישור מהיר"),
        ("Please Select the screen to be shared(Operate on the peer side).", "אנא בחר את המסך לשיתוף (פעולה בצד העמית)."),
        ("Show RustDesk", "הצג את RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "המשך עם {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/hr.rs
+++ b/src/lang/hr.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Postavke tipkovnice"),
        ("Full Access", "Potpuni pristup"),
        ("Screen Share", "Dijeljenje zaslona"),
-        ("ubuntu-21-04-required", "Wayland zahtijeva Ubuntu verziju 21.04 ili višu"),
-        ("wayland-requires-higher-linux-version", "Wayland zahtijeva višu verziju Linux distribucije. Molimo isprobjate X11 ili promijenite OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland zahtijeva Ubuntu verziju 21.04 ili višu"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland zahtijeva višu verziju Linux distribucije. Molimo isprobjate X11 ili promijenite OS."),
        ("JumpLink", "Vidi"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Molimo odaberite zaslon koji će biti podijeljen (Za rad na strani klijenta)"),
        ("Show RustDesk", "Prikaži RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Nastavi sa {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/hu.rs
+++ b/src/lang/hu.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Billentyűzetbeállítások"),
        ("Full Access", "Teljes hozzáférés"),
        ("Screen Share", "Képernyőmegosztás"),
-        ("ubuntu-21-04-required", "A Waylandhez Ubuntu 21.04 vagy újabb verzió szükséges."),
-        ("wayland-requires-higher-linux-version", "A Wayland a Linux disztribúció magasabb verzióját igényli. Próbálja ki az X11 asztali környezetet, vagy változtassa meg az operációs rendszert."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "A Waylandhez Ubuntu 21.04 vagy újabb verzió szükséges."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "A Wayland a Linux disztribúció magasabb verzióját igényli. Próbálja ki az X11 asztali környezetet, vagy változtassa meg az operációs rendszert."),
        ("JumpLink", "Hiperhivatkozás"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Válassza ki a megosztani kívánt képernyőt."),
        ("Show RustDesk", "A RustDesk megjelenítése"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Képernyő aktív állapotban tartása a bejövő munkamenetek során"),
        ("Continue with {}", "Folytatás ezzel: {}"),
        ("Display Name", "Kijelző név"),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/id.rs
+++ b/src/lang/id.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Pengaturan Papan Ketik"),
        ("Full Access", "Akses penuh"),
        ("Screen Share", "Berbagi Layar"),
-        ("ubuntu-21-04-required", "Wayland membutuhkan Ubuntu 21.04 atau versi yang lebih tinggi."),
-        ("wayland-requires-higher-linux-version", "Wayland membutuhkan versi distro linux yang lebih tinggi. Silakan coba desktop X11 atau ubah OS Anda."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland membutuhkan Ubuntu 21.04 atau versi yang lebih tinggi."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland membutuhkan versi distro linux yang lebih tinggi. Silakan coba desktop X11 atau ubah OS Anda."),
        ("JumpLink", "Tautan Cepat"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Silakan Pilih layar yang akan dibagikan kepada rekan anda."),
        ("Show RustDesk", "Tampilkan RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Lanjutkan dengan {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/it.rs
+++ b/src/lang/it.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Impostazioni tastiera"),
        ("Full Access", "Accesso completo"),
        ("Screen Share", "Condivisione schermo"),
-        ("ubuntu-21-04-required", "Wayland richiede Ubuntu 21.04 o versione successiva."),
-        ("wayland-requires-higher-linux-version", "Wayland richiede una versione superiore della distribuzione Linux.\nProva X11 desktop o cambia il sistema operativo."),
-        ("xdp-portal-unavailable", "Acquisizione dello schermo di Wayland non riuscita. Il portale desktop XDG potrebbe essersi bloccato o non essere disponibile. Prova a riavviarlo con `systemctl --user restart xdg-desktop-portal`."),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland richiede Ubuntu 21.04 o versione successiva."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland richiede una versione superiore della distribuzione Linux.\nProva X11 desktop o cambia il sistema operativo."),
        ("JumpLink", "Vai a"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Seleziona lo schermo da condividere (opera sul lato dispositivo remoto)."),
        ("Show RustDesk", "Visualizza RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Mantieni lo schermo attivo durante le sessioni in ingresso"),
        ("Continue with {}", "Continua con {}"),
        ("Display Name", "Visualizza nome"),
-        ("password-hidden-tip", "È impostata una password permanente (nascosta)."),
-        ("preset-password-in-use-tip", "È attualmente in uso la password preimpostata."),
    ].iter().cloned().collect();
 }
--- a/src/lang/ja.rs
+++ b/src/lang/ja.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "キーボードの設定"),
        ("Full Access", "フルアクセス"),
        ("Screen Share", "画面共有"),
-        ("ubuntu-21-04-required", "Wayland を使用するには、Ubuntu 21.04 以降のバージョンが必要です。"),
-        ("wayland-requires-higher-linux-version", "Wayland を使用するには、より新しい Linux ディストリビューションが必要です。 X11 デスクトップを試すか、OS を変更してください。"),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland を使用するには、Ubuntu 21.04 以降のバージョンが必要です。"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland を使用するには、より新しい Linux ディストリビューションが必要です。 X11 デスクトップを試すか、OS を変更してください。"),
        ("JumpLink", "表示"),
        ("Please Select the screen to be shared(Operate on the peer side).", "共有する画面を選択してください(リモートコンピューターが操作します)"),
        ("Show RustDesk", "RustDesk を表示"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{} で続行"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ko.rs
+++ b/src/lang/ko.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "키보드 설정"),
        ("Full Access", "전체 액세스"),
        ("Screen Share", "화면 공유"),
-        ("ubuntu-21-04-required", "Wayland는 Ubuntu 21.04 이상 버전이 필요합니다."),
-        ("wayland-requires-higher-linux-version", "Wayland는 상위 버전의 Linux 배포판이 필요합니다. X11 데스크탑을 사용하거나 OS를 변경하세요."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland는 Ubuntu 21.04 이상 버전이 필요합니다."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland는 상위 버전의 Linux 배포판이 필요합니다. X11 데스크탑을 사용하거나 OS를 변경하세요."),
        ("JumpLink", "점프 링크"),
        ("Please Select the screen to be shared(Operate on the peer side).", "공유할 화면을 선택하세요 (피어 측에서 작동)"),
        ("Show RustDesk", "RustDesk 표시"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "수신 세션 중 화면 켜짐 유지"),
        ("Continue with {}", "{}(으)로 계속"),
        ("Display Name", "표시 이름"),
-        ("password-hidden-tip", "영구 비밀번호가 설정되었습니다 (숨김)."),
-        ("preset-password-in-use-tip", "현재 사전 설정된 비밀번호가 사용 중입니다."),
    ].iter().cloned().collect();
 }
--- a/src/lang/kz.rs
+++ b/src/lang/kz.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", ""),
        ("Full Access", ""),
        ("Screen Share", ""),
-        ("ubuntu-21-04-required", "Wayland Ubuntu 21.04 немесе одан жоғары нұсқасын қажет етеді."),
-        ("wayland-requires-higher-linux-version", "Wayland linux дистрибутивінің жоғарырақ нұсқасын қажет етеді. X11 жұмыс үстелін қолданып көріңіз немесе операциялық жүйеңізді өзгертіңіз."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland Ubuntu 21.04 немесе одан жоғары нұсқасын қажет етеді."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland linux дистрибутивінің жоғарырақ нұсқасын қажет етеді. X11 жұмыс үстелін қолданып көріңіз немесе операциялық жүйеңізді өзгертіңіз."),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Бөлісетін экранды таңдаңыз (бірдей жағынан жұмыс жасаңыз)."),
        ("Show RustDesk", ""),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/lt.rs
+++ b/src/lang/lt.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Klaviatūros nustatymai"),
        ("Full Access", "Pilna prieiga"),
        ("Screen Share", "Ekrano bendrinimas"),
-        ("ubuntu-21-04-required", "Wayland reikalauja Ubuntu 21.04 arba naujesnės versijos."),
-        ("wayland-requires-higher-linux-version", "Wayland reikalinga naujesnės Linux Distro versijos. Išbandykite X11 darbalaukį arba pakeiskite OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland reikalauja Ubuntu 21.04 arba naujesnės versijos."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland reikalinga naujesnės Linux Distro versijos. Išbandykite X11 darbalaukį arba pakeiskite OS."),
        ("JumpLink", "Peržiūra"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Prašome pasirinkti ekraną, kurį norite bendrinti (veikiantį kitoje pusėje)."),
        ("Show RustDesk", "Rodyti RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Tęsti su {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/lv.rs
+++ b/src/lang/lv.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Tastatūras iestatījumi"),
        ("Full Access", "Pilna piekļuve"),
        ("Screen Share", "Ekrāna kopīgošana"),
-        ("ubuntu-21-04-required", "Wayland nepieciešama Ubuntu 21.04 vai jaunāka versija."),
-        ("wayland-requires-higher-linux-version", "Wayland nepieciešama augstāka Linux distro versija. Lūdzu, izmēģiniet X11 desktop vai mainiet savu OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland nepieciešama Ubuntu 21.04 vai jaunāka versija."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland nepieciešama augstāka Linux distro versija. Lūdzu, izmēģiniet X11 desktop vai mainiet savu OS."),
        ("JumpLink", "Skatīt"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Lūdzu, atlasiet kopīgojamo ekrānu (darbojieties sesijas pusē)."),
        ("Show RustDesk", "Rādīt RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Turpināt ar {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/nb.rs
+++ b/src/lang/nb.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Tastaturinnstillinger"),
        ("Full Access", "Full tilgang"),
        ("Screen Share", "Skjermdeling"),
-        ("ubuntu-21-04-required", "Wayland krever Ubuntu version 21.04 eller nyere."),
-        ("wayland-requires-higher-linux-version", "Wayland krever en nyere versjon av Linux. Prøv X11 desktop eller skift OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland krever Ubuntu version 21.04 eller nyere."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland krever en nyere versjon av Linux. Prøv X11 desktop eller skift OS."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "vennligst velg den skjermen, som skal deles (fjernstyres)."),
        ("Show RustDesk", "Vis RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Fortsett med {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/nl.rs
+++ b/src/lang/nl.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Toetsenbordinstellingen"),
        ("Full Access", "Volledige Toegang"),
        ("Screen Share", "Scherm Delen"),
-        ("ubuntu-21-04-required", "Wayland vereist Ubuntu 21.04 of hoger."),
-        ("wayland-requires-higher-linux-version", "Wayland vereist een hogere versie van Linux distro. Probeer X11 desktop of verander van OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vereist Ubuntu 21.04 of hoger."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vereist een hogere versie van Linux distro. Probeer X11 desktop of verander van OS."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Selecteer het scherm dat moet worden gedeeld (Bediening aan de kant van de peer)."),
        ("Show RustDesk", "Toon RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Houd het scherm open tijdens de inkomende sessies."),
        ("Continue with {}", "Ga verder met {}"),
        ("Display Name", "Naam Weergeven"),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/pl.rs
+++ b/src/lang/pl.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Ustawienia klawiatury"),
        ("Full Access", "Pełny dostęp"),
        ("Screen Share", "Udostępnianie ekranu"),
-        ("ubuntu-21-04-required", "Wayland wymaga Ubuntu 21.04 lub nowszego."),
-        ("wayland-requires-higher-linux-version", "Wayland wymaga nowszej dystrybucji Linuksa. Wypróbuj pulpit X11 lub zmień system operacyjny."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland wymaga Ubuntu 21.04 lub nowszego."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland wymaga nowszej dystrybucji Linuksa. Wypróbuj pulpit X11 lub zmień system operacyjny."),
        ("JumpLink", "Podgląd"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Wybierz ekran do udostępnienia (działaj po zdalnego urządzenia)."),
        ("Show RustDesk", "Pokaż RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Utrzymuj urządzenie w stanie aktywnym podczas sesji przychodzących"),
        ("Continue with {}", "Kontynuuj z {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/pt_PT.rs
+++ b/src/lang/pt_PT.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Configurações do teclado"),
        ("Full Access", "Controlo total"),
        ("Screen Share", ""),
-        ("ubuntu-21-04-required", "Wayland requer Ubuntu 21.04 ou versão superior."),
-        ("wayland-requires-higher-linux-version", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requer Ubuntu 21.04 ou versão superior."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Por favor, selecione a tela a ser compartilhada (operar no lado do peer)."),
        ("Show RustDesk", ""),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ptbr.rs
+++ b/src/lang/ptbr.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Configurações de teclado"),
        ("Full Access", "Acesso completo"),
        ("Screen Share", "Compartilhamento de tela"),
-        ("ubuntu-21-04-required", "Wayland requer Ubuntu 21.04 ou versão superior."),
-        ("wayland-requires-higher-linux-version", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland requer Ubuntu 21.04 ou versão superior."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland requer uma versão superior da distribuição linux. Por favor, tente o desktop X11 ou mude seu sistema operacional."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Por favor, selecione a tela a ser compartilhada (operar no lado do parceiro)."),
        ("Show RustDesk", "Exibir RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Manter tela ativa durante sessões de entrada"),
        ("Continue with {}", "Continuar com {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ro.rs
+++ b/src/lang/ro.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Setări tastatură"),
        ("Full Access", "Acces total"),
        ("Screen Share", "Partajare ecran"),
-        ("ubuntu-21-04-required", "Wayland necesită Ubuntu 21.04 sau o versiune superioară."),
-        ("wayland-requires-higher-linux-version", "Wayland necesită o versiune superioară a distribuției Linux. Încearcă desktopul X11 sau schimbă sistemul de operare."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland necesită Ubuntu 21.04 sau o versiune superioară."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland necesită o versiune superioară a distribuției Linux. Încearcă desktopul X11 sau schimbă sistemul de operare."),
        ("JumpLink", "Afișează"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Partajează ecranul care urmează să fie partajat (operează din partea dispozitivului pereche)."),
        ("Show RustDesk", "Afișează RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Continuă cu {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Настройки клавиатуры"),
        ("Full Access", "Полный доступ"),
        ("Screen Share", "Демонстрация экрана"),
-        ("ubuntu-21-04-required", "Wayland требуется Ubuntu версии 21.04 или новее."),
-        ("wayland-requires-higher-linux-version", "Для Wayland требуется более поздняя версия дистрибутива Linux. Используйте рабочий стол X11 или смените ОС."),
-        ("xdp-portal-unavailable", "Невозможно сделать снимок экрана Wayland. Возможно, в XDG Desktop Portal сбой или он недоступен. Попробуйте перезапустить его с помощью `systemctl --user restart xdg-desktop-portal`."),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland требуется Ubuntu версии 21.04 или новее."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Для Wayland требуется более поздняя версия дистрибутива Linux. Используйте рабочий стол X11 или смените ОС."),
        ("JumpLink", "Просмотр"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Выберите экран для демонстрации (работайте на одноранговой стороне)."),
        ("Show RustDesk", "Показать RustDesk"),
@@ -666,7 +665,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Incoming Print Job", "Входящее задание печати"),
        ("use-the-default-printer-tip", "Использовать принтер по умолчанию"),
        ("use-the-selected-printer-tip", "Использовать выбранный принтер"),
-        ("auto-print-tip", "Автоматически выполнять печать на выбранном принтере"),
+        ("auto-print-tip", "Автоматически выполнять печать на выбранном принтере."),
        ("print-incoming-job-confirm-tip", "Получено задание на печать с удалённого устройства. Выполнить его локально?"),
        ("remote-printing-disallowed-tile-tip", "Удалённая печать запрещена"),
        ("remote-printing-disallowed-text-tip", "Настройки разрешений на управляемой стороне запрещают удалённую печать."),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Не отключать экран во время входящих сеансов"),
        ("Continue with {}", "Продолжить с {}"),
        ("Display Name", "Отображаемое имя"),
-        ("password-hidden-tip", "Установлен постоянный пароль (скрытый)."),
-        ("preset-password-in-use-tip", "Установленный пароль сейчас используется."),
    ].iter().cloned().collect();
 }
--- a/src/lang/sc.rs
+++ b/src/lang/sc.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Impostatziones de tecladu"),
        ("Full Access", "Atzessu cumpridu"),
        ("Screen Share", "Cumpartzidura de ischermu"),
-        ("ubuntu-21-04-required", "Wayland tenet bisòngiu de Ubuntu 21.04 o versione prus noa."),
-        ("wayland-requires-higher-linux-version", "Wayland tenet bisòngiu de una versione prus noa de sa distributzione Linux.\nProa X11 pro elaboradores o càmbia su sistema operativu."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland tenet bisòngiu de Ubuntu 21.04 o versione prus noa."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland tenet bisòngiu de una versione prus noa de sa distributzione Linux.\nProa X11 pro elaboradores o càmbia su sistema operativu."),
        ("JumpLink", "Bae a"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Seletziona s'ischermu de cumpartzire (òpera dae s'ala de su dispositivu remotu)."),
        ("Show RustDesk", "Mustra RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Sighi cun {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sk.rs
+++ b/src/lang/sk.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Nastavenia klávesnice"),
        ("Full Access", "Úplný prístup"),
        ("Screen Share", "Zdielanie obrazovky"),
-        ("ubuntu-21-04-required", "Wayland vyžaduje Ubuntu 21.04 alebo vyššiu verziu."),
-        ("wayland-requires-higher-linux-version", "Wayland vyžaduje vyššiu verziu linuxovej distribúcie. Skúste X11 desktop alebo zmeňte OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland vyžaduje Ubuntu 21.04 alebo vyššiu verziu."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland vyžaduje vyššiu verziu linuxovej distribúcie. Skúste X11 desktop alebo zmeňte OS."),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Vyberte obrazovku, ktorú chcete zdieľať (Ovládajte na strane partnera)."),
        ("Show RustDesk", "Zobraziť RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Pokračovať s {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sl.rs
+++ b/src/lang/sl.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Nastavitve tipkovnice"),
        ("Full Access", "Poln dostop"),
        ("Screen Share", "Deljenje zaslona"),
-        ("ubuntu-21-04-required", "Wayland zahteva Ubuntu 21.04 ali novejši"),
-        ("wayland-requires-higher-linux-version", "Zahtevana je novejša različica Waylanda. Posodobite vašo distribucijo ali pa uporabite X11."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland zahteva Ubuntu 21.04 ali novejši"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Zahtevana je novejša različica Waylanda. Posodobite vašo distribucijo ali pa uporabite X11."),
        ("JumpLink", "Pogled"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Izberite zaslon za delitev (na oddaljeni strani)."),
        ("Show RustDesk", "Prikaži RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Nadaljuj z {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sq.rs
+++ b/src/lang/sq.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Cilësimet e tastierës"),
        ("Full Access", "Qasje e plotë"),
        ("Screen Share", "Ndarja e ekranit"),
-        ("ubuntu-21-04-required", "Wayland kërkon Ubuntu 21.04 ose version më të lartë"),
-        ("wayland-requires-higher-linux-version", "Wayland kërkon një version më të lartë të shpërndarjes linux. Ju lutemi provoni desktopin X11 ose ndryshoni OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland kërkon Ubuntu 21.04 ose version më të lartë"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland kërkon një version më të lartë të shpërndarjes linux. Ju lutemi provoni desktopin X11 ose ndryshoni OS."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Ju lutemi zgjidhni ekranin që do të ndahet (Vepro në anën e kolegëve"),
        ("Show RustDesk", "Shfaq RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Vazhdo me {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sr.rs
+++ b/src/lang/sr.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Postavke tastature"),
        ("Full Access", "Pun pristup"),
        ("Screen Share", "Deljenje ekrana"),
-        ("ubuntu-21-04-required", "Wayland zahteva Ubuntu 21.04 ili veću verziju"),
-        ("wayland-requires-higher-linux-version", "Wayland zahteva veću verziju Linux distribucije. Molimo pokušajte X11 ili promenite OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland zahteva Ubuntu 21.04 ili veću verziju"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland zahteva veću verziju Linux distribucije. Molimo pokušajte X11 ili promenite OS."),
        ("JumpLink", "Vidi"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Molimo izaberite ekran koji će biti podeljen (Za rad na klijent strani)"),
        ("Show RustDesk", "Prikazi RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Nastavi sa {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/sv.rs
+++ b/src/lang/sv.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Tangentbordsinställningar"),
        ("Full Access", "Full tillgång"),
        ("Screen Share", "Skärmdelning"),
-        ("ubuntu-21-04-required", "Wayland kräver Ubuntu 21.04 eller högre."),
-        ("wayland-requires-higher-linux-version", "Wayland kräver en högre version av linux. Försök igen eller byt OS."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland kräver Ubuntu 21.04 eller högre."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland kräver en högre version av linux. Försök igen eller byt OS."),
        ("JumpLink", "JumpLink"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Välj skärm att dela"),
        ("Show RustDesk", "Visa RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Fortsätt med {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/ta.rs
+++ b/src/lang/ta.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "விசைப்பலகை அமைப்புகள்"),
        ("Full Access", "முழு அணுகல்"),
        ("Screen Share", "திரை பகிர்வு"),
-        ("ubuntu-21-04-required", "Wayland க்கு Ubuntu 21.04+ தேவை"),
-        ("wayland-requires-higher-linux-version", "Wayland க்கு உயர் Linux பதிப்பு தேவை. X11 முயற்சிக்கவும் அல்லது OS மாற்றவும்."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland க்கு Ubuntu 21.04+ தேவை"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland க்கு உயர் Linux பதிப்பு தேவை. X11 முயற்சிக்கவும் அல்லது OS மாற்றவும்."),
        ("JumpLink", "ஜம்ப் லிங்க்"),
        ("Please Select the screen to be shared(Operate on the peer side).", "பகிரப்பட வேண்டிய திரை தேர்ந்தெடுக்கவும்"),
        ("Show RustDesk", "RustDesk ஐ காட்டு"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "{} உடன் தொடர்"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", ""),
        ("Full Access", ""),
        ("Screen Share", ""),
-        ("ubuntu-21-04-required", ""),
-        ("wayland-requires-higher-linux-version", ""),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", ""),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", ""),
        ("JumpLink", ""),
        ("Please Select the screen to be shared(Operate on the peer side).", ""),
        ("Show RustDesk", ""),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", ""),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/th.rs
+++ b/src/lang/th.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "การตั้งค่าคีย์บอร์ด"),
        ("Full Access", "การเข้าถึงทั้งหมด"),
        ("Screen Share", "การแชร์จอ"),
-        ("ubuntu-21-04-required", "Wayland ต้องการ Ubuntu เวอร์ชัน 21.04 หรือสูงกว่า"),
-        ("wayland-requires-higher-linux-version", "Wayland ต้องการลินุกซ์เวอร์ชันที่สูงกว่านี้ กรุณาเปลี่ยนไปใช้เดสก์ท็อป X11 หรือเปลี่ยนระบบปฏิบัติการของคุณ"),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland ต้องการ Ubuntu เวอร์ชัน 21.04 หรือสูงกว่า"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland ต้องการลินุกซ์เวอร์ชันที่สูงกว่านี้ กรุณาเปลี่ยนไปใช้เดสก์ท็อป X11 หรือเปลี่ยนระบบปฏิบัติการของคุณ"),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "กรุณาเลือกหน้าจอที่ต้องการแชร์ (ใช้งานในอีกฝั่งของการเชื่อมต่อ)"),
        ("Show RustDesk", "แสดง RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "ทำต่อด้วย {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/tr.rs
+++ b/src/lang/tr.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Klavye Ayarları"),
        ("Full Access", "Tam Erişim"),
        ("Screen Share", "Ekran Paylaşımı"),
-        ("ubuntu-21-04-required", "Wayland, Ubuntu 21.04 veya daha yüksek bir sürüm gerektirir."),
-        ("wayland-requires-higher-linux-version", "Wayland, linux dağıtımının daha yüksek bir sürümünü gerektirir. Lütfen X11 masaüstünü deneyin veya işletim sisteminizi değiştirin."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland, Ubuntu 21.04 veya daha yüksek bir sürüm gerektirir."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland, linux dağıtımının daha yüksek bir sürümünü gerektirir. Lütfen X11 masaüstünü deneyin veya işletim sisteminizi değiştirin."),
        ("JumpLink", "View"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Lütfen paylaşılacak ekranı seçiniz (Ekran tarafında çalıştırın)."),
        ("Show RustDesk", "RustDesk'i Göster"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", "Gelen oturumlar süresince ekranı açık tutun"),
        ("Continue with {}", "{} ile devam et"),
        ("Display Name", "Görünen Ad"),
-        ("password-hidden-tip", "Şifre gizli"),
-        ("preset-password-in-use-tip", "Önceden ayarlanmış şifre kullanılıyor"),
    ].iter().cloned().collect();
 }
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "鍵盤設定"),
        ("Full Access", "完全存取"),
        ("Screen Share", "僅分享螢幕畫面"),
-        ("ubuntu-21-04-required", "Wayland 需要 Ubuntu 21.04 或更新的版本。"),
-        ("wayland-requires-higher-linux-version", "Wayland 需要更新版的 Linux 發行版。請嘗試使用 X11 桌面或更改您的作業系統。"),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland 需要 Ubuntu 21.04 或更新的版本。"),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland 需要更新版的 Linux 發行版。請嘗試使用 X11 桌面或更改您的作業系統。"),
        ("JumpLink", "查看"),
        ("Please Select the screen to be shared(Operate on the peer side).", "請選擇要分享的螢幕畫面（在對方的裝置上操作）。"),
        ("Show RustDesk", "顯示 RustDesk"),
@@ -740,8 +739,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-outgoing-sessions-label", "在連出工作階段期間保持螢幕喚醒"),
        ("keep-awake-during-incoming-sessions-label", "在連入工作階段期間保持螢幕喚醒"),
        ("Continue with {}", "使用 {} 登入"),
-        ("Display Name", "顯示名稱"),
-        ("password-hidden-tip", "固定密碼已設定（已隱藏）"),
-        ("preset-password-in-use-tip", "目前正在使用預設密碼"),
+        ("Display Name", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/uk.rs
+++ b/src/lang/uk.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Налаштування клавіатури"),
        ("Full Access", "Повний доступ"),
        ("Screen Share", "Демонстрація екрана"),
-        ("ubuntu-21-04-required", "Wayland потребує Ubuntu 21.04 або новішої версії."),
-        ("wayland-requires-higher-linux-version", "Для Wayland потрібна новіша версія дистрибутива Linux. Будь ласка, спробуйте стільницю на X11 або змініть свою ОС."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland потребує Ubuntu 21.04 або новішої версії."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Для Wayland потрібна новіша версія дистрибутива Linux. Будь ласка, спробуйте стільницю на X11 або змініть свою ОС."),
        ("JumpLink", "Перегляд"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Будь ласка, виберіть екран, до якого потрібно надати доступ (на віддаленому пристрої)."),
        ("Show RustDesk", "Показати RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Продовжити з {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/lang/vi.rs
+++ b/src/lang/vi.rs
@@ -377,9 +377,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("Keyboard Settings", "Cài đặt bàn phím"),
        ("Full Access", "Toàn quyền truy cập"),
        ("Screen Share", "Chia sẻ màn hình"),
-        ("ubuntu-21-04-required", "Wayland yêu cầu Ubuntu 21.04 trở lên."),
-        ("wayland-requires-higher-linux-version", "Wayland yêu cầu phiên bản Linux mới hơn. Hãy thử X11 hoặc đổi hệ điều hành."),
-        ("xdp-portal-unavailable", ""),
+        ("Wayland requires Ubuntu 21.04 or higher version.", "Wayland yêu cầu Ubuntu 21.04 trở lên."),
+        ("Wayland requires higher version of linux distro. Please try X11 desktop or change your OS.", "Wayland yêu cầu phiên bản Linux mới hơn. Hãy thử X11 hoặc đổi hệ điều hành."),
        ("JumpLink", "Xem"),
        ("Please Select the screen to be shared(Operate on the peer side).", "Vui lòng chọn màn hình chia sẻ (Thao tác ở phía đối tác)."),
        ("Show RustDesk", "Hiện RustDesk"),
@@ -741,7 +740,5 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
        ("keep-awake-during-incoming-sessions-label", ""),
        ("Continue with {}", "Tiếp tục với {}"),
        ("Display Name", ""),
-        ("password-hidden-tip", ""),
-        ("preset-password-in-use-tip", ""),
    ].iter().cloned().collect();
 }
--- a/src/platform/windows.cc
+++ b/src/platform/windows.cc
@@ -580,8 +580,9 @@ extern "C"
        return rdp_or_console;
    }

-    BOOL is_session_locked(DWORD session_id)
+    BOOL is_session_locked(BOOL include_rdp)
    {
+        DWORD session_id = get_current_session(include_rdp);
        if (session_id == 0xFFFFFFFF) {
            return FALSE;
        }
--- a/src/platform/windows.rs
+++ b/src/platform/windows.rs
@@ -523,7 +523,7 @@ const SERVICE_TYPE: ServiceType = ServiceType::OWN_PROCESS;

 extern "C" {
    fn get_current_session(rdp: BOOL) -> DWORD;
-    fn is_session_locked(session_id: DWORD) -> BOOL;
+    fn is_session_locked(include_rdp: BOOL) -> BOOL;
    fn LaunchProcessWin(
        cmd: *const u16,
        session_id: DWORD,
@@ -1149,21 +1149,20 @@ pub fn is_prelogin() -> bool {
 }

 pub fn is_locked() -> bool {
-    let Some(session_id) = get_current_process_session_id() else {
-        return false;
-    };
-    unsafe { is_session_locked(session_id) == TRUE }
+    unsafe { is_session_locked(share_rdp()) == TRUE }
 }

+// `is_logon_ui()` is regardless of multiple sessions now.
+// It only check if "LogonUI.exe" exists.
+//
+// If there're mulitple sessions (logged in users),
+// some are in the login screen, while the others are not.
+// Then this function may not work fine if the session we want to handle(connect) is not in the login screen.
+// But it's a rare case and cannot be simply handled, so it will not be dealt with for the time being.
 #[inline]
 pub fn is_logon_ui() -> ResultType<bool> {
-    let Some(current_sid) = get_current_process_session_id() else {
-        return Ok(false);
-    };
    let pids = get_pids("LogonUI.exe")?;
-    Ok(pids
-        .into_iter()
-        .any(|pid| get_session_id_of_process(pid) == Some(current_sid)))
+    Ok(!pids.is_empty())
 }

 pub fn is_root() -> bool {
@@ -2030,9 +2029,6 @@ pub fn update_install_option(k: &str, v: &str) -> ResultType<()> {
    if !is_installed() || !crate::is_server() {
        return Ok(());
    }
-    if ![REG_NAME_INSTALL_PRINTER].contains(&k) || !["0", "1"].contains(&v) {
-        return Ok(());
-    }
    let app_name = crate::get_app_name();
    let ext = app_name.to_lowercase();
    let cmds =
--- a/src/server/connection.rs
+++ b/src/server/connection.rs
@@ -27,7 +27,6 @@ use hbb_common::platform::linux::run_cmds;
 #[cfg(target_os = "android")]
 use hbb_common::protobuf::EnumOrUnknown;
 use hbb_common::{
-    config::decode_permanent_password_h1_from_storage,
    config::{self, keys, Config, TrustedDevice},
    fs::{self, can_enable_overwrite_detection, JobType},
    futures::{SinkExt, StreamExt},
@@ -78,18 +77,6 @@ lazy_static::lazy_static! {
    static ref WAKELOCK_KEEP_AWAKE_OPTION: Arc::<Mutex<Option<bool>>> = Default::default();
 }

-fn constant_time_eq(a: &[u8], b: &[u8]) -> bool {
-    if a.len() != b.len() {
-        return false;
-    }
-    // Avoid data-dependent early exits.
-    let mut x: u8 = 0;
-    for i in 0..a.len() {
-        x |= a[i] ^ b[i];
-    }
-    x == 0
-}
-
 #[cfg(any(target_os = "windows", target_os = "linux"))]
 lazy_static::lazy_static! {
    static ref WALLPAPER_REMOVER: Arc<Mutex<Option<WallPaperRemover>>> = Default::default();
@@ -1982,53 +1969,23 @@ impl Connection {
        self.tx_input.send(MessageInput::Key((msg, press))).ok();
    }

-    fn verify_h1(&self, h1: &[u8]) -> bool {
-        let mut hasher2 = Sha256::new();
-        hasher2.update(h1);
-        hasher2.update(self.hash.challenge.as_bytes());
-        // A normal `==` on slices may short-circuit on the first mismatch, which can leak how many leading
-        // bytes matched via timing. In typical remote scenarios this is difficult to exploit due to network
-        // jitter, changing challenges, and login attempt throttling, but a constant-time comparison here is
-        // low-cost defensive programming.
-        constant_time_eq(&hasher2.finalize()[..], &self.lr.password[..])
-    }
-
-    #[inline]
-    fn validate_one_password(&self, password: &str) -> bool {
-        self.validate_password_plain(password)
-    }
-
-    fn validate_password_plain(&self, password: &str) -> bool {
-        if password.is_empty() {
+    fn validate_one_password(&self, password: String) -> bool {
+        if password.len() == 0 {
            return false;
        }
-
        let mut hasher = Sha256::new();
-        hasher.update(password.as_bytes());
-        hasher.update(self.hash.salt.as_bytes());
-        let h1_plain = hasher.finalize();
-        self.verify_h1(&h1_plain[..])
+        hasher.update(password);
+        hasher.update(&self.hash.salt);
+        let mut hasher2 = Sha256::new();
+        hasher2.update(&hasher.finalize()[..]);
+        hasher2.update(&self.hash.challenge);
+        hasher2.finalize()[..] == self.lr.password[..]
    }

-    fn validate_password_storage(&self, storage: &str) -> bool {
-        if storage.is_empty() {
-            return false;
-        }
-
-        // Use strict decode success to detect hashed storage.
-        // If decode fails, treat as legacy plaintext storage for compatibility.
-        if let Some(h1) = decode_permanent_password_h1_from_storage(storage) {
-            return self.verify_h1(&h1[..]);
-        }
-
-        // Legacy plaintext storage path.
-        self.validate_password_plain(storage)
-    }
-
-    fn validate_password(&mut self, allow_permanent_password: bool) -> bool {
+    fn validate_password(&mut self) -> bool {
        if password::temporary_enabled() {
            let password = password::temporary_password();
-            if self.validate_one_password(&password) {
+            if self.validate_one_password(password.clone()) {
                raii::AuthedConnID::update_or_insert_session(
                    self.session_key(),
                    Some(password),
@@ -2037,33 +1994,10 @@ impl Connection {
                return true;
            }
        }
-        if password::permanent_enabled() || allow_permanent_password {
-            let print_fallback = || {
-                if allow_permanent_password && !password::permanent_enabled() {
-                    log::info!("Permanent password accepted via logon-screen fallback");
-                }
-            };
-            // Since hashed storage uses a prefix-based encoding, a hard plaintext that
-            // happens to look like hashed storage could be mis-detected. Validate local storage
-            // and hard/preset plaintext via separate paths to avoid that ambiguity.
-            let (local_storage, _) = Config::get_local_permanent_password_storage_and_salt();
-            if !local_storage.is_empty() {
-                if self.validate_password_storage(&local_storage) {
-                    print_fallback();
+        if password::permanent_enabled() {
+            if self.validate_one_password(Config::get_permanent_password()) {
                return true;
            }
-            } else {
-                let hard = config::HARD_SETTINGS
-                    .read()
-                    .unwrap()
-                    .get("password")
-                    .cloned()
-                    .unwrap_or_default();
-                if !hard.is_empty() && self.validate_password_plain(&hard) {
-                    print_fallback();
-                    return true;
-                }
-            }
        }
        false
    }
@@ -2082,7 +2016,7 @@ impl Connection {
        if let Some(session) = session {
            if !self.lr.password.is_empty()
                && (tfa && session.tfa
-                    || !tfa && self.validate_password_plain(&session.random_password))
+                    || !tfa && self.validate_one_password(session.random_password.clone()))
            {
                log::info!("is recent session");
                return true;
@@ -2356,10 +2290,6 @@ impl Connection {
            #[cfg(any(target_os = "android", target_os = "ios"))]
            let is_logon = || crate::platform::is_prelogin();

-            let allow_logon_screen_password =
-                crate::get_builtin_option(keys::OPTION_ALLOW_LOGON_SCREEN_PASSWORD) == "Y"
-                    && is_logon();
-
            if !hbb_common::is_ip_str(&lr.username)
                && !hbb_common::is_domain_port_str(&lr.username)
                && lr.username != Config::get_id()
@@ -2368,7 +2298,8 @@ impl Connection {
                    .await;
                return false;
            } else if (password::approve_mode() == ApproveMode::Click
-                && !allow_logon_screen_password)
+                && !(crate::get_builtin_option(keys::OPTION_ALLOW_LOGON_SCREEN_PASSWORD) == "Y"
+                    && is_logon()))
                || password::approve_mode() == ApproveMode::Both && !password::has_valid_password()
            {
                self.try_start_cm(lr.my_id, lr.my_name, false);
@@ -2404,7 +2335,7 @@ impl Connection {
                if !res {
                    return true;
                }
-                if !self.validate_password(allow_logon_screen_password) {
+                if !self.validate_password() {
                    self.update_failure(failure, false, 0);
                    if err_msg.is_empty() {
                        self.send_login_error(crate::client::LOGIN_MSG_PASSWORD_WRONG)
--- a/src/server/wayland.rs
+++ b/src/server/wayland.rs
@@ -10,8 +10,7 @@ use std::io;

 use crate::{
    client::{
-        SCRAP_OTHER_VERSION_OR_X11_REQUIRED, SCRAP_UBUNTU_HIGHER_REQUIRED,
-        SCRAP_X11_REQUIRED, SCRAP_XDP_PORTAL_UNAVAILABLE,
+        SCRAP_OTHER_VERSION_OR_X11_REQUIRED, SCRAP_UBUNTU_HIGHER_REQUIRED, SCRAP_X11_REQUIRED,
    },
    platform::linux::is_x11,
 };
@@ -57,15 +56,10 @@ fn map_err_scrap(err: String) -> io::Error {
        }
    } else {
        try_log(&err);
-        let err_lower = err.to_ascii_lowercase();
-        if err_lower.contains("org.freedesktop.portal")
-            || err_lower.contains("dbus")
-            || err_lower.contains("d-bus")
+        if err.contains("org.freedesktop.portal")
+            || err.contains("pipewire")
+            || err.contains("dbus")
        {
-            // The portal D-Bus interface is unreachable. This typically means
-            // xdg-desktop-portal has crashed... for more info, see: Issue #12897
-            io::Error::new(io::ErrorKind::Other, SCRAP_XDP_PORTAL_UNAVAILABLE)
-        } else if err_lower.contains("pipewire") {
            io::Error::new(io::ErrorKind::Other, SCRAP_OTHER_VERSION_OR_X11_REQUIRED)
        } else {
            io::Error::new(io::ErrorKind::Other, SCRAP_X11_REQUIRED)
--- a/src/tray.rs
+++ b/src/tray.rs
@@ -54,22 +54,9 @@ fn make_tray() -> hbb_common::ResultType<()> {
    let mut event_loop = EventLoopBuilder::new().build();

    let tray_menu = Menu::new();
-    let hide_stop_service = crate::ui_interface::get_builtin_option(
-        hbb_common::config::keys::OPTION_HIDE_STOP_SERVICE,
-    ) == "Y";
-    // The tray icon is only shown when the service is running, so we don't need to check
-    // the `stop-service` option here.
-    let quit_i = if !hide_stop_service {
-        Some(MenuItem::new(translate("Stop service".to_owned()), true, None))
-    } else {
-        None
-    };
+    let quit_i = MenuItem::new(translate("Stop service".to_owned()), true, None);
    let open_i = MenuItem::new(translate("Open".to_owned()), true, None);
-    if let Some(quit_i) = &quit_i {
-        tray_menu.append_items(&[&open_i, quit_i]).ok();
-    } else {
-        tray_menu.append_items(&[&open_i]).ok();
-    }
+    tray_menu.append_items(&[&open_i, &quit_i]).ok();
    let tooltip = |count: usize| {
        if count == 0 {
            format!(
@@ -168,7 +155,6 @@ fn make_tray() -> hbb_common::ResultType<()> {
        }

        if let Ok(event) = menu_channel.try_recv() {
-            if let Some(quit_i) = &quit_i {
            if event.id == quit_i.id() {
                /* failed in windows, seems no permission to check system process
                if !crate::check_process("--server", false) {
@@ -182,9 +168,6 @@ fn make_tray() -> hbb_common::ResultType<()> {
            } else if event.id == open_i.id() {
                open_func();
            }
-            } else if event.id == open_i.id() {
-                open_func();
-            }
        }

        if let Ok(_event) = tray_channel.try_recv() {
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -212,16 +212,12 @@ impl UI {
        update_temporary_password()
    }

+    fn permanent_password(&self) -> String {
+        permanent_password()
+    }
+
    fn set_permanent_password(&self, password: String) {
-        let _ = set_permanent_password_with_result(password);
-    }
-
-    fn is_local_permanent_password_set(&self) -> bool {
-        is_local_permanent_password_set()
-    }
-
-    fn is_permanent_password_set(&self) -> bool {
-        is_permanent_password_set()
+        set_permanent_password(password);
    }

    fn get_remote_id(&mut self) -> String {
@@ -730,9 +726,8 @@ impl sciter::EventHandler for UI {
        fn get_id();
        fn temporary_password();
        fn update_temporary_password();
+        fn permanent_password();
        fn set_permanent_password(String);
-        fn is_local_permanent_password_set();
-        fn is_permanent_password_set();
        fn get_remote_id();
        fn set_remote_id(String);
        fn closing(i32, i32, i32, i32);
--- a/src/ui/common.css
+++ b/src/ui/common.css
@@ -72,11 +72,6 @@ button.button:hover, button.outline:hover {
  border-color: color(hover-border);
 }

-button:disabled,
-button:disabled:hover {
-  opacity: 0.3;
-}
-
 button.link {
  background: none !important;
  border: none;
--- a/src/ui/index.tis
+++ b/src/ui/index.tis
@@ -16,7 +16,6 @@ const disable_ab = handler.is_disable_ab();
 const hide_server_settings = handler.get_builtin_option("hide-server-settings") == "Y";
 const hide_proxy_settings = handler.get_builtin_option("hide-proxy-settings") == "Y";
 const hide_websocket_settings = handler.get_builtin_option("hide-websocket-settings") == "Y";
-const hide_stop_service = handler.get_builtin_option("hide-stop-service") == "Y";
 const disable_change_permanent_password = handler.get_builtin_option("disable-change-permanent-password") == "Y";
 const disable_change_id = handler.get_builtin_option("disable-change-id") == "Y";

@@ -533,7 +532,7 @@ class MyIdMenu: Reactor.Component {
                {!disable_settings && !using_public_server && !outgoing_only && <li #disable-udp class={disable_udp ? "selected" : "line-through"}><span>{svg_checkmark}</span>{translate('Disable UDP')}</li>}
                {!disable_settings && !using_public_server && <li #allow-insecure-tls-fallback><span>{svg_checkmark}</span>{translate('Allow insecure TLS fallback')}</li>}
                <div .separator />
-                {(!hide_stop_service || service_stopped) && <li #stop-service class={service_stopped ? "line-through" : "selected"}><span>{svg_checkmark}</span>{translate("Enable service")}</li>}
+                <li #stop-service class={service_stopped ? "line-through" : "selected"}><span>{svg_checkmark}</span>{translate("Enable service")}</li>
                {!disable_settings && is_win && handler.is_installed() ? <ShareRdp /> : ""}
                {!disable_settings && <DirectServer />}
                {!disable_settings && false && handler.using_public_server() && <li #allow-always-relay><span>{svg_checkmark}</span>{translate('Always connect via relay')}</li>}
@@ -1072,7 +1071,6 @@ class PasswordArea: Reactor.Component {
        var method = handler.get_option('verification-method');
        var approve_mode= handler.get_option('approve-mode');
        var show_password = approve_mode != 'click';
-        var has_local_password = handler.is_local_permanent_password_set();
        return <popup><menu.context #edit-password-context>
            <li #approve-mode-password><span>{svg_checkmark}</span>{translate('Accept sessions via password')}</li>
            <li #approve-mode-click><span>{svg_checkmark}</span>{translate('Accept sessions via click')}</li>
@@ -1083,7 +1081,6 @@ class PasswordArea: Reactor.Component {
            { !show_password ? '' : <li #use-both-passwords><span>{svg_checkmark}</span>{translate('Use both passwords')}</li> }
            { !show_password ? '' : <div .separator /> }
            { !show_password || disable_change_permanent_password ? '' : <li #set-password  disabled={ method == 'use-temporary-password' ? "true" : "false" }>{translate('Set permanent password')}</li> }
-            { !show_password || disable_change_permanent_password ? '' : <li #clear-password disabled={ has_local_password ? "false" : "true" }>{translate('Clear permanent password')}</li> }
            { !show_password ? '' : <TemporaryPasswordLengthMenu /> }
            <div .separator />
            <li #tfa><span>{svg_checkmark}</span>{translate('enable-2fa-title')}</li>
@@ -1116,10 +1113,6 @@ class PasswordArea: Reactor.Component {
                    el.state.disabled = true;
                }
            }
-            if (el.id == "clear-password") {
-                var has_local_password = handler.is_local_permanent_password_set();
-                el.state.disabled = !has_local_password;
-            }
            if (el.id == "tfa")
                el.attributes.toggleClass("selected", has_valid_2fa);
        }
@@ -1135,28 +1128,16 @@ class PasswordArea: Reactor.Component {

    event click $(li#set-password) {
        var me = this;
-        var has_local_password = handler.is_local_permanent_password_set();
-        var permanent_password_set = handler.is_permanent_password_set();
-        var password_hidden_tip = translate('password-hidden-tip');
-        var preset_password_tip = translate('preset-password-in-use-tip');
-        var password_tip = "";
-        if (has_local_password) {
-            password_tip = "<div style='margin-top:0.5em; color:#e5a43a;'><span style='font-weight:bold;'>[!]</span> " + password_hidden_tip + "</div>";
-        } else if (permanent_password_set) {
-            password_tip = "<div style='margin-top:0.5em; color:#e5a43a;'><span style='font-weight:bold;'>[!]</span> " + preset_password_tip + "</div>";
-        }
+        var password = handler.permanent_password();
+        var value_field = password.length == 0 ? "" : "value=" + password;
        msgbox("custom-password", translate("Set Password"), "<div .form .set-password> \
-            <div><span>" + translate('Password') + ":</span><input|password(password) .outline-focus /></div> \
-            <div><span>" + translate('Confirmation') + ":</span><input|password(confirmation) /></div> \
-            " + password_tip + " \
+            <div><span>" + translate('Password') + ":</span><input|password(password) .outline-focus " + value_field + " /></div> \
+            <div><span>" + translate('Confirmation') + ":</span><input|password(confirmation) " + value_field + " /></div> \
        </div> \
        ", "", function(res=null) {
            if (!res) return;
            var p0 = (res.password || "").trim();
            var p1 = (res.confirmation || "").trim();
-            if (p0.length == 0 && p1.length == 0) {
-                return " ";
-            }
            if (p0.length < 6 && p0.length != 0) {
                return translate("Too short, at least 6 characters.");
            }
@@ -1166,15 +1147,6 @@ class PasswordArea: Reactor.Component {
            handler.set_permanent_password(p0);
            me.update();
        }, msgbox_default_height, get_msgbox_width());
-        self.timer(30ms, function() {
-            updateSetPasswordSubmitState();
-        });
-    }
-
-    event click $(li#clear-password) {
-        if (this.$(li#clear-password).state.disabled) return;
-        handler.set_permanent_password("");
-        this.update();
    }

    event click $(menu#edit-password-context>li) (_, me) {
@@ -1254,18 +1226,6 @@ function updatePasswordArea() {
 }
 if (!outgoing_only) updatePasswordArea();

-function updateSetPasswordSubmitState() {
-    var dialog = $(#msgbox);
-    if (!dialog) return;
-    var password = dialog.$(input[name='password']);
-    var confirmation = dialog.$(input[name='confirmation']);
-    var submit = dialog.$(button#submit);
-    if (!password || !confirmation || !submit) return;
-    var can_submit = (password.value || "").trim().length > 0 ||
-        (confirmation.value || "").trim().length > 0;
-    submit.state.disabled = !can_submit;
-}
-
 class ID: Reactor.Component {
    function render() {
        return <input type="text" #remote_id .outline-focus novalue={translate("Enter Remote ID")}
@@ -1323,22 +1283,6 @@ event keydown (evt) {
    }
 }

-event keyup $(#msgbox input[name='password']) {
-    updateSetPasswordSubmitState();
-}
-
-event keyup $(#msgbox input[name='confirmation']) {
-    updateSetPasswordSubmitState();
-}
-
-event change $(#msgbox input[name='password']) {
-    updateSetPasswordSubmitState();
-}
-
-event change $(#msgbox input[name='confirmation']) {
-    updateSetPasswordSubmitState();
-}
-
 $(body).content(<div style="size:*"><App /><div #msgbox /></div>);

 event click $(#powered-by) {
--- a/src/ui/msgbox.tis
+++ b/src/ui/msgbox.tis
@@ -193,10 +193,8 @@ class MsgboxComponent: Reactor.Component {
    }
    
    function submit() {
-        var submit_btn = this.$(button#submit);
-        if (submit_btn) {
-            if (submit_btn.state.disabled) return;
-            submit_btn.sendEvent("click");
+        if (this.$(button#submit)) {
+            this.$(button#submit).sendEvent("click");
        }
    }
    
--- a/src/ui_interface.rs
+++ b/src/ui_interface.rs
@@ -609,57 +609,19 @@ pub fn update_temporary_password() {
 }

 #[inline]
-pub fn is_permanent_password_set() -> bool {
+pub fn permanent_password() -> String {
    #[cfg(any(target_os = "android", target_os = "ios"))]
-    return Config::has_permanent_password();
+    return Config::get_permanent_password();
    #[cfg(not(any(target_os = "android", target_os = "ios")))]
-    {
-        let daemon_is_set = ipc::is_permanent_password_set();
-        // `daemon_is_set` is authoritative for the return value. Local storage is only used to
-        // decide whether we should attempt a sync to clear stale user-side state.
-        let local_storage_is_empty = if daemon_is_set {
-            true
-        } else {
-            let (storage, _) = Config::get_local_permanent_password_storage_and_salt();
-            storage.is_empty()
-        };
-        if daemon_is_set || !local_storage_is_empty {
-            allow_err!(ipc::sync_permanent_password_storage_from_daemon());
-        }
-        daemon_is_set
-    }
+    return ipc::get_permanent_password();
 }

 #[inline]
-pub fn is_local_permanent_password_set() -> bool {
+pub fn set_permanent_password(password: String) {
    #[cfg(any(target_os = "android", target_os = "ios"))]
-    return Config::has_local_permanent_password();
+    Config::set_permanent_password(&password);
    #[cfg(not(any(target_os = "android", target_os = "ios")))]
-    {
-        allow_err!(ipc::sync_permanent_password_storage_from_daemon());
-        Config::has_local_permanent_password()
-    }
-}
-
-pub fn set_permanent_password_with_result(password: String) -> bool {
-    if config::Config::is_disable_change_permanent_password() {
-        return false;
-    }
-    #[cfg(any(target_os = "android", target_os = "ios"))]
-    {
-        config::Config::set_permanent_password(&password);
-        return true;
-    }
-    #[cfg(not(any(target_os = "android", target_os = "ios")))]
-    {
-        match crate::ipc::set_permanent_password_with_ack(password) {
-            Ok(ok) => ok,
-            Err(err) => {
-                log::warn!("Failed to set permanent password via IPC: {err}");
-                false
-            }
-        }
-    }
+    allow_err!(ipc::set_permanent_password(password));
 }

 #[inline]
Author	SHA1	Message	Date
21pages	8deee9b281	fix: don't clear audit_guid during reconnect, clear it after connection established Signed-off-by: 21pages <sunboeasy@gmail.com>	2026-03-15 23:00:46 +08:00
copilot-swe-agent[bot]	439e3abc79	Fix: show ask-for-note dialog when user clicks OK on reconnecting screen (#14527 ) Co-authored-by: rustdesk <71636191+rustdesk@users.noreply.github.com>	2026-03-12 15:18:50 +00:00
copilot-swe-agent[bot]	b8c0787273	Initial plan	2026-03-12 15:12:58 +00:00