From be20e03ee17619d6a402631b318124fc3076b416 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 28 Dec 2022 15:20:42 +0800 Subject: [PATCH 1/3] fix MacOS kVK_ISO_Section Signed-off-by: fufesou --- Cargo.lock | 27 +++++++++++++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 392c2c1f7..7fd3ddd7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1518,7 +1518,7 @@ dependencies = [ "log", "objc", "pkg-config", - "rdev", + "rdev 0.5.0-2 (git+https://github.com/asur4s/rdev)", "serde 1.0.149", "serde_derive", "tfc", @@ -4325,6 +4325,29 @@ dependencies = [ "x11 2.20.1", ] +[[package]] +name = "rdev" +version = "0.5.0-2" +source = "git+https://github.com/fufesou/rdev#bc2db2f13dfdc95df8a02eb03f71325c173283dc" +dependencies = [ + "cocoa", + "core-foundation 0.9.3", + "core-foundation-sys 0.8.3", + "core-graphics 0.22.3", + "enum-map", + "epoll", + "inotify", + "lazy_static", + "libc", + "log", + "mio 0.8.5", + "strum 0.24.1", + "strum_macros 0.24.3", + "widestring 1.0.2", + "winapi 0.3.9", + "x11 2.20.1", +] + [[package]] name = "rdrand" version = "0.4.0" @@ -4607,7 +4630,7 @@ dependencies = [ "num_cpus", "objc", "parity-tokio-ipc", - "rdev", + "rdev 0.5.0-2 (git+https://github.com/fufesou/rdev)", "repng", "reqwest", "rpassword 7.2.0", diff --git a/Cargo.toml b/Cargo.toml index feca1593e..4e2437185 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ default-net = "0.11.0" wol-rs = "0.9.1" flutter_rust_bridge = { git = "https://github.com/SoLongAndThanksForAllThePizza/flutter_rust_bridge", optional = true } errno = "0.2.8" -rdev = { git = "https://github.com/asur4s/rdev" } +rdev = { git = "https://github.com/fufesou/rdev" } url = { version = "2.1", features = ["serde"] } reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false } From b9ee0590bb2dda0a63aea14146fc054c9a719f69 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 28 Dec 2022 15:26:44 +0800 Subject: [PATCH 2/3] update rdev dep Signed-off-by: fufesou --- Cargo.lock | 27 ++------------------------- libs/enigo/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fd3ddd7c..ebf82edac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1518,7 +1518,7 @@ dependencies = [ "log", "objc", "pkg-config", - "rdev 0.5.0-2 (git+https://github.com/asur4s/rdev)", + "rdev", "serde 1.0.149", "serde_derive", "tfc", @@ -4302,29 +4302,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "rdev" -version = "0.5.0-2" -source = "git+https://github.com/asur4s/rdev#e2d6171a6d844aaac19cdbda04239e6b8cc483e5" -dependencies = [ - "cocoa", - "core-foundation 0.9.3", - "core-foundation-sys 0.8.3", - "core-graphics 0.22.3", - "enum-map", - "epoll", - "inotify", - "lazy_static", - "libc", - "log", - "mio 0.8.5", - "strum 0.24.1", - "strum_macros 0.24.3", - "widestring 1.0.2", - "winapi 0.3.9", - "x11 2.20.1", -] - [[package]] name = "rdev" version = "0.5.0-2" @@ -4630,7 +4607,7 @@ dependencies = [ "num_cpus", "objc", "parity-tokio-ipc", - "rdev 0.5.0-2 (git+https://github.com/fufesou/rdev)", + "rdev", "repng", "reqwest", "rpassword 7.2.0", diff --git a/libs/enigo/Cargo.toml b/libs/enigo/Cargo.toml index 83c79e064..2c4070ed1 100644 --- a/libs/enigo/Cargo.toml +++ b/libs/enigo/Cargo.toml @@ -22,7 +22,7 @@ appveyor = { repository = "pythoneer/enigo-85xiy" } serde = { version = "1.0", optional = true } serde_derive = { version = "1.0", optional = true } log = "0.4" -rdev = { git = "https://github.com/asur4s/rdev" } +rdev = { git = "https://github.com/fufesou/rdev" } tfc = { git = "https://github.com/asur4s/The-Fat-Controller" } hbb_common = { path = "../hbb_common" } From bf65a88647c4f449bd9ed525a73f35c1599d5798 Mon Sep 17 00:00:00 2001 From: Agent-JY Date: Wed, 28 Dec 2022 13:04:28 +0100 Subject: [PATCH 3/3] Update de.rs --- src/lang/de.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lang/de.rs b/src/lang/de.rs index 3150bcaa3..607fd13d8 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -369,7 +369,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Enable LAN Discovery", "LAN-Erkennung aktivieren"), ("Deny LAN Discovery", "LAN-Erkennung verbieten"), ("Write a message", "Nachricht schreiben"), - ("Prompt", ""), //Aufforderung"), + ("Prompt", "Meldung"), ("Please wait for confirmation of UAC...", "Bitte auf die Bestätigung des Nutzers warten..."), ("elevated_foreground_window_tip", "Das aktuell geöffnete Fenster des ferngesteuerten Computers benötigt höhere Rechte. Deshalb ist es derzeit nicht möglich, die Maus und die Tastatur zu verwenden. Bitten Sie den Nutzer, dessen Computer Sie fernsteuern, das Fenster zu minimieren oder die Rechte zu erhöhen. Um dieses Problem zunünftig zu vermeiden, wird empfohlen, die Software auf dem ferngesteuerten Computer zu installieren."), ("Disconnected", "Verbindung abgebrochen"), @@ -401,12 +401,12 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("hide_cm_tip", "Dies ist nur möglich, wenn der Zugriff nur über ein permanentes Passwort erfolgt."), ("wayland_experiment_tip", "Die Unterstützung von Wayland ist nur experimentell. Bitte nutzen Sie X11, wenn Sie einen unbeaufsichtigten Zugriff benötigen."), ("Right click to select tabs", "Register mit rechtem Mausklick auswählen"), - ("Skipped", ""), + ("Skipped", "Übersprungen"), ("Add to Address Book", "Zum Adressbuch hinzufügen"), ("Group", "Gruppe"), ("Search", "Suchen"), - ("Closed manually by the web console", ""), - ("Local keyboard type", ""), - ("Select local keyboard type", ""), + ("Closed manually by the web console", "Manuell über die Webkonsole beendet"), + ("Local keyboard type", "Lokaler Tastaturtyp"), + ("Select local keyboard type", "Lokalen Tastaturtyp Auswählen"), ].iter().cloned().collect(); }