Merge branch 'master' of github.com-rustdesk:rustdesk/rustdesk

.gitignore

@@ -49,4 +49,6 @@ lib/generated_bridge.dart
 .ssh
 .devcontainer/.*
 # build cache in examples
-examples/**/target/
+examples/**/target/
+# ===
+vcpkg_installed

flutter/lib/mobile/pages/server_page.dart

@@ -267,6 +267,7 @@ class _ScamWarningDialogState extends State<ScamWarningDialog> {
   @override
   Widget build(BuildContext context) {
     final isButtonLocked = _countdown > 0;
+    final screenHeight = MediaQuery.of(context).size.height;
 
     return AlertDialog(
       content: Container(
@@ -321,7 +322,7 @@ class _ScamWarningDialogState extends State<ScamWarningDialog> {
             ),
             SizedBox(height: 18),
             SizedBox(
-              height: 220,
+              height: screenHeight * 0.3,
               child: Scrollbar(
                 child: SingleChildScrollView(
                   child: Text(

src/lang/cn.rs

@@ -580,6 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "交换鼠标左右键"),
         ("2FA code", "双重认证代码"),
         ("2fa_tip", "请输入授权 app 中的双重认证代码"),
-        ("More", ""),
+        ("More", "更多"),
     ].iter().cloned().collect();
 }

src/lang/cs.rs

@@ -580,6 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Prohodit levé a pravé tlačítko myši"),
         ("2FA code", "2FA kód"),
         ("2fa_tip", "Zadejte svůj kód 2FA do ověřovací aplikace."),
-        ("More", ""),
+        ("More", "Více"),
     ].iter().cloned().collect();
 }

src/lang/de.rs

@@ -580,6 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Linke und rechte Maustaste tauschen"),
         ("2FA code", "2FA-Code"),
         ("2fa_tip", "Bitte geben Sie Ihren 2FA-Code in der Authentifizierungs-App ein."),
-        ("More", ""),
+        ("More", "Mehr"),
     ].iter().cloned().collect();
 }

src/lang/nl.rs

@@ -580,6 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "wissel-links-rechts-muis"),
         ("2FA code", "2FA-code"),
         ("2fa_tip", "Geef je 2FA-code op in de verificatie-app."),
-        ("More", ""),
+        ("More", "Meer"),
     ].iter().cloned().collect();
 }

src/lang/ru.rs

@@ -580,6 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Поменять левую и правую кнопки мыши"),
         ("2FA code", "Код 2FA"),
         ("2fa_tip", "Введите код двухфакторной аутентификации из приложения для аутентификации."),
-        ("More", ""),
+        ("More", "Ещё"),
     ].iter().cloned().collect();
 }

src/lang/sk.rs

@@ -580,6 +580,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("swap-left-right-mouse", "Prehodiť ľavé a pravé tlačidlo myši"),
         ("2FA code", "2FA kód"),
         ("2fa_tip", "Zadajte svoj kód 2FA do aplikácie na overovanie."),
-        ("More", ""),
+        ("More", "Viac"),
     ].iter().cloned().collect();
 }

vdi/host/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2021"
 qemu-display = { git = "https://github.com/rustdesk/qemu-display" }
 hbb_common = { path = "../../libs/hbb_common" }
 clap = { version = "4.1", features = ["derive"] }
-zbus = { version = "3.0" }
+zbus = { version = "3.14.1" }
 image = "0.24"
 async-trait = "0.1"