hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rustdesk:master' into master

Browse Source
This commit is contained in:
FastAct 2023-03-14 18:00:20 +01:00 committed by GitHub
commit 19b03d002d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flutter/pubspec.lock
View File

@ -325,8 +325,8 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: "980ae3b45837a4bc55d82231801ffcbb0806b0c1" ref: "6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e"
resolved-ref: "980ae3b45837a4bc55d82231801ffcbb0806b0c1" resolved-ref: "6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e"
url: "https://github.com/Kingtous/rustdesk_desktop_multi_window" url: "https://github.com/Kingtous/rustdesk_desktop_multi_window"
source: git source: git
version: "0.1.0" version: "0.1.0"
@ -1516,8 +1516,8 @@ packages:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: c140f9685bead805c433c9f5a4618a5115f01fa8 ref: "94ff0eeb7e20e93f50022b2090f0b6ffb725c7df"
resolved-ref: c140f9685bead805c433c9f5a4618a5115f01fa8 resolved-ref: "94ff0eeb7e20e93f50022b2090f0b6ffb725c7df"
url: "https://github.com/Kingtous/rustdesk_window_manager" url: "https://github.com/Kingtous/rustdesk_window_manager"
source: git source: git
version: "0.3.1" version: "0.3.1"

4
flutter/pubspec.yaml
View File

@ -55,11 +55,11 @@ dependencies:
window_manager: window_manager:
git: git:
url: https://github.com/Kingtous/rustdesk_window_manager url: https://github.com/Kingtous/rustdesk_window_manager
ref: c140f9685bead805c433c9f5a4618a5115f01fa8 ref: 94ff0eeb7e20e93f50022b2090f0b6ffb725c7df
desktop_multi_window: desktop_multi_window:
git: git:
url: https://github.com/Kingtous/rustdesk_desktop_multi_window url: https://github.com/Kingtous/rustdesk_desktop_multi_window
ref: 980ae3b45837a4bc55d82231801ffcbb0806b0c1 ref: 6cd00db1d68443aeeb13dc89f6a090a0ad5dbb3e
freezed_annotation: ^2.0.3 freezed_annotation: ^2.0.3
flutter_custom_cursor: ^0.0.4 flutter_custom_cursor: ^0.0.4
window_size: window_size:

8
src/lang/es.rs
View File

@ -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_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_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."), ("empty_address_book_tip", "Parece que actualmente no hay pares en tu libreta de direcciones."),
("eg: admin", ""), ("eg: admin", "ej.: admin"),
("Empty Username", ""), ("Empty Username", "Nombre de usuario vacío"),
("Empty Password", ""), ("Empty Password", "Contraseña vacía"),
("Me", ""), ("Me", "Yo"),
].iter().cloned().collect(); ].iter().cloned().collect();
} }

4
src/server/portable_service.rs
View File

@ -492,7 +492,7 @@ pub mod client {
"--portable-service", "--portable-service",
) { ) {
*SHMEM.lock().unwrap() = None; *SHMEM.lock().unwrap() = None;
bail!("Failed to run portable service process:{}", e); bail!("Failed to run portable service process: {}", e);
} }
} }
StartPara::Logon(username, password) => { StartPara::Logon(username, password) => {
@ -535,7 +535,7 @@ pub mod client {
"--portable-service", "--portable-service",
) { ) {
*SHMEM.lock().unwrap() = None; *SHMEM.lock().unwrap() = None;
bail!("Failed to run portable service process:{}", e); bail!("Failed to run portable service process: {}", e);
} }
} }
} }