Merge branch 'rustdesk:master' into master

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"

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:

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", "Contraseña vacía"),
+        ("Me", "Yo"),
     ].iter().cloned().collect();
 }

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);
                 }
             }
         }