From 7d2c8c2ba1959c24d59ccf485406ce4a5307e464 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sun, 5 Mar 2023 23:23:33 +0100 Subject: [PATCH 01/29] Update template.rs --- src/lang/template.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lang/template.rs b/src/lang/template.rs index e51a095c0..638bb4d21 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } From 24dd9ff362418482aff05045ad06d7dac790d2cb Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Sun, 5 Mar 2023 23:25:17 +0100 Subject: [PATCH 02/29] Add files via upload --- src/lang/ca.rs | 3 ++- src/lang/cn.rs | 3 ++- src/lang/cs.rs | 3 ++- src/lang/da.rs | 3 ++- src/lang/de.rs | 3 ++- src/lang/eo.rs | 3 ++- src/lang/es.rs | 3 ++- src/lang/fa.rs | 3 ++- src/lang/fr.rs | 3 ++- src/lang/gr.rs | 3 ++- src/lang/hu.rs | 3 ++- src/lang/id.rs | 3 ++- src/lang/it.rs | 3 ++- src/lang/ja.rs | 3 ++- src/lang/ko.rs | 3 ++- src/lang/kz.rs | 3 ++- src/lang/nl.rs | 3 ++- src/lang/pl.rs | 4 ++-- src/lang/pt_PT.rs | 3 ++- src/lang/ptbr.rs | 3 ++- src/lang/ro.rs | 3 ++- src/lang/ru.rs | 3 ++- src/lang/sk.rs | 3 ++- src/lang/sl.rs | 3 ++- src/lang/sq.rs | 3 ++- src/lang/sr.rs | 3 ++- src/lang/sv.rs | 3 ++- src/lang/th.rs | 3 ++- src/lang/tr.rs | 3 ++- src/lang/tw.rs | 3 ++- src/lang/ua.rs | 3 ++- src/lang/vn.rs | 3 ++- 32 files changed, 64 insertions(+), 33 deletions(-) diff --git a/src/lang/ca.rs b/src/lang/ca.rs index 89cc46920..a8f5758ee 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 3f4f6d25c..03e253bfb 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "编解码"), ("Resolution", "分辨率"), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index a2813815b..e85c95969 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index 2760f94fb..f933972d9 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index 36493f747..5ac7de62e 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Auflösung"), ("No transfers in progress", "Keine Übertragungen im Gange"), - ].iter().cloned().collect(); + ("Set temporary password length", "Temporäre Passwortlänge festlegen"), + ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 7a191f05d..667071e3f 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index b290c7696..a93d0ccd9 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Códec"), ("Resolution", "Resolución"), ("No transfers in progress", "No hay transferencias en curso"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 7fe279a1b..d20f321f3 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "کدک"), ("Resolution", "وضوح"), ("No transfers in progress", "هیچ انتقالی در حال انجام نیست"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index dd436831e..bc6a23d71 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/gr.rs b/src/lang/gr.rs index f517f61a1..336b1092c 100644 --- a/src/lang/gr.rs +++ b/src/lang/gr.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Κωδικοποίηση"), ("Resolution", "Ανάλυση"), ("No transfers in progress", "Δεν υπάρχει μεταφορά σε εξέλιξη"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 8727c53c2..62ec3b018 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index b363a2ae8..996fd3a3b 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 340794ceb..65e685f4c 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Risoluzione"), ("No transfers in progress", "Nessun trasferimento in corso"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 260c27607..00b71c57b 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index f101ae20b..f2cbc2ab0 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index fe0937a65..d0b712ff5 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 63d3cee7b..fc4490aae 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Resolutie"), ("No transfers in progress", "Geen overdrachten in uitvoering"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 162dec052..b1cd7eb7c 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -459,7 +459,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Reconnect", "Połącz ponownie"), ("Codec", "Kodek"), ("Resolution", "Rozdzielczość"), - ("Key", "Klucz"), ("No transfers in progress", "Brak transferów w toku"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 8eb4df2ad..6f3504218 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 973048f3d..cbb0651a9 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 9e252aa8a..76a234aff 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 4c1f9ae34..a8705d531 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Кодек"), ("Resolution", "Разрешение"), ("No transfers in progress", "Передача не осуществляется"), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index d60384286..55bf55aff 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index bd07b1acb..39e54b66d 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index b8f9203ca..86f877aa0 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 4a9b73374..24ddb85be 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index f73154e3e..a565be50e 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 3214c3452..2f2c4fa31 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 82f95ef84..cf7e9997b 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index d0f12cdfa..fc1576db7 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "編解碼"), ("Resolution", "分辨率"), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 793d1e147..1eb6eea7a 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index fc665834d..193408b0e 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -460,5 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ].iter().cloned().collect(); + ("Set temporary password length", ""), + ].iter().cloned().collect(); } From 52970b0e5848058874c3390450cf81a21c7f2ffa Mon Sep 17 00:00:00 2001 From: 21pages Date: Mon, 6 Mar 2023 17:17:51 +0800 Subject: [PATCH 03/29] recover addToFav in lan Signed-off-by: 21pages --- flutter/lib/common/widgets/peer_card.dart | 11 +++----- src/flutter_ffi.rs | 32 ++++++++++++++++++----- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart index 5a7f2bfa7..7d2d0cd2d 100644 --- a/flutter/lib/common/widgets/peer_card.dart +++ b/flutter/lib/common/widgets/peer_card.dart @@ -890,13 +890,10 @@ class DiscoveredPeerCard extends BasePeerCard { menuItems.add(_createShortCutAction(peer.id)); } - final inRecent = await bind.mainIsInRecentPeers(id: peer.id); - if (inRecent) { - if (!favs.contains(peer.id)) { - menuItems.add(_addFavAction(peer.id)); - } else { - menuItems.add(_rmFavAction(peer.id, () async {})); - } + if (!favs.contains(peer.id)) { + menuItems.add(_addFavAction(peer.id)); + } else { + menuItems.add(_rmFavAction(peer.id, () async {})); } if (gFFI.userModel.userName.isNotEmpty) { diff --git a/src/flutter_ffi.rs b/src/flutter_ffi.rs index e5b24fa53..2a3baad95 100644 --- a/src/flutter_ffi.rs +++ b/src/flutter_ffi.rs @@ -10,7 +10,7 @@ use crate::{ }; use flutter_rust_bridge::{StreamSink, SyncReturn}; use hbb_common::{ - config::{self, LocalConfig, PeerConfig, ONLINE}, + config::{self, LocalConfig, PeerConfig, PeerInfoSerde, ONLINE}, fs, log, message_proto::KeyboardMode, ResultType, @@ -21,6 +21,7 @@ use std::{ ffi::{CStr, CString}, os::raw::c_char, str::FromStr, + time::SystemTime, }; // use crate::hbbs_http::account::AuthResult; @@ -726,10 +727,6 @@ pub fn main_peer_has_password(id: String) -> bool { peer_has_password(id) } -pub fn main_is_in_recent_peers(id: String) -> bool { - PeerConfig::peers().iter().any(|e| e.0 == id) -} - pub fn main_load_recent_peers() { if !config::APP_DIR.read().unwrap().is_empty() { let peers: Vec> = PeerConfig::peers() @@ -756,7 +753,28 @@ pub fn main_load_recent_peers() { pub fn main_load_fav_peers() { if !config::APP_DIR.read().unwrap().is_empty() { let favs = get_fav(); - let peers: Vec> = PeerConfig::peers() + let mut recent = PeerConfig::peers(); + let mut lan = config::LanPeers::load() + .peers + .iter() + .filter(|d| recent.iter().all(|r| r.0 != d.id)) + .map(|d| { + ( + d.id.clone(), + SystemTime::UNIX_EPOCH, + PeerConfig { + info: PeerInfoSerde { + username: d.username.clone(), + hostname: d.hostname.clone(), + platform: d.platform.clone(), + }, + ..Default::default() + }, + ) + }) + .collect(); + recent.append(&mut lan); + let peers: Vec> = recent .into_iter() .filter_map(|(id, _, p)| { if favs.contains(&id) { @@ -1361,7 +1379,7 @@ pub fn send_url_scheme(_url: String) { #[cfg(target_os = "android")] pub mod server_side { - use hbb_common::{log, config}; + use hbb_common::{config, log}; use jni::{ objects::{JClass, JString}, sys::jstring, From 507472e87e04930382660c289ff95571d068bea5 Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 6 Mar 2023 15:29:37 +0800 Subject: [PATCH 04/29] show one display when privacy mode is on Signed-off-by: fufesou --- flutter/lib/desktop/widgets/remote_menubar.dart | 4 +++- libs/scrap/src/dxgi/mag.rs | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart index 081cd1649..f5e791551 100644 --- a/flutter/lib/desktop/widgets/remote_menubar.dart +++ b/flutter/lib/desktop/widgets/remote_menubar.dart @@ -509,7 +509,9 @@ class _MonitorMenu extends StatelessWidget { @override Widget build(BuildContext context) { - if (stateGlobal.displaysCount.value < 2) return Offstage(); + if (PrivacyModeState.find(id).isTrue || stateGlobal.displaysCount.value < 2) { + return Offstage(); + } return _IconSubmenuButton( icon: icon(), ffi: ffi, diff --git a/libs/scrap/src/dxgi/mag.rs b/libs/scrap/src/dxgi/mag.rs index b2bea1dd1..62e90c08b 100644 --- a/libs/scrap/src/dxgi/mag.rs +++ b/libs/scrap/src/dxgi/mag.rs @@ -127,15 +127,6 @@ impl MagInterface { }; s.init_succeeded = false; unsafe { - if GetSystemMetrics(SM_CMONITORS) != 1 { - // Do not try to use the magnifier in multi-screen setup (where the API - // crashes sometimes). - return Err(Error::new( - ErrorKind::Other, - "Magnifier capturer cannot work on multi-screen system.", - )); - } - // load lib let lib_file_name = "Magnification.dll"; let lib_file_name_c = CString::new(lib_file_name).unwrap(); From 80326598413ec85e0c3258986d0cd9cb9c25db62 Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 6 Mar 2023 16:41:26 +0800 Subject: [PATCH 05/29] Do not enable privacy mode if current display is not the primary one Signed-off-by: fufesou --- flutter/lib/desktop/widgets/remote_menubar.dart | 13 ++++++++++++- src/lang/ca.rs | 1 + src/lang/cn.rs | 1 + src/lang/cs.rs | 1 + src/lang/da.rs | 1 + src/lang/de.rs | 1 + src/lang/eo.rs | 1 + src/lang/es.rs | 1 + src/lang/fa.rs | 1 + src/lang/fr.rs | 1 + src/lang/gr.rs | 1 + src/lang/hu.rs | 1 + src/lang/id.rs | 1 + src/lang/it.rs | 1 + src/lang/ja.rs | 1 + src/lang/ko.rs | 1 + src/lang/kz.rs | 1 + src/lang/nl.rs | 1 + src/lang/pl.rs | 2 +- src/lang/pt_PT.rs | 1 + src/lang/ptbr.rs | 1 + src/lang/ro.rs | 1 + src/lang/ru.rs | 1 + src/lang/sk.rs | 1 + src/lang/sl.rs | 1 + src/lang/sq.rs | 1 + src/lang/sr.rs | 1 + src/lang/sv.rs | 1 + src/lang/template.rs | 1 + src/lang/th.rs | 1 + src/lang/tr.rs | 1 + src/lang/tw.rs | 1 + src/lang/ua.rs | 1 + src/lang/vn.rs | 1 + 34 files changed, 45 insertions(+), 2 deletions(-) diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart index f5e791551..173ed038c 100644 --- a/flutter/lib/desktop/widgets/remote_menubar.dart +++ b/flutter/lib/desktop/widgets/remote_menubar.dart @@ -509,7 +509,8 @@ class _MonitorMenu extends StatelessWidget { @override Widget build(BuildContext context) { - if (PrivacyModeState.find(id).isTrue || stateGlobal.displaysCount.value < 2) { + if (PrivacyModeState.find(id).isTrue || + stateGlobal.displaysCount.value < 2) { return Offstage(); } return _IconSubmenuButton( @@ -1548,6 +1549,16 @@ class _DisplayMenuState extends State<_DisplayMenu> { value: rxValue.value, onChanged: (value) { if (value == null) return; + if (widget.ffi.ffiModel.pi.currentDisplay != 0) { + msgBox( + widget.id, + 'custom-nook-nocancel-hasclose', + 'info', + 'Please switch to Display 1 first', + '', + widget.ffi.dialogManager); + return; + } bind.sessionToggleOption(id: widget.id, value: option); }, ffi: widget.ffi, diff --git a/src/lang/ca.rs b/src/lang/ca.rs index 89cc46920..ac7760321 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Aconseguit"), ("Someone turns on privacy mode, exit", "Algú ha activat el mode de privacitat, surti"), ("Unsupported", "No suportat"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer denegat"), ("Please install plugins", "Instal·li complements"), ("Peer exit", "El peer ha sortit"), diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 3f4f6d25c..3dfa63b83 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "其他用户使用隐私模式，退出"), ("Unsupported", "不支持"), + ("Please switch to Display 1 first", "请先切换到第一个屏幕") ("Peer denied", "被控端拒绝"), ("Please install plugins", "请安装插件"), ("Peer exit", "被控端退出"), diff --git a/src/lang/cs.rs b/src/lang/cs.rs index a2813815b..64874d2c7 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspěl"), ("Someone turns on privacy mode, exit", "Někdo zapne režim soukromí, ukončete ho"), ("Unsupported", "Nepodporováno"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer popřel"), ("Please install plugins", "Nainstalujte si prosím pluginy"), ("Peer exit", "Peer exit"), diff --git a/src/lang/da.rs b/src/lang/da.rs index 2760f94fb..5970f8932 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Vellykket"), ("Someone turns on privacy mode, exit", "Nogen aktiverede databeskyttelsestilstand, slut"), ("Unsupported", "Ikke understøttet"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer nægtet"), ("Please install plugins", "Venligst Installer plugins"), ("Peer exit", "Peer-Afslut"), diff --git a/src/lang/de.rs b/src/lang/de.rs index 36493f747..5907fb0cd 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Erfolgreich"), ("Someone turns on privacy mode, exit", "Jemand hat den Datenschutzmodus aktiviert, beende …"), ("Unsupported", "Nicht unterstützt"), + ("Please switch to Display 1 first", "") ("Peer denied", "Die Gegenstelle hat die Verbindung abgelehnt."), ("Please install plugins", "Bitte installieren Sie Plugins"), ("Peer exit", "Die Gegenstelle hat die Verbindung getrennt."), diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 7a191f05d..d465b3de8 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", ""), ("Someone turns on privacy mode, exit", ""), ("Unsupported", ""), + ("Please switch to Display 1 first", "") ("Peer denied", ""), ("Please install plugins", ""), ("Peer exit", ""), diff --git a/src/lang/es.rs b/src/lang/es.rs index b290c7696..95f2f69e2 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Logrado"), ("Someone turns on privacy mode, exit", "Alguien active el modo privacidad, salga"), ("Unsupported", "No soportado"), + ("Please switch to Display 1 first", "") ("Peer denied", "Par denegado"), ("Please install plugins", "Instale complementos"), ("Peer exit", "Par salio"), diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 7fe279a1b..bd3e1b28d 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "موفقیت آمیز"), ("Someone turns on privacy mode, exit", "اگر شخصی حالت حریم خصوصی را روشن کرد، خارج شوید"), ("Unsupported", "پشتیبانی نشده"), + ("Please switch to Display 1 first", "") ("Peer denied", "توسط میزبان راه دور رد شد"), ("Please install plugins", "لطفا افزونه ها را نصب کنید"), ("Peer exit", "میزبان خارج شد"), diff --git a/src/lang/fr.rs b/src/lang/fr.rs index dd436831e..0eeb71afb 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Succès"), ("Someone turns on privacy mode, exit", "Quelqu'un active le mode de confidentialité, quittez"), ("Unsupported", "Non pris en charge"), + ("Please switch to Display 1 first", "") ("Peer denied", "Pair refusé"), ("Please install plugins", "Veuillez installer les plugins"), ("Peer exit", "Sortie des pairs"), diff --git a/src/lang/gr.rs b/src/lang/gr.rs index 8629879ca..ec961f2e1 100644 --- a/src/lang/gr.rs +++ b/src/lang/gr.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Επιτυχής"), ("Someone turns on privacy mode, exit", "Κάποιος ενεργοποιεί τη λειτουργία απορρήτου, έξοδος"), ("Unsupported", "Δεν υποστηρίζεται"), + ("Please switch to Display 1 first", "") ("Peer denied", "Ο απομακρυσμένος σταθμός απέρριψε τη σύνδεση"), ("Please install plugins", "Παρακαλώ εγκαταστήστε τα πρόσθετα"), ("Peer exit", "Ο απομακρυσμένος σταθμός έχει αποσυνδεθεί"), diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 8727c53c2..6ea7c561e 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sikeres"), ("Someone turns on privacy mode, exit", "Valaki bekacsolta az inkognitó módot, lépjen ki"), ("Unsupported", "Nem támogatott"), + ("Please switch to Display 1 first", "") ("Peer denied", "Elutasítva a távoli fél álltal"), ("Please install plugins", "Kérem telepítse a bővítményeket"), ("Peer exit", "A távoli fél kilépett"), diff --git a/src/lang/id.rs b/src/lang/id.rs index b363a2ae8..b617190fd 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Berhasil"), ("Someone turns on privacy mode, exit", "Seseorang mengaktifkan mode privasi, keluar"), ("Unsupported", "Tidak didukung"), + ("Please switch to Display 1 first", "") ("Peer denied", "Rekan ditolak"), ("Please install plugins", "Silakan instal plugin"), ("Peer exit", "keluar rekan"), diff --git a/src/lang/it.rs b/src/lang/it.rs index 340794ceb..713c73fa6 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Successo"), ("Someone turns on privacy mode, exit", "Qualcuno attiva la modalità privacy, esci"), ("Unsupported", "Non supportato"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer negato"), ("Please install plugins", "Si prega di installare i plugin"), ("Peer exit", "Uscita tra pari"), diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 260c27607..c4d29ad73 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "プライバシーモードがオンになりました。終了します。"), ("Unsupported", "サポートされていません"), + ("Please switch to Display 1 first", "") ("Peer denied", "相手が拒否しました"), ("Please install plugins", "プラグインをインストールしてください"), ("Peer exit", "相手が終了しました"), diff --git a/src/lang/ko.rs b/src/lang/ko.rs index f101ae20b..3d1330a31 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "성공"), ("Someone turns on privacy mode, exit", "누군가가 개인정보 보호 모드를 활성화하여 종료됩니다"), ("Unsupported", "지원되지 않음"), + ("Please switch to Display 1 first", "") ("Peer denied", "다른 사용자에 의해 거부됨"), ("Please install plugins", "플러그인을 설치해주세요"), ("Peer exit", "다른 사용자가 나감"), diff --git a/src/lang/kz.rs b/src/lang/kz.rs index fe0937a65..c1480377b 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Сәтті"), ("Someone turns on privacy mode, exit", "Біреу құпиялылық модасын қосты, шығу"), ("Unsupported", "Қолдаусыз"), + ("Please switch to Display 1 first", "") ("Peer denied", "Пир қабылдамады"), ("Please install plugins", "Плагиндерді орнатуды өтінеміз"), ("Peer exit", "Пирдің шығуы"), diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 63d3cee7b..377e40a1d 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Geslaagd"), ("Someone turns on privacy mode, exit", "Iemand schakelt privacymodus in, afsluiten"), ("Unsupported", "Niet Ondersteund"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer geweigerd"), ("Please install plugins", "Installeer plugins"), ("Peer exit", "Peer afgesloten"), diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 162dec052..e4c4839f5 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Udało się"), ("Someone turns on privacy mode, exit", "Ktoś włącza tryb prywatności, wyjdź"), ("Unsupported", "Niewspierane"), + ("Please switch to Display 1 first", "") ("Peer denied", "Odmowa dostępu"), ("Please install plugins", "Zainstaluj wtyczkę"), ("Peer exit", "Wyjście peer"), @@ -459,7 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Reconnect", "Połącz ponownie"), ("Codec", "Kodek"), ("Resolution", "Rozdzielczość"), - ("Key", "Klucz"), ("No transfers in progress", "Brak transferów w toku"), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 8eb4df2ad..541023197 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Conseguiu"), ("Someone turns on privacy mode, exit", "Alguém activou o modo de privacidade, desligue"), ("Unsupported", "Sem suporte"), + ("Please switch to Display 1 first", "") ("Peer denied", "Remoto negado"), ("Please install plugins", "Por favor instale plugins"), ("Peer exit", "Saída do Remoto"), diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 973048f3d..1a35421fd 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sucesso"), ("Someone turns on privacy mode, exit", "Alguém habilitou o modo de privacidade, sair"), ("Unsupported", "Não suportado"), + ("Please switch to Display 1 first", "") ("Peer denied", "Parceiro negou"), ("Please install plugins", "Por favor instale plugins"), ("Peer exit", "Parceiro saiu"), diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 9e252aa8a..ccfeb412c 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Reușit"), ("Someone turns on privacy mode, exit", "Cineva activează modul privat, ieși din"), ("Unsupported", "Neacceptat"), + ("Please switch to Display 1 first", "") ("Peer denied", "Dispozitiv pereche refuzat"), ("Please install plugins", "Instalează pluginuri"), ("Peer exit", "Ieșire dispozitiv pereche"), diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 4c1f9ae34..8692d1d87 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Выполнено"), ("Someone turns on privacy mode, exit", "Кто-то включает режим конфиденциальности, выход"), ("Unsupported", "Не поддерживается"), + ("Please switch to Display 1 first", "") ("Peer denied", "Отклонено удалённым узлом"), ("Please install plugins", "Установите плагины"), ("Peer exit", "Удалённый узел отключён"), diff --git a/src/lang/sk.rs b/src/lang/sk.rs index d60384286..be48c7338 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Podarilo sa"), ("Someone turns on privacy mode, exit", "Niekto zapne režim súkromia, ukončite ho"), ("Unsupported", "Nepodporované"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer poprel"), ("Please install plugins", "Nainštalujte si prosím pluginy"), ("Peer exit", "Peer exit"), diff --git a/src/lang/sl.rs b/src/lang/sl.rs index bd07b1acb..0706c38c0 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspelo"), ("Someone turns on privacy mode, exit", "Vklopljen je zasebni način, izhod"), ("Unsupported", "Ni podprto"), + ("Please switch to Display 1 first", "") ("Peer denied", "Odjemalec zavrnil"), ("Please install plugins", "Namestite vključke"), ("Peer exit", "Odjemalec se je zaprl"), diff --git a/src/lang/sq.rs b/src/lang/sq.rs index b8f9203ca..fac32f1a7 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sukses"), ("Someone turns on privacy mode, exit", "Dikush ka ndezur menyrën e privatësisë , largohu"), ("Unsupported", "Nuk mbështetet"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer mohohet"), ("Please install plugins", "Ju lutemi instaloni shtojcat"), ("Peer exit", "Dalje peer"), diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 4a9b73374..85903f03a 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspešno"), ("Someone turns on privacy mode, exit", "Neko je uključio mod privatnosti, izlaz."), ("Unsupported", "Nepodržano"), + ("Please switch to Display 1 first", "") ("Peer denied", "Klijent zabranjen"), ("Please install plugins", "Molimo instalirajte dodatke"), ("Peer exit", "Klijent izašao"), diff --git a/src/lang/sv.rs b/src/lang/sv.rs index f73154e3e..2987c9e57 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Lyckades"), ("Someone turns on privacy mode, exit", "Någon sätter på säkerhetesläge, avsluta"), ("Unsupported", "Stöds inte"), + ("Please switch to Display 1 first", "") ("Peer denied", "Klienten nekade"), ("Please install plugins", "Var god installera plugins"), ("Peer exit", "Avsluta klient"), diff --git a/src/lang/template.rs b/src/lang/template.rs index e51a095c0..94e0d8fa1 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", ""), ("Someone turns on privacy mode, exit", ""), ("Unsupported", ""), + ("Please switch to Display 1 first", "") ("Peer denied", ""), ("Please install plugins", ""), ("Peer exit", ""), diff --git a/src/lang/th.rs b/src/lang/th.rs index 3214c3452..05d727e7b 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "สำเร็จ"), ("Someone turns on privacy mode, exit", "มีใครบางคนเปิดใช้งานโหมดความเป็นส่วนตัว กำลังออก"), ("Unsupported", "ไม่รองรับ"), + ("Please switch to Display 1 first", "") ("Peer denied", "ถูกปฏิเสธโดยอีกฝั่ง"), ("Please install plugins", "กรุณาติดตั้งปลั๊กอิน"), ("Peer exit", "อีกฝั่งออก"), diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 82f95ef84..280ed4099 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "başarılı"), ("Someone turns on privacy mode, exit", "Birisi gizlilik modunu açarsa, çık"), ("Unsupported", "desteklenmiyor"), + ("Please switch to Display 1 first", "") ("Peer denied", "eş reddedildi"), ("Please install plugins", "Lütfen eklentileri yükleyin"), ("Peer exit", "eş çıkışı"), diff --git a/src/lang/tw.rs b/src/lang/tw.rs index d0f12cdfa..7ad3074f9 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "其他用戶開啟隱私模式，退出"), ("Unsupported", "不支持"), + ("Please switch to Display 1 first", "") ("Peer denied", "被控端拒絕"), ("Please install plugins", "請安裝插件"), ("Peer exit", "被控端退出"), diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 793d1e147..9211bd286 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Успішно"), ("Someone turns on privacy mode, exit", "Хтось вмикає режим конфіденційності, вихід"), ("Unsupported", "Не підтримується"), + ("Please switch to Display 1 first", "") ("Peer denied", "Відхилено віддаленим комп'ютером"), ("Please install plugins", "Будь ласка, встановіть плагіни"), ("Peer exit", "Відключено віддаленим комп'ютером"), diff --git a/src/lang/vn.rs b/src/lang/vn.rs index fc665834d..a26ae1225 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -301,6 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Thành công"), ("Someone turns on privacy mode, exit", "Ai đó đã bật chế độ riêng tư, thoát"), ("Unsupported", "Không hỗ trợ"), + ("Please switch to Display 1 first", "") ("Peer denied", "Peer đã từ chối"), ("Please install plugins", "Hãy cài plugins"), ("Peer exit", "Peer đã thoát"), From c751ebee4e8fe0a498e7019d18d8b34723495dd9 Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 6 Mar 2023 16:54:19 +0800 Subject: [PATCH 06/29] fix build Signed-off-by: fufesou --- libs/scrap/src/dxgi/mag.rs | 9 +++++++++ src/lang/ca.rs | 2 +- src/lang/cn.rs | 2 +- src/lang/cs.rs | 2 +- src/lang/da.rs | 2 +- src/lang/de.rs | 2 +- src/lang/eo.rs | 2 +- src/lang/es.rs | 2 +- src/lang/fa.rs | 2 +- src/lang/fr.rs | 2 +- src/lang/gr.rs | 2 +- src/lang/hu.rs | 2 +- src/lang/id.rs | 2 +- src/lang/it.rs | 2 +- src/lang/ja.rs | 2 +- src/lang/ko.rs | 2 +- src/lang/kz.rs | 2 +- src/lang/nl.rs | 2 +- src/lang/pl.rs | 2 +- src/lang/pt_PT.rs | 2 +- src/lang/ptbr.rs | 2 +- src/lang/ro.rs | 2 +- src/lang/ru.rs | 2 +- src/lang/sk.rs | 2 +- src/lang/sl.rs | 2 +- src/lang/sq.rs | 2 +- src/lang/sr.rs | 2 +- src/lang/sv.rs | 2 +- src/lang/template.rs | 2 +- src/lang/th.rs | 2 +- src/lang/tr.rs | 2 +- src/lang/tw.rs | 2 +- src/lang/ua.rs | 2 +- src/lang/vn.rs | 2 +- src/win_privacy.rs | 2 +- 35 files changed, 43 insertions(+), 34 deletions(-) diff --git a/libs/scrap/src/dxgi/mag.rs b/libs/scrap/src/dxgi/mag.rs index 62e90c08b..b2bea1dd1 100644 --- a/libs/scrap/src/dxgi/mag.rs +++ b/libs/scrap/src/dxgi/mag.rs @@ -127,6 +127,15 @@ impl MagInterface { }; s.init_succeeded = false; unsafe { + if GetSystemMetrics(SM_CMONITORS) != 1 { + // Do not try to use the magnifier in multi-screen setup (where the API + // crashes sometimes). + return Err(Error::new( + ErrorKind::Other, + "Magnifier capturer cannot work on multi-screen system.", + )); + } + // load lib let lib_file_name = "Magnification.dll"; let lib_file_name_c = CString::new(lib_file_name).unwrap(); diff --git a/src/lang/ca.rs b/src/lang/ca.rs index ac7760321..57787dead 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Aconseguit"), ("Someone turns on privacy mode, exit", "Algú ha activat el mode de privacitat, surti"), ("Unsupported", "No suportat"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer denegat"), ("Please install plugins", "Instal·li complements"), ("Peer exit", "El peer ha sortit"), diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 3dfa63b83..55e805848 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "其他用户使用隐私模式，退出"), ("Unsupported", "不支持"), - ("Please switch to Display 1 first", "请先切换到第一个屏幕") + ("Please switch to Display 1 first", "请先切换到第一个屏"), ("Peer denied", "被控端拒绝"), ("Please install plugins", "请安装插件"), ("Peer exit", "被控端退出"), diff --git a/src/lang/cs.rs b/src/lang/cs.rs index 64874d2c7..3ee9e5233 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspěl"), ("Someone turns on privacy mode, exit", "Někdo zapne režim soukromí, ukončete ho"), ("Unsupported", "Nepodporováno"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer popřel"), ("Please install plugins", "Nainstalujte si prosím pluginy"), ("Peer exit", "Peer exit"), diff --git a/src/lang/da.rs b/src/lang/da.rs index 5970f8932..e3e5a4049 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Vellykket"), ("Someone turns on privacy mode, exit", "Nogen aktiverede databeskyttelsestilstand, slut"), ("Unsupported", "Ikke understøttet"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer nægtet"), ("Please install plugins", "Venligst Installer plugins"), ("Peer exit", "Peer-Afslut"), diff --git a/src/lang/de.rs b/src/lang/de.rs index 5907fb0cd..c562472be 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Erfolgreich"), ("Someone turns on privacy mode, exit", "Jemand hat den Datenschutzmodus aktiviert, beende …"), ("Unsupported", "Nicht unterstützt"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Die Gegenstelle hat die Verbindung abgelehnt."), ("Please install plugins", "Bitte installieren Sie Plugins"), ("Peer exit", "Die Gegenstelle hat die Verbindung getrennt."), diff --git a/src/lang/eo.rs b/src/lang/eo.rs index d465b3de8..cbbeecc10 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", ""), ("Someone turns on privacy mode, exit", ""), ("Unsupported", ""), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", ""), ("Please install plugins", ""), ("Peer exit", ""), diff --git a/src/lang/es.rs b/src/lang/es.rs index 95f2f69e2..bd4df8e04 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Logrado"), ("Someone turns on privacy mode, exit", "Alguien active el modo privacidad, salga"), ("Unsupported", "No soportado"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Par denegado"), ("Please install plugins", "Instale complementos"), ("Peer exit", "Par salio"), diff --git a/src/lang/fa.rs b/src/lang/fa.rs index bd3e1b28d..66ec011c4 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "موفقیت آمیز"), ("Someone turns on privacy mode, exit", "اگر شخصی حالت حریم خصوصی را روشن کرد، خارج شوید"), ("Unsupported", "پشتیبانی نشده"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "توسط میزبان راه دور رد شد"), ("Please install plugins", "لطفا افزونه ها را نصب کنید"), ("Peer exit", "میزبان خارج شد"), diff --git a/src/lang/fr.rs b/src/lang/fr.rs index 0eeb71afb..a343202e1 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Succès"), ("Someone turns on privacy mode, exit", "Quelqu'un active le mode de confidentialité, quittez"), ("Unsupported", "Non pris en charge"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Pair refusé"), ("Please install plugins", "Veuillez installer les plugins"), ("Peer exit", "Sortie des pairs"), diff --git a/src/lang/gr.rs b/src/lang/gr.rs index ec961f2e1..b38a96065 100644 --- a/src/lang/gr.rs +++ b/src/lang/gr.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Επιτυχής"), ("Someone turns on privacy mode, exit", "Κάποιος ενεργοποιεί τη λειτουργία απορρήτου, έξοδος"), ("Unsupported", "Δεν υποστηρίζεται"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Ο απομακρυσμένος σταθμός απέρριψε τη σύνδεση"), ("Please install plugins", "Παρακαλώ εγκαταστήστε τα πρόσθετα"), ("Peer exit", "Ο απομακρυσμένος σταθμός έχει αποσυνδεθεί"), diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 6ea7c561e..2f6aafe95 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sikeres"), ("Someone turns on privacy mode, exit", "Valaki bekacsolta az inkognitó módot, lépjen ki"), ("Unsupported", "Nem támogatott"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Elutasítva a távoli fél álltal"), ("Please install plugins", "Kérem telepítse a bővítményeket"), ("Peer exit", "A távoli fél kilépett"), diff --git a/src/lang/id.rs b/src/lang/id.rs index b617190fd..65f9f236e 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Berhasil"), ("Someone turns on privacy mode, exit", "Seseorang mengaktifkan mode privasi, keluar"), ("Unsupported", "Tidak didukung"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Rekan ditolak"), ("Please install plugins", "Silakan instal plugin"), ("Peer exit", "keluar rekan"), diff --git a/src/lang/it.rs b/src/lang/it.rs index 713c73fa6..b8a4af50e 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Successo"), ("Someone turns on privacy mode, exit", "Qualcuno attiva la modalità privacy, esci"), ("Unsupported", "Non supportato"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer negato"), ("Please install plugins", "Si prega di installare i plugin"), ("Peer exit", "Uscita tra pari"), diff --git a/src/lang/ja.rs b/src/lang/ja.rs index c4d29ad73..275b520c4 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "プライバシーモードがオンになりました。終了します。"), ("Unsupported", "サポートされていません"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "相手が拒否しました"), ("Please install plugins", "プラグインをインストールしてください"), ("Peer exit", "相手が終了しました"), diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 3d1330a31..2f303a2f4 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "성공"), ("Someone turns on privacy mode, exit", "누군가가 개인정보 보호 모드를 활성화하여 종료됩니다"), ("Unsupported", "지원되지 않음"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "다른 사용자에 의해 거부됨"), ("Please install plugins", "플러그인을 설치해주세요"), ("Peer exit", "다른 사용자가 나감"), diff --git a/src/lang/kz.rs b/src/lang/kz.rs index c1480377b..9966bb3ae 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Сәтті"), ("Someone turns on privacy mode, exit", "Біреу құпиялылық модасын қосты, шығу"), ("Unsupported", "Қолдаусыз"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Пир қабылдамады"), ("Please install plugins", "Плагиндерді орнатуды өтінеміз"), ("Peer exit", "Пирдің шығуы"), diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 377e40a1d..769bd24d2 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Geslaagd"), ("Someone turns on privacy mode, exit", "Iemand schakelt privacymodus in, afsluiten"), ("Unsupported", "Niet Ondersteund"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer geweigerd"), ("Please install plugins", "Installeer plugins"), ("Peer exit", "Peer afgesloten"), diff --git a/src/lang/pl.rs b/src/lang/pl.rs index e4c4839f5..16e14ad3a 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Udało się"), ("Someone turns on privacy mode, exit", "Ktoś włącza tryb prywatności, wyjdź"), ("Unsupported", "Niewspierane"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Odmowa dostępu"), ("Please install plugins", "Zainstaluj wtyczkę"), ("Peer exit", "Wyjście peer"), diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 541023197..90d832417 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Conseguiu"), ("Someone turns on privacy mode, exit", "Alguém activou o modo de privacidade, desligue"), ("Unsupported", "Sem suporte"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Remoto negado"), ("Please install plugins", "Por favor instale plugins"), ("Peer exit", "Saída do Remoto"), diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 1a35421fd..4dcf298aa 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sucesso"), ("Someone turns on privacy mode, exit", "Alguém habilitou o modo de privacidade, sair"), ("Unsupported", "Não suportado"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Parceiro negou"), ("Please install plugins", "Por favor instale plugins"), ("Peer exit", "Parceiro saiu"), diff --git a/src/lang/ro.rs b/src/lang/ro.rs index ccfeb412c..69de05fd8 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Reușit"), ("Someone turns on privacy mode, exit", "Cineva activează modul privat, ieși din"), ("Unsupported", "Neacceptat"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Dispozitiv pereche refuzat"), ("Please install plugins", "Instalează pluginuri"), ("Peer exit", "Ieșire dispozitiv pereche"), diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 8692d1d87..8d3ea0e37 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Выполнено"), ("Someone turns on privacy mode, exit", "Кто-то включает режим конфиденциальности, выход"), ("Unsupported", "Не поддерживается"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Отклонено удалённым узлом"), ("Please install plugins", "Установите плагины"), ("Peer exit", "Удалённый узел отключён"), diff --git a/src/lang/sk.rs b/src/lang/sk.rs index be48c7338..24937438c 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Podarilo sa"), ("Someone turns on privacy mode, exit", "Niekto zapne režim súkromia, ukončite ho"), ("Unsupported", "Nepodporované"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer poprel"), ("Please install plugins", "Nainštalujte si prosím pluginy"), ("Peer exit", "Peer exit"), diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 0706c38c0..56dc7537b 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspelo"), ("Someone turns on privacy mode, exit", "Vklopljen je zasebni način, izhod"), ("Unsupported", "Ni podprto"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Odjemalec zavrnil"), ("Please install plugins", "Namestite vključke"), ("Peer exit", "Odjemalec se je zaprl"), diff --git a/src/lang/sq.rs b/src/lang/sq.rs index fac32f1a7..389f01dfc 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sukses"), ("Someone turns on privacy mode, exit", "Dikush ka ndezur menyrën e privatësisë , largohu"), ("Unsupported", "Nuk mbështetet"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer mohohet"), ("Please install plugins", "Ju lutemi instaloni shtojcat"), ("Peer exit", "Dalje peer"), diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 85903f03a..15deabb30 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspešno"), ("Someone turns on privacy mode, exit", "Neko je uključio mod privatnosti, izlaz."), ("Unsupported", "Nepodržano"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Klijent zabranjen"), ("Please install plugins", "Molimo instalirajte dodatke"), ("Peer exit", "Klijent izašao"), diff --git a/src/lang/sv.rs b/src/lang/sv.rs index 2987c9e57..2ba640b26 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Lyckades"), ("Someone turns on privacy mode, exit", "Någon sätter på säkerhetesläge, avsluta"), ("Unsupported", "Stöds inte"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Klienten nekade"), ("Please install plugins", "Var god installera plugins"), ("Peer exit", "Avsluta klient"), diff --git a/src/lang/template.rs b/src/lang/template.rs index 94e0d8fa1..4e4b20e41 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", ""), ("Someone turns on privacy mode, exit", ""), ("Unsupported", ""), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", ""), ("Please install plugins", ""), ("Peer exit", ""), diff --git a/src/lang/th.rs b/src/lang/th.rs index 05d727e7b..8fb653fd8 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "สำเร็จ"), ("Someone turns on privacy mode, exit", "มีใครบางคนเปิดใช้งานโหมดความเป็นส่วนตัว กำลังออก"), ("Unsupported", "ไม่รองรับ"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "ถูกปฏิเสธโดยอีกฝั่ง"), ("Please install plugins", "กรุณาติดตั้งปลั๊กอิน"), ("Peer exit", "อีกฝั่งออก"), diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 280ed4099..424c18f14 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "başarılı"), ("Someone turns on privacy mode, exit", "Birisi gizlilik modunu açarsa, çık"), ("Unsupported", "desteklenmiyor"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "eş reddedildi"), ("Please install plugins", "Lütfen eklentileri yükleyin"), ("Peer exit", "eş çıkışı"), diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 7ad3074f9..3ec448132 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "其他用戶開啟隱私模式，退出"), ("Unsupported", "不支持"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "被控端拒絕"), ("Please install plugins", "請安裝插件"), ("Peer exit", "被控端退出"), diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 9211bd286..19b3aa355 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Успішно"), ("Someone turns on privacy mode, exit", "Хтось вмикає режим конфіденційності, вихід"), ("Unsupported", "Не підтримується"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Відхилено віддаленим комп'ютером"), ("Please install plugins", "Будь ласка, встановіть плагіни"), ("Peer exit", "Відключено віддаленим комп'ютером"), diff --git a/src/lang/vn.rs b/src/lang/vn.rs index a26ae1225..f2a2bb748 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Thành công"), ("Someone turns on privacy mode, exit", "Ai đó đã bật chế độ riêng tư, thoát"), ("Unsupported", "Không hỗ trợ"), - ("Please switch to Display 1 first", "") + ("Please switch to Display 1 first", ""), ("Peer denied", "Peer đã từ chối"), ("Please install plugins", "Hãy cài plugins"), ("Peer exit", "Peer đã thoát"), diff --git a/src/win_privacy.rs b/src/win_privacy.rs index 9944bf262..ad66c4639 100644 --- a/src/win_privacy.rs +++ b/src/win_privacy.rs @@ -245,7 +245,7 @@ pub fn start() -> ResultType<()> { wnd_handlers.hthread = proc_info.hThread as _; wnd_handlers.hprocess = proc_info.hProcess as _; - let hwnd = wait_find_privacy_hwnd(1_000)?; + let hwnd = wait_find_privacy_hwnd(30_000)?; if hwnd.is_null() { bail!("Failed to get hwnd after started"); } From 37d21d8db0f8fbc3e1975d97fa1fdfc748680e64 Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 6 Mar 2023 17:26:26 +0800 Subject: [PATCH 07/29] remove unused logic Signed-off-by: fufesou --- libs/scrap/src/dxgi/mag.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libs/scrap/src/dxgi/mag.rs b/libs/scrap/src/dxgi/mag.rs index b2bea1dd1..62e90c08b 100644 --- a/libs/scrap/src/dxgi/mag.rs +++ b/libs/scrap/src/dxgi/mag.rs @@ -127,15 +127,6 @@ impl MagInterface { }; s.init_succeeded = false; unsafe { - if GetSystemMetrics(SM_CMONITORS) != 1 { - // Do not try to use the magnifier in multi-screen setup (where the API - // crashes sometimes). - return Err(Error::new( - ErrorKind::Other, - "Magnifier capturer cannot work on multi-screen system.", - )); - } - // load lib let lib_file_name = "Magnification.dll"; let lib_file_name_c = CString::new(lib_file_name).unwrap(); From fdeb38fee74ce8b27dda3def1ad3b9a99059c11c Mon Sep 17 00:00:00 2001 From: fufesou Date: Mon, 6 Mar 2023 17:33:47 +0800 Subject: [PATCH 08/29] change timeout for waiting hwnd Signed-off-by: fufesou --- src/win_privacy.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win_privacy.rs b/src/win_privacy.rs index ad66c4639..9944bf262 100644 --- a/src/win_privacy.rs +++ b/src/win_privacy.rs @@ -245,7 +245,7 @@ pub fn start() -> ResultType<()> { wnd_handlers.hthread = proc_info.hThread as _; wnd_handlers.hprocess = proc_info.hProcess as _; - let hwnd = wait_find_privacy_hwnd(30_000)?; + let hwnd = wait_find_privacy_hwnd(1_000)?; if hwnd.is_null() { bail!("Failed to get hwnd after started"); } From fac4a966b2256a01d08f51bbf98b8c6415a4f2a8 Mon Sep 17 00:00:00 2001 From: mehdi-song Date: Mon, 6 Mar 2023 13:24:48 +0330 Subject: [PATCH 09/29] Update fa.rs --- src/lang/fa.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 66ec011c4..99099bfd2 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -301,7 +301,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "موفقیت آمیز"), ("Someone turns on privacy mode, exit", "اگر شخصی حالت حریم خصوصی را روشن کرد، خارج شوید"), ("Unsupported", "پشتیبانی نشده"), - ("Please switch to Display 1 first", ""), + ("Please switch to Display 1 first", "لطفاً ابتدا به صفحه نمایش 1 بروید"), ("Peer denied", "توسط میزبان راه دور رد شد"), ("Please install plugins", "لطفا افزونه ها را نصب کنید"), ("Peer exit", "میزبان خارج شد"), From 6e21ddcc9c7ffc360964282801537619180b1956 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Mon, 6 Mar 2023 17:59:23 +0800 Subject: [PATCH 10/29] remove "Please switch to Display 1 first", which is temp used, don't bother contributors translate it --- src/lang/ca.rs | 1 - src/lang/cn.rs | 1 - src/lang/cs.rs | 1 - src/lang/da.rs | 1 - src/lang/de.rs | 1 - src/lang/eo.rs | 1 - src/lang/es.rs | 1 - src/lang/fa.rs | 1 - src/lang/fr.rs | 1 - src/lang/gr.rs | 1 - src/lang/hu.rs | 1 - src/lang/id.rs | 1 - src/lang/it.rs | 1 - src/lang/ja.rs | 1 - src/lang/ko.rs | 1 - src/lang/kz.rs | 1 - src/lang/nl.rs | 1 - src/lang/pl.rs | 1 - src/lang/pt_PT.rs | 1 - src/lang/ptbr.rs | 1 - src/lang/ro.rs | 1 - src/lang/ru.rs | 1 - src/lang/sk.rs | 1 - src/lang/sl.rs | 1 - src/lang/sq.rs | 1 - src/lang/sr.rs | 1 - src/lang/sv.rs | 1 - src/lang/template.rs | 1 - src/lang/th.rs | 1 - src/lang/tr.rs | 1 - src/lang/tw.rs | 1 - src/lang/ua.rs | 1 - src/lang/vn.rs | 1 - 33 files changed, 33 deletions(-) diff --git a/src/lang/ca.rs b/src/lang/ca.rs index 57787dead..89cc46920 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Aconseguit"), ("Someone turns on privacy mode, exit", "Algú ha activat el mode de privacitat, surti"), ("Unsupported", "No suportat"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer denegat"), ("Please install plugins", "Instal·li complements"), ("Peer exit", "El peer ha sortit"), diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 55e805848..3f4f6d25c 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "其他用户使用隐私模式，退出"), ("Unsupported", "不支持"), - ("Please switch to Display 1 first", "请先切换到第一个屏"), ("Peer denied", "被控端拒绝"), ("Please install plugins", "请安装插件"), ("Peer exit", "被控端退出"), diff --git a/src/lang/cs.rs b/src/lang/cs.rs index 3ee9e5233..a2813815b 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspěl"), ("Someone turns on privacy mode, exit", "Někdo zapne režim soukromí, ukončete ho"), ("Unsupported", "Nepodporováno"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer popřel"), ("Please install plugins", "Nainstalujte si prosím pluginy"), ("Peer exit", "Peer exit"), diff --git a/src/lang/da.rs b/src/lang/da.rs index e3e5a4049..2760f94fb 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Vellykket"), ("Someone turns on privacy mode, exit", "Nogen aktiverede databeskyttelsestilstand, slut"), ("Unsupported", "Ikke understøttet"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer nægtet"), ("Please install plugins", "Venligst Installer plugins"), ("Peer exit", "Peer-Afslut"), diff --git a/src/lang/de.rs b/src/lang/de.rs index c562472be..36493f747 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Erfolgreich"), ("Someone turns on privacy mode, exit", "Jemand hat den Datenschutzmodus aktiviert, beende …"), ("Unsupported", "Nicht unterstützt"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Die Gegenstelle hat die Verbindung abgelehnt."), ("Please install plugins", "Bitte installieren Sie Plugins"), ("Peer exit", "Die Gegenstelle hat die Verbindung getrennt."), diff --git a/src/lang/eo.rs b/src/lang/eo.rs index cbbeecc10..7a191f05d 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", ""), ("Someone turns on privacy mode, exit", ""), ("Unsupported", ""), - ("Please switch to Display 1 first", ""), ("Peer denied", ""), ("Please install plugins", ""), ("Peer exit", ""), diff --git a/src/lang/es.rs b/src/lang/es.rs index bd4df8e04..b290c7696 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Logrado"), ("Someone turns on privacy mode, exit", "Alguien active el modo privacidad, salga"), ("Unsupported", "No soportado"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Par denegado"), ("Please install plugins", "Instale complementos"), ("Peer exit", "Par salio"), diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 99099bfd2..7fe279a1b 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "موفقیت آمیز"), ("Someone turns on privacy mode, exit", "اگر شخصی حالت حریم خصوصی را روشن کرد، خارج شوید"), ("Unsupported", "پشتیبانی نشده"), - ("Please switch to Display 1 first", "لطفاً ابتدا به صفحه نمایش 1 بروید"), ("Peer denied", "توسط میزبان راه دور رد شد"), ("Please install plugins", "لطفا افزونه ها را نصب کنید"), ("Peer exit", "میزبان خارج شد"), diff --git a/src/lang/fr.rs b/src/lang/fr.rs index a343202e1..dd436831e 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Succès"), ("Someone turns on privacy mode, exit", "Quelqu'un active le mode de confidentialité, quittez"), ("Unsupported", "Non pris en charge"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Pair refusé"), ("Please install plugins", "Veuillez installer les plugins"), ("Peer exit", "Sortie des pairs"), diff --git a/src/lang/gr.rs b/src/lang/gr.rs index b38a96065..8629879ca 100644 --- a/src/lang/gr.rs +++ b/src/lang/gr.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Επιτυχής"), ("Someone turns on privacy mode, exit", "Κάποιος ενεργοποιεί τη λειτουργία απορρήτου, έξοδος"), ("Unsupported", "Δεν υποστηρίζεται"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Ο απομακρυσμένος σταθμός απέρριψε τη σύνδεση"), ("Please install plugins", "Παρακαλώ εγκαταστήστε τα πρόσθετα"), ("Peer exit", "Ο απομακρυσμένος σταθμός έχει αποσυνδεθεί"), diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 2f6aafe95..8727c53c2 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sikeres"), ("Someone turns on privacy mode, exit", "Valaki bekacsolta az inkognitó módot, lépjen ki"), ("Unsupported", "Nem támogatott"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Elutasítva a távoli fél álltal"), ("Please install plugins", "Kérem telepítse a bővítményeket"), ("Peer exit", "A távoli fél kilépett"), diff --git a/src/lang/id.rs b/src/lang/id.rs index 65f9f236e..b363a2ae8 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Berhasil"), ("Someone turns on privacy mode, exit", "Seseorang mengaktifkan mode privasi, keluar"), ("Unsupported", "Tidak didukung"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Rekan ditolak"), ("Please install plugins", "Silakan instal plugin"), ("Peer exit", "keluar rekan"), diff --git a/src/lang/it.rs b/src/lang/it.rs index b8a4af50e..340794ceb 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Successo"), ("Someone turns on privacy mode, exit", "Qualcuno attiva la modalità privacy, esci"), ("Unsupported", "Non supportato"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer negato"), ("Please install plugins", "Si prega di installare i plugin"), ("Peer exit", "Uscita tra pari"), diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 275b520c4..260c27607 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "プライバシーモードがオンになりました。終了します。"), ("Unsupported", "サポートされていません"), - ("Please switch to Display 1 first", ""), ("Peer denied", "相手が拒否しました"), ("Please install plugins", "プラグインをインストールしてください"), ("Peer exit", "相手が終了しました"), diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 2f303a2f4..f101ae20b 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "성공"), ("Someone turns on privacy mode, exit", "누군가가 개인정보 보호 모드를 활성화하여 종료됩니다"), ("Unsupported", "지원되지 않음"), - ("Please switch to Display 1 first", ""), ("Peer denied", "다른 사용자에 의해 거부됨"), ("Please install plugins", "플러그인을 설치해주세요"), ("Peer exit", "다른 사용자가 나감"), diff --git a/src/lang/kz.rs b/src/lang/kz.rs index 9966bb3ae..fe0937a65 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Сәтті"), ("Someone turns on privacy mode, exit", "Біреу құпиялылық модасын қосты, шығу"), ("Unsupported", "Қолдаусыз"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Пир қабылдамады"), ("Please install plugins", "Плагиндерді орнатуды өтінеміз"), ("Peer exit", "Пирдің шығуы"), diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 769bd24d2..63d3cee7b 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Geslaagd"), ("Someone turns on privacy mode, exit", "Iemand schakelt privacymodus in, afsluiten"), ("Unsupported", "Niet Ondersteund"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer geweigerd"), ("Please install plugins", "Installeer plugins"), ("Peer exit", "Peer afgesloten"), diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 16e14ad3a..0c5f13659 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Udało się"), ("Someone turns on privacy mode, exit", "Ktoś włącza tryb prywatności, wyjdź"), ("Unsupported", "Niewspierane"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Odmowa dostępu"), ("Please install plugins", "Zainstaluj wtyczkę"), ("Peer exit", "Wyjście peer"), diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 90d832417..8eb4df2ad 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Conseguiu"), ("Someone turns on privacy mode, exit", "Alguém activou o modo de privacidade, desligue"), ("Unsupported", "Sem suporte"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Remoto negado"), ("Please install plugins", "Por favor instale plugins"), ("Peer exit", "Saída do Remoto"), diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 4dcf298aa..973048f3d 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sucesso"), ("Someone turns on privacy mode, exit", "Alguém habilitou o modo de privacidade, sair"), ("Unsupported", "Não suportado"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Parceiro negou"), ("Please install plugins", "Por favor instale plugins"), ("Peer exit", "Parceiro saiu"), diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 69de05fd8..9e252aa8a 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Reușit"), ("Someone turns on privacy mode, exit", "Cineva activează modul privat, ieși din"), ("Unsupported", "Neacceptat"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Dispozitiv pereche refuzat"), ("Please install plugins", "Instalează pluginuri"), ("Peer exit", "Ieșire dispozitiv pereche"), diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 8d3ea0e37..4c1f9ae34 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Выполнено"), ("Someone turns on privacy mode, exit", "Кто-то включает режим конфиденциальности, выход"), ("Unsupported", "Не поддерживается"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Отклонено удалённым узлом"), ("Please install plugins", "Установите плагины"), ("Peer exit", "Удалённый узел отключён"), diff --git a/src/lang/sk.rs b/src/lang/sk.rs index 24937438c..d60384286 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Podarilo sa"), ("Someone turns on privacy mode, exit", "Niekto zapne režim súkromia, ukončite ho"), ("Unsupported", "Nepodporované"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer poprel"), ("Please install plugins", "Nainštalujte si prosím pluginy"), ("Peer exit", "Peer exit"), diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 56dc7537b..bd07b1acb 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspelo"), ("Someone turns on privacy mode, exit", "Vklopljen je zasebni način, izhod"), ("Unsupported", "Ni podprto"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Odjemalec zavrnil"), ("Please install plugins", "Namestite vključke"), ("Peer exit", "Odjemalec se je zaprl"), diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 389f01dfc..b8f9203ca 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Sukses"), ("Someone turns on privacy mode, exit", "Dikush ka ndezur menyrën e privatësisë , largohu"), ("Unsupported", "Nuk mbështetet"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer mohohet"), ("Please install plugins", "Ju lutemi instaloni shtojcat"), ("Peer exit", "Dalje peer"), diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 15deabb30..4a9b73374 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Uspešno"), ("Someone turns on privacy mode, exit", "Neko je uključio mod privatnosti, izlaz."), ("Unsupported", "Nepodržano"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Klijent zabranjen"), ("Please install plugins", "Molimo instalirajte dodatke"), ("Peer exit", "Klijent izašao"), diff --git a/src/lang/sv.rs b/src/lang/sv.rs index 2ba640b26..f73154e3e 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Lyckades"), ("Someone turns on privacy mode, exit", "Någon sätter på säkerhetesläge, avsluta"), ("Unsupported", "Stöds inte"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Klienten nekade"), ("Please install plugins", "Var god installera plugins"), ("Peer exit", "Avsluta klient"), diff --git a/src/lang/template.rs b/src/lang/template.rs index 4e4b20e41..e51a095c0 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", ""), ("Someone turns on privacy mode, exit", ""), ("Unsupported", ""), - ("Please switch to Display 1 first", ""), ("Peer denied", ""), ("Please install plugins", ""), ("Peer exit", ""), diff --git a/src/lang/th.rs b/src/lang/th.rs index 8fb653fd8..3214c3452 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "สำเร็จ"), ("Someone turns on privacy mode, exit", "มีใครบางคนเปิดใช้งานโหมดความเป็นส่วนตัว กำลังออก"), ("Unsupported", "ไม่รองรับ"), - ("Please switch to Display 1 first", ""), ("Peer denied", "ถูกปฏิเสธโดยอีกฝั่ง"), ("Please install plugins", "กรุณาติดตั้งปลั๊กอิน"), ("Peer exit", "อีกฝั่งออก"), diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 424c18f14..82f95ef84 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "başarılı"), ("Someone turns on privacy mode, exit", "Birisi gizlilik modunu açarsa, çık"), ("Unsupported", "desteklenmiyor"), - ("Please switch to Display 1 first", ""), ("Peer denied", "eş reddedildi"), ("Please install plugins", "Lütfen eklentileri yükleyin"), ("Peer exit", "eş çıkışı"), diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 3ec448132..d0f12cdfa 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "成功"), ("Someone turns on privacy mode, exit", "其他用戶開啟隱私模式，退出"), ("Unsupported", "不支持"), - ("Please switch to Display 1 first", ""), ("Peer denied", "被控端拒絕"), ("Please install plugins", "請安裝插件"), ("Peer exit", "被控端退出"), diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 19b3aa355..793d1e147 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Успішно"), ("Someone turns on privacy mode, exit", "Хтось вмикає режим конфіденційності, вихід"), ("Unsupported", "Не підтримується"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Відхилено віддаленим комп'ютером"), ("Please install plugins", "Будь ласка, встановіть плагіни"), ("Peer exit", "Відключено віддаленим комп'ютером"), diff --git a/src/lang/vn.rs b/src/lang/vn.rs index f2a2bb748..fc665834d 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -301,7 +301,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Succeeded", "Thành công"), ("Someone turns on privacy mode, exit", "Ai đó đã bật chế độ riêng tư, thoát"), ("Unsupported", "Không hỗ trợ"), - ("Please switch to Display 1 first", ""), ("Peer denied", "Peer đã từ chối"), ("Please install plugins", "Hãy cài plugins"), ("Peer exit", "Peer đã thoát"), From 35e9815e9e5395d5c9ad341ee285651ffc186382 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Mon, 6 Mar 2023 18:02:47 +0800 Subject: [PATCH 11/29] temporary password -> one-time password --- src/lang/ca.rs | 2 +- src/lang/cn.rs | 2 +- src/lang/cs.rs | 2 +- src/lang/da.rs | 2 +- src/lang/de.rs | 2 +- src/lang/eo.rs | 2 +- src/lang/es.rs | 2 +- src/lang/fa.rs | 2 +- src/lang/fr.rs | 2 +- src/lang/gr.rs | 2 +- src/lang/hu.rs | 2 +- src/lang/id.rs | 2 +- src/lang/it.rs | 2 +- src/lang/ja.rs | 2 +- src/lang/ko.rs | 2 +- src/lang/kz.rs | 2 +- src/lang/nl.rs | 2 +- src/lang/pl.rs | 2 +- src/lang/pt_PT.rs | 2 +- src/lang/ptbr.rs | 2 +- src/lang/ro.rs | 2 +- src/lang/ru.rs | 2 +- src/lang/sk.rs | 2 +- src/lang/sl.rs | 2 +- src/lang/sq.rs | 2 +- src/lang/sr.rs | 2 +- src/lang/sv.rs | 2 +- src/lang/template.rs | 2 +- src/lang/th.rs | 2 +- src/lang/tr.rs | 2 +- src/lang/tw.rs | 2 +- src/lang/ua.rs | 2 +- src/lang/vn.rs | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/lang/ca.rs b/src/lang/ca.rs index a8f5758ee..c4bc10bb4 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 03e253bfb..163c50e1b 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "编解码"), ("Resolution", "分辨率"), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index e85c95969..e3ddc5db8 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index f933972d9..f37f30a61 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index 5ac7de62e..0829bc2b6 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Auflösung"), ("No transfers in progress", "Keine Übertragungen im Gange"), - ("Set temporary password length", "Temporäre Passwortlänge festlegen"), + ("Set one-time password length", "Temporäre Passwortlänge festlegen"), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 667071e3f..ed64addf8 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index a93d0ccd9..1c780f842 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Códec"), ("Resolution", "Resolución"), ("No transfers in progress", "No hay transferencias en curso"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index d20f321f3..a04103d0b 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "کدک"), ("Resolution", "وضوح"), ("No transfers in progress", "هیچ انتقالی در حال انجام نیست"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index bc6a23d71..c0d739f91 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/gr.rs b/src/lang/gr.rs index 9158c37e2..819c257c3 100644 --- a/src/lang/gr.rs +++ b/src/lang/gr.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Κωδικοποίηση"), ("Resolution", "Ανάλυση"), ("No transfers in progress", "Δεν υπάρχει μεταφορά σε εξέλιξη"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 62ec3b018..46750eb13 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index 996fd3a3b..4133f136f 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 65e685f4c..17f066eef 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Risoluzione"), ("No transfers in progress", "Nessun trasferimento in corso"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 00b71c57b..b8031573a 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index f2cbc2ab0..fe6a0bfe9 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index d0b712ff5..4b1e92cad 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index fc4490aae..7888eed8e 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Resolutie"), ("No transfers in progress", "Geen overdrachten in uitvoering"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index b1cd7eb7c..b997267f1 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Kodek"), ("Resolution", "Rozdzielczość"), ("No transfers in progress", "Brak transferów w toku"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 6f3504218..98b8035a4 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index cbb0651a9..18c9168c1 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 76a234aff..225fa7277 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index a8705d531..8a8b7f9c1 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Кодек"), ("Resolution", "Разрешение"), ("No transfers in progress", "Передача не осуществляется"), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index 55bf55aff..cec9e5b3d 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 39e54b66d..295cd28a1 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 86f877aa0..ebbdf4a28 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 24ddb85be..67fb49799 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index a565be50e..9da1f1071 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 638bb4d21..cbbd65b4c 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 2f2c4fa31..97a8725e3 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index cf7e9997b..3b1137cb7 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index fc1576db7..72a38afcd 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "編解碼"), ("Resolution", "分辨率"), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 1eb6eea7a..4665d7c39 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index 193408b0e..0130b11cf 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", ""), ("Resolution", ""), ("No transfers in progress", ""), - ("Set temporary password length", ""), + ("Set one-time password length", ""), ].iter().cloned().collect(); } From c6fa97229918c1ff1bf3467d1f9720c63aeec1a5 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:37:09 +0000 Subject: [PATCH 12/29] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3e0fb463f..45311c4b4 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ Below are the servers you are using for free, they may change over time. If you | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| Ukraine (Kyiv) | dc.volia (2VM) | 2 vCPU / 4GB RAM | +| Finland (Helsinki) | [Donated by Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Donated by Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [Donated by dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dev Container From 5a9e9e7f863dc793ab30e60820d0648aba2cb4d2 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:38:35 +0000 Subject: [PATCH 13/29] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 45311c4b4..4e3b309c5 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ Below are the servers you are using for free, they may change over time. If you | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | [Donated by Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | -| USA (Ashburn) | [Donated by Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | -| Ukraine (Kyiv) | [Donated by dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dev Container From f6eb7763ba8ae2b196cf445add9c442fed0a4e0f Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:38:59 +0000 Subject: [PATCH 14/29] Update README-NL.md --- docs/README-NL.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-NL.md b/docs/README-NL.md index 422890827..4a5372e67 100644 --- a/docs/README-NL.md +++ b/docs/README-NL.md @@ -27,8 +27,9 @@ Onderstaande servers zijn de servers die je gratis kunt gebruiken, ze kunnen op | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Afhankelijkheden From 0120663c8a4e6c1aff28190c6ebfecf4364b3a88 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:39:41 +0000 Subject: [PATCH 15/29] Update README-UA.md --- docs/README-UA.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-UA.md b/docs/README-UA.md index 5d4a0a1ad..6e933cea9 100644 --- a/docs/README-UA.md +++ b/docs/README-UA.md @@ -35,8 +35,9 @@ RustDesk вітає внесок кожного. Дивіться [`docs/CONTRIB | Даллас | Vultr | 1 vCPU / 1GB RAM Німеччина | Hetzner | 2 vCPU / 4GB RAM | 2 VCPU / 4GB RAM | Німеччина | Hetzner | 2 VCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Залежності From 7be24b7adb34707e655fe9d0296bad897aaeef86 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:40:02 +0000 Subject: [PATCH 16/29] Update README-HU.md --- docs/README-HU.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-HU.md b/docs/README-HU.md index 62ba33482..9582cf1c6 100644 --- a/docs/README-HU.md +++ b/docs/README-HU.md @@ -35,8 +35,9 @@ Ezalatt az üzenet alatt találhatóak azok a publikus szerverek, amelyeket ingy | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dependencies From ec1a02cae0fa21a87357b5600253166d14944209 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:40:23 +0000 Subject: [PATCH 17/29] Update README-ES.md --- docs/README-ES.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-ES.md b/docs/README-ES.md index b7b828f13..66fc609fb 100644 --- a/docs/README-ES.md +++ b/docs/README-ES.md @@ -34,8 +34,9 @@ A continuación se muestran los servidores gratuitos, pueden cambiar a medida qu | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dependencias From 55cd4ecd49e86720b8627003b4ef1dd88f33679c Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:40:43 +0000 Subject: [PATCH 18/29] Update README-PL.md --- docs/README-PL.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-PL.md b/docs/README-PL.md index 05e6d8da5..df8254f3d 100644 --- a/docs/README-PL.md +++ b/docs/README-PL.md @@ -27,8 +27,9 @@ Poniżej znajdują się serwery, z których można korzystać za darmo, może si | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Zależności From bf1a8a710d06dfa04dca7170f0412035b8124c31 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:41:02 +0000 Subject: [PATCH 19/29] Update README-ID.md --- docs/README-ID.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-ID.md b/docs/README-ID.md index 2fdcd3646..702966566 100644 --- a/docs/README-ID.md +++ b/docs/README-ID.md @@ -27,8 +27,9 @@ Di bawah ini adalah server yang bisa Anda gunakan secara gratis, dapat berubah s | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dependencies From d440831cda1eed494d6b13cf6d7f02f1d91d07c8 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:41:24 +0000 Subject: [PATCH 20/29] Update README-FI.md --- docs/README-FI.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-FI.md b/docs/README-FI.md index d110e195a..8674bc1b3 100644 --- a/docs/README-FI.md +++ b/docs/README-FI.md @@ -27,8 +27,9 @@ Alla on palvelimia, joita voit käyttää ilmaiseksi, ne saattavat muuttua ajan | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Riippuvuudet From c2c801cd113bba04877b71f6f859a1faa7890e5d Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:41:48 +0000 Subject: [PATCH 21/29] Update README-IT.md --- docs/README-IT.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-IT.md b/docs/README-IT.md index 0b628f90d..2dec27e40 100644 --- a/docs/README-IT.md +++ b/docs/README-IT.md @@ -27,8 +27,9 @@ Qui sotto trovate i server che possono essere usati gratuitamente, la lista potr | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dipendenze From 950dc493cdd269dc55cf1ab6540fdb7f0fdf8d78 Mon Sep 17 00:00:00 2001 From: dinger1986 Date: Mon, 6 Mar 2023 20:42:35 +0000 Subject: [PATCH 22/29] Update README-EO.md --- docs/README-EO.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/README-EO.md b/docs/README-EO.md index fdde88f11..4bca4a793 100644 --- a/docs/README-EO.md +++ b/docs/README-EO.md @@ -27,8 +27,9 @@ Malsupre estas la serviloj, kiuj vi uzas senpage, ĝi povas ŝanĝi laŭlonge de | Seoul | AWS lightsail | 1 vCPU / 0.5GB RAM | | Germany | Hetzner | 2 vCPU / 4GB RAM | | Germany | Codext | 4 vCPU / 8GB RAM | -| Finland (Helsinki) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | -| USA (Ashburn) | 0x101 Cyber Security | 4 vCPU / 8GB RAM | +| Finland (Helsinki) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| USA (Ashburn) | [Netlock](https://netlockendpoint.com) | 4 vCPU / 8GB RAM | +| Ukraine (Kyiv) | [dc.volia](https://dc.volia.com) | 2 vCPU / 4GB RAM | ## Dependantaĵoj From 1f63b6d2a733cfbecc3aeb7121f45ff63f3c628e Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Mon, 6 Mar 2023 23:19:35 +0100 Subject: [PATCH 23/29] Update com.rustdesk.RustDesk.policy --- res/com.rustdesk.RustDesk.policy | 1 + 1 file changed, 1 insertion(+) diff --git a/res/com.rustdesk.RustDesk.policy b/res/com.rustdesk.RustDesk.policy index a77223120..55f13629b 100644 --- a/res/com.rustdesk.RustDesk.policy +++ b/res/com.rustdesk.RustDesk.policy @@ -11,6 +11,7 @@ Authentication is required to change RustDesk options 要更改RustDesk选项, 需要您先通过身份验证 要變更RustDesk選項, 需要您先通過身份驗證 + Authentifizierung zum Ändern der RustDesk-Optionen /usr/share/rustdesk/files/polkit true From f4c80c599074d70742fd823d9c615b64854d1d28 Mon Sep 17 00:00:00 2001 From: "Miguel F. G" <116861809+flusheDData@users.noreply.github.com> Date: Tue, 7 Mar 2023 00:12:01 +0100 Subject: [PATCH 24/29] Update es.rs New term added --- 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 1c780f842..3270ae26c 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Códec"), ("Resolution", "Resolución"), ("No transfers in progress", "No hay transferencias en curso"), - ("Set one-time password length", ""), + ("Set one-time password length", "Establecer contraseña de un solo uso"), ].iter().cloned().collect(); } From 617872761c0655b3c7f41ee1db59104cfb252fb3 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Tue, 7 Mar 2023 10:56:35 +0800 Subject: [PATCH 25/29] fix: prevent call minimize when on mobile --- flutter/lib/models/server_model.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flutter/lib/models/server_model.dart b/flutter/lib/models/server_model.dart index 7ee23ec40..40aa68d20 100644 --- a/flutter/lib/models/server_model.dart +++ b/flutter/lib/models/server_model.dart @@ -456,7 +456,8 @@ class ServerModel with ChangeNotifier { Future.delayed(Duration.zero, () async { if (!hideCm) window_on_top(null); }); - if (client.authorized) { + // Only do the hidden task when on Desktop. + if (client.authorized && isDesktop) { cmHiddenTimer = Timer(const Duration(seconds: 3), () { if (!hideCm) windowManager.minimize(); cmHiddenTimer = null; From b5286b005ad80701e6703f197137a827a0cea4f0 Mon Sep 17 00:00:00 2001 From: mehdi-song Date: Tue, 7 Mar 2023 08:34:02 +0330 Subject: [PATCH 26/29] Update fa.rs --- src/lang/fa.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lang/fa.rs b/src/lang/fa.rs index a04103d0b..e2a7e9516 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "کدک"), ("Resolution", "وضوح"), ("No transfers in progress", "هیچ انتقالی در حال انجام نیست"), - ("Set one-time password length", ""), + ("Set one-time password length", "طول رمز یکبار مصرف را تعیین کنید"), ].iter().cloned().collect(); } From f4551234ea741a2fd30c301ce641f4541b5984e1 Mon Sep 17 00:00:00 2001 From: solokot Date: Tue, 7 Mar 2023 11:38:08 +0300 Subject: [PATCH 27/29] Update ru.rs --- src/lang/ru.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 8a8b7f9c1..59957a2cd 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -349,7 +349,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Security", "Безопасность"), ("Theme", "Тема"), ("Dark Theme", "Тёмная тема"), - ("Light Theme", ""), + ("Light Theme", "Светлая тема"), ("Dark", "Тёмная"), ("Light", "Светлая"), ("Follow System", "Системная"), @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Кодек"), ("Resolution", "Разрешение"), ("No transfers in progress", "Передача не осуществляется"), - ("Set one-time password length", ""), + ("Set one-time password length", "Установить длину одноразового пароля"), ].iter().cloned().collect(); } From d82cd0b1a724cca22956784183e4a6851987be04 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:31:47 +0100 Subject: [PATCH 28/29] Update de.rs --- src/lang/de.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lang/de.rs b/src/lang/de.rs index 0829bc2b6..7a935d299 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -125,7 +125,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Good image quality", "Hohe Bildqualität"), ("Balanced", "Ausgeglichen"), ("Optimize reaction time", "Geschwindigkeit"), - ("Custom", "Individuell"), + ("Custom", "Benutzerdefiniert"), ("Show remote cursor", "Entfernten Cursor anzeigen"), ("Show quality monitor", "Qualitätsüberwachung anzeigen"), ("Disable clipboard", "Zwischenablage deaktivieren"), @@ -152,7 +152,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Configure", "Konfigurieren"), ("config_acc", "Um Ihren PC aus der Ferne zu steuern, müssen Sie RustDesk Zugriffsrechte erteilen."), ("config_screen", "Um aus der Ferne auf Ihren PC zugreifen zu können, müssen Sie RustDesk die Berechtigung \"Bildschirmaufnahme\" erteilen."), - ("Installing ...", "Installiere …"), + ("Installing ...", " Wird installiert …"), ("Install", "Installieren"), ("Installation", "Installation"), ("Installation Path", "Installationspfad"), @@ -230,8 +230,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Add Tag", "Stichwort hinzufügen"), ("Unselect all tags", "Alle Stichworte abwählen"), ("Network error", "Netzwerkfehler"), - ("Username missed", "Benutzernamen vergessen"), - ("Password missed", "Passwort vergessen"), + ("Username missed", "Benutzername fehlt"), + ("Password missed", "Passwort fehlt"), ("Wrong credentials", "Falsche Anmeldedaten"), ("Edit Tag", "Schlagwort bearbeiten"), ("Unremember Password", "Gespeichertes Passwort löschen"), @@ -299,7 +299,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Help", "Hilfe"), ("Failed", "Fehlgeschlagen"), ("Succeeded", "Erfolgreich"), - ("Someone turns on privacy mode, exit", "Jemand hat den Datenschutzmodus aktiviert, beende …"), + ("Someone turns on privacy mode, exit", "Jemand hat den Datenschutzmodus aktiviert, wird beendet …"), ("Unsupported", "Nicht unterstützt"), ("Peer denied", "Die Gegenstelle hat die Verbindung abgelehnt."), ("Please install plugins", "Bitte installieren Sie Plugins"), @@ -407,7 +407,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("One-time Password", "Einmalpasswort"), ("Use one-time password", "Einmalpasswort verwenden"), ("One-time password length", "Länge des Einmalpassworts"), - ("Request access to your device", "Zugriff zu Ihrem Gerät erbitten"), + ("Request access to your device", "Zugriff auf Ihr Gerät anfordern"), ("Hide connection management window", "Fenster zur Verwaltung der Verbindung verstecken"), ("hide_cm_tip", "Dies ist nur möglich, wenn der Zugriff ü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."), @@ -442,7 +442,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Medium", "Mittel"), ("Strong", "Stark"), ("Switch Sides", "Seiten wechseln"), - ("Please confirm if you want to share your desktop?", "Bitte bestätigen Sie, ob Sie Ihren Desktop freigeben möchten."), + ("Please confirm if you want to share your desktop?", "Bitte bestätigen Sie, wenn Sie Ihren Desktop freigeben möchten."), ("Display", "Anzeige"), ("Default View Style", "Standard-Ansichtsstil"), ("Default Scroll Style", "Standard-Scroll-Stil"), @@ -460,6 +460,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Codec", "Codec"), ("Resolution", "Auflösung"), ("No transfers in progress", "Keine Übertragungen im Gange"), - ("Set one-time password length", "Temporäre Passwortlänge festlegen"), + ("Set one-time password length", "Länge des Einmalpassworts festlegen"), ].iter().cloned().collect(); } From 2108e5ea960b91517dab44fb73257b14ddf6e446 Mon Sep 17 00:00:00 2001 From: Mr-Update <37781396+Mr-Update@users.noreply.github.com> Date: Tue, 7 Mar 2023 14:07:20 +0100 Subject: [PATCH 29/29] Update chat_page.dart Ellipsis removed because no windows or dialogs open. --- flutter/lib/common/widgets/chat_page.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flutter/lib/common/widgets/chat_page.dart b/flutter/lib/common/widgets/chat_page.dart index c1991633a..9460f4f41 100644 --- a/flutter/lib/common/widgets/chat_page.dart +++ b/flutter/lib/common/widgets/chat_page.dart @@ -73,7 +73,7 @@ class ChatPage extends StatelessWidget implements PageShape { ? InputDecoration( isDense: true, hintText: - "${translate('Write a message')}...", + "${translate('Write a message')}", filled: true, fillColor: Theme.of(context).colorScheme.background, @@ -88,7 +88,7 @@ class ChatPage extends StatelessWidget implements PageShape { ) : defaultInputDecoration( hintText: - "${translate('Write a message')}...", + "${translate('Write a message')}", fillColor: Theme.of(context).colorScheme.background), sendButtonBuilder: defaultSendButton(