From 352de75fdd1e65b14603ff9bfc0c058a435479aa Mon Sep 17 00:00:00 2001 From: Sahil Yeole <73148455+sahilyeole@users.noreply.github.com> Date: Wed, 10 Jan 2024 06:56:01 +0530 Subject: [PATCH 1/8] fix height (#6846) --- flutter/lib/mobile/pages/server_page.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flutter/lib/mobile/pages/server_page.dart b/flutter/lib/mobile/pages/server_page.dart index bcb077782..537d353b7 100644 --- a/flutter/lib/mobile/pages/server_page.dart +++ b/flutter/lib/mobile/pages/server_page.dart @@ -267,6 +267,7 @@ class _ScamWarningDialogState extends State { @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 { ), SizedBox(height: 18), SizedBox( - height: 220, + height: screenHeight * 0.3, child: Scrollbar( child: SingleChildScrollView( child: Text( From 2c8a60e0ea4f42b02da5f7ad1d83b54759ff06c6 Mon Sep 17 00:00:00 2001 From: Moaz bin Mokhtar Date: Wed, 10 Jan 2024 03:27:36 +0200 Subject: [PATCH 2/8] fix: update version of zbus to build system (#6845) --- .gitignore | 4 +++- vdi/host/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ec6251084..a19ef9ae7 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,6 @@ lib/generated_bridge.dart .ssh .devcontainer/.* # build cache in examples -examples/**/target/ \ No newline at end of file +examples/**/target/ +# === +vcpkg_installed \ No newline at end of file diff --git a/vdi/host/Cargo.toml b/vdi/host/Cargo.toml index 42b6fc83a..0584b4690 100644 --- a/vdi/host/Cargo.toml +++ b/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" From d5b082906549a7afee3a153e44fa8cf5940812f8 Mon Sep 17 00:00:00 2001 From: solokot Date: Wed, 10 Jan 2024 04:42:29 +0300 Subject: [PATCH 3/8] Update ru.rs (#6836) --- src/lang/ru.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 710e77b5e..832be0128 100644 --- a/src/lang/ru.rs +++ b/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(); } From 99e8753629418a8a84ce14a13e10f4e3ef70e704 Mon Sep 17 00:00:00 2001 From: FastAct <93490087+FastAct@users.noreply.github.com> Date: Wed, 10 Jan 2024 02:42:45 +0100 Subject: [PATCH 4/8] Update nl.rs (#6839) --- src/lang/nl.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/nl.rs b/src/lang/nl.rs index cc447b2af..b71b3775b 100644 --- a/src/lang/nl.rs +++ b/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(); } From e170153090aec6bd01582243d133010c937a7921 Mon Sep 17 00:00:00 2001 From: jxdv Date: Wed, 10 Jan 2024 01:42:58 +0000 Subject: [PATCH 5/8] update sk.rs (#6841) --- src/lang/sk.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/sk.rs b/src/lang/sk.rs index 8f1f3f21d..4590ff66d 100644 --- a/src/lang/sk.rs +++ b/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(); } From 9e25049fe8f3b8900fff5787585fb67fb60399ed Mon Sep 17 00:00:00 2001 From: jxdv Date: Wed, 10 Jan 2024 01:43:08 +0000 Subject: [PATCH 6/8] update cs.rs (#6842) --- src/lang/cs.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/cs.rs b/src/lang/cs.rs index b7c04758a..5b4a523fe 100644 --- a/src/lang/cs.rs +++ b/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(); } From 8c40c28fe07f377acfa241a845405ea62ce64e1c Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Wed, 10 Jan 2024 02:43:18 +0100 Subject: [PATCH 7/8] Update de.rs (#6843) --- src/lang/de.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/de.rs b/src/lang/de.rs index f18732aea..2365927eb 100644 --- a/src/lang/de.rs +++ b/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(); } From 467e6dfd16baed2b812afeb9f7885993a13a433e Mon Sep 17 00:00:00 2001 From: Integral Date: Wed, 10 Jan 2024 01:44:06 +0000 Subject: [PATCH 8/8] Update cn.rs (#6844) * Update cn.rs * Update cn.rs --------- Co-authored-by: RustDesk <71636191+rustdesk@users.noreply.github.com> --- src/lang/cn.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 006a3b07c..9fe91bddd 100644 --- a/src/lang/cn.rs +++ b/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(); }