From e4096eb5bf9ffcb0c3776b1b092990f5dcbfa427 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 14 Mar 2023 22:46:05 +0800 Subject: [PATCH 1/4] fix, linux, window resize Signed-off-by: fufesou --- flutter/pubspec.lock | 8 ++++---- flutter/pubspec.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flutter/pubspec.lock b/flutter/pubspec.lock index c2e1f58fc..6bd19d01a 100644 --- a/flutter/pubspec.lock +++ b/flutter/pubspec.lock @@ -325,8 +325,8 @@ packages: dependency: "direct main" description: path: "." - ref: "980ae3b45837a4bc55d82231801ffcbb0806b0c1" - resolved-ref: "980ae3b45837a4bc55d82231801ffcbb0806b0c1" + ref: "6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e" + resolved-ref: "6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e" url: "https://github.com/Kingtous/rustdesk_desktop_multi_window" source: git version: "0.1.0" @@ -1516,8 +1516,8 @@ packages: dependency: "direct main" description: path: "." - ref: c140f9685bead805c433c9f5a4618a5115f01fa8 - resolved-ref: c140f9685bead805c433c9f5a4618a5115f01fa8 + ref: "94ff0eeb7e20e93f50022b2090f0b6ffb725c7df" + resolved-ref: "94ff0eeb7e20e93f50022b2090f0b6ffb725c7df" url: "https://github.com/Kingtous/rustdesk_window_manager" source: git version: "0.3.1" diff --git a/flutter/pubspec.yaml b/flutter/pubspec.yaml index 3e301e107..5b98e85c0 100644 --- a/flutter/pubspec.yaml +++ b/flutter/pubspec.yaml @@ -55,11 +55,11 @@ dependencies: window_manager: git: url: https://github.com/Kingtous/rustdesk_window_manager - ref: c140f9685bead805c433c9f5a4618a5115f01fa8 + ref: 94ff0eeb7e20e93f50022b2090f0b6ffb725c7df desktop_multi_window: git: url: https://github.com/Kingtous/rustdesk_desktop_multi_window - ref: 980ae3b45837a4bc55d82231801ffcbb0806b0c1 + ref: 6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e freezed_annotation: ^2.0.3 flutter_custom_cursor: ^0.0.4 window_size: From 810c607de207c90b058a9ec2de0bb49607e2218a Mon Sep 17 00:00:00 2001 From: rustdesk Date: Tue, 14 Mar 2023 23:36:45 +0800 Subject: [PATCH 2/4] add space after `:` --- src/server/portable_service.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/portable_service.rs b/src/server/portable_service.rs index c49f974a7..d9acc4152 100644 --- a/src/server/portable_service.rs +++ b/src/server/portable_service.rs @@ -492,7 +492,7 @@ pub mod client { "--portable-service", ) { *SHMEM.lock().unwrap() = None; - bail!("Failed to run portable service process:{}", e); + bail!("Failed to run portable service process: {}", e); } } StartPara::Logon(username, password) => { @@ -535,7 +535,7 @@ pub mod client { "--portable-service", ) { *SHMEM.lock().unwrap() = None; - bail!("Failed to run portable service process:{}", e); + bail!("Failed to run portable service process: {}", e); } } } From b0c480311324857ffb071ef2bf2fca685cdb3ce4 Mon Sep 17 00:00:00 2001 From: "Miguel F. G" <116861809+flusheDData@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:50:35 +0100 Subject: [PATCH 3/4] Update es.rs New terms added --- src/lang/es.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lang/es.rs b/src/lang/es.rs index 3ee8fcb51..25154a276 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -473,9 +473,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_favorite_tip", "¿Sin pares favoritos aún?\nEncuentra uno al que conectarte y añádelo a favoritos!"), ("empty_lan_tip", "Oh no, parece que aún no has descubierto ningún par."), ("empty_address_book_tip", "Parece que actualmente no hay pares en tu libreta de direcciones."), - ("eg: admin", ""), - ("Empty Username", ""), - ("Empty Password", ""), - ("Me", ""), + ("eg: admin", "ej.: admin"), + ("Empty Username", "Nombre de usuario vacío"), + ("Empty Password", "Contaseña vacía"), + ("Me", "Yo"), ].iter().cloned().collect(); } From 2642dcf37dfa7be613c224f151ae237f2497c8a6 Mon Sep 17 00:00:00 2001 From: "Miguel F. G" <116861809+flusheDData@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:52:32 +0100 Subject: [PATCH 4/4] Update es.rs typo correction --- src/lang/es.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/es.rs b/src/lang/es.rs index 25154a276..d15061286 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -475,7 +475,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("empty_address_book_tip", "Parece que actualmente no hay pares en tu libreta de direcciones."), ("eg: admin", "ej.: admin"), ("Empty Username", "Nombre de usuario vacío"), - ("Empty Password", "Contaseña vacía"), + ("Empty Password", "Contraseña vacía"), ("Me", "Yo"), ].iter().cloned().collect(); }