From baec7ad415d6b4add3dc667ce0eb65d1ea93726c Mon Sep 17 00:00:00 2001 From: "Sergey V. Kokorin" Date: Wed, 27 Jul 2022 11:35:23 +0700 Subject: [PATCH 1/4] Update src/lang/ru.rs --- src/lang/ru.rs | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 3c6787289..db4ac902b 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -35,9 +35,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("About", "О RustDesk"), ("Mute", "Отключить звук"), ("Audio Input", "Аудиовход"), - ("Enhancements", ""), - ("Hardware Codec", ""), - ("Adaptive Bitrate", ""), + ("Enhancements", "Улучшения"), + ("Hardware Codec", "Аппаратный кодек"), + ("Adaptive Bitrate", "Адаптивная скорость потока"), ("ID Server", "ID-сервер"), ("Relay Server", "Сервер ретрансляции"), ("API Server", "API-сервер"), @@ -288,16 +288,16 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Ignore Battery Optimizations", "Игнорировать оптимизацию батареи"), ("android_open_battery_optimizations_tip", "Перейдите на следующую страницу настроек "), ("Connection not allowed", "Подключение не разрешено"), - ("Use temporary password", ""), - ("Use permanent password", ""), - ("Use both passwords", ""), - ("Set permanent password", ""), - ("Set temporary password length", ""), - ("Enable Remote Restart", ""), - ("Allow remote restart", ""), - ("Restart Remote Device", ""), - ("Are you sure you want to restart", ""), - ("Restarting Remote Device", ""), - ("remote_restarting_tip", ""), + ("Use temporary password", "Использовать временный пароль"), + ("Use permanent password", "Использовать постоянный пароль"), + ("Use both passwords", "Использовать оба пароля"), + ("Set permanent password", "Установить постоянный пароль"), + ("Set temporary password length", "Длина временного пароля"), + ("Enable Remote Restart", "Включить удаленный перезапуск"), + ("Allow remote restart", "Разрешить удаленный перезапуск"), + ("Restart Remote Device", "Перезапустить удаленное устройство"), + ("Are you sure you want to restart", "Вы уверены, что хотите выполнить перезапуск?"), + ("Restarting Remote Device", "Перезагрузка удаленного устройства"), + ("remote_restarting_tip", "Удаленное устройство перезапускается. Пожалуйста, закройте это сообщение и через некоторое время переподключитесь, используя постоянный пароль."), ].iter().cloned().collect(); } From 0deda08e5c2cf142e1d9f5ed753abc14735d72de Mon Sep 17 00:00:00 2001 From: "Sergey V. Kokorin" Date: Wed, 27 Jul 2022 14:05:33 +0700 Subject: [PATCH 2/4] Fix spelling: add space before "(beta)" --- src/ui/index.tis | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/index.tis b/src/ui/index.tis index 747a59df8..be6e2c355 100644 --- a/src/ui/index.tis +++ b/src/ui/index.tis @@ -212,8 +212,8 @@ class Enhancements: Reactor.Component { self.timer(1ms, function() { me.toggleMenuState() }); return
  • {translate('Enhancements')} - {has_hwcodec ?
  • {svg_checkmark}{translate("Hardware Codec")}{"(beta)"}
    • : ""} -
  • {svg_checkmark}{translate("Adaptive Bitrate")}{"(beta)"}
    • + {has_hwcodec ?
  • {svg_checkmark}{translate("Hardware Codec")} (beta)
    • : ""} +
  • {svg_checkmark}{translate("Adaptive Bitrate")} (beta)
    •
    • ; } From f3d10dd420c53c546c389683944c5bd77fb0e7e7 Mon Sep 17 00:00:00 2001 From: fufesou Date: Wed, 27 Jul 2022 06:34:27 -0700 Subject: [PATCH 3/4] fix build without wayland feature Signed-off-by: fufesou --- Cargo.lock | 6 +++--- libs/scrap/src/common/linux.rs | 9 ++------- libs/scrap/src/common/mod.rs | 6 ++++++ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8f235f6f..2d9ac2cac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -319,9 +319,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", "radium", @@ -2212,7 +2212,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwcodec" version = "0.1.0" -source = "git+https://github.com/21pages/hwcodec#890204e0703a3d361fc7a45f035fe75c0575bb1d" +source = "git+https://github.com/21pages/hwcodec#91d1cd327c88490f917457072aeef0676ddb2be7" dependencies = [ "bindgen", "cc", diff --git a/libs/scrap/src/common/linux.rs b/libs/scrap/src/common/linux.rs index 866fb851a..3efcdb054 100644 --- a/libs/scrap/src/common/linux.rs +++ b/libs/scrap/src/common/linux.rs @@ -54,14 +54,9 @@ pub enum Display { WAYLAND(wayland::Display), } -#[inline] -pub fn is_x11() -> bool { - "x11" == hbb_common::platform::linux::get_display_server() -} - impl Display { pub fn primary() -> io::Result { - Ok(if is_x11() { + Ok(if super::is_x11() { Display::X11(x11::Display::primary()?) } else { Display::WAYLAND(wayland::Display::primary()?) @@ -69,7 +64,7 @@ impl Display { } pub fn all() -> io::Result> { - Ok(if is_x11() { + Ok(if super::is_x11() { x11::Display::all()? .drain(..) .map(|x| Display::X11(x)) diff --git a/libs/scrap/src/common/mod.rs b/libs/scrap/src/common/mod.rs index 4a9ade58d..8ee22ada6 100644 --- a/libs/scrap/src/common/mod.rs +++ b/libs/scrap/src/common/mod.rs @@ -59,3 +59,9 @@ pub trait TraitCapturer { #[cfg(windows)] fn set_gdi(&mut self) -> bool; } + +#[cfg(x11)] +#[inline] +pub fn is_x11() -> bool { + "x11" == hbb_common::platform::linux::get_display_server() +} From a5b032c9f556048e4b9993da7f4132cdca951ca5 Mon Sep 17 00:00:00 2001 From: Yoseph Sianturi Date: Thu, 28 Jul 2022 09:12:38 +0800 Subject: [PATCH 4/4] Update id.rs --- src/lang/id.rs | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/lang/id.rs b/src/lang/id.rs index 21c6cb98a..62cb7b6b5 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -35,9 +35,9 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("About", "Tentang"), ("Mute", "Bisukan"), ("Audio Input", "Masukkan Audio"), - ("Enhancements", ""), - ("Hardware Codec", ""), - ("Adaptive Bitrate", ""), + ("Enhancements", "Peningkatan"), + ("Hardware Codec", "Codec Perangkat Keras"), + ("Adaptive Bitrate", "Kecepatan Bitrate Adaptif"), ("ID Server", "Server ID"), ("Relay Server", "Server Relay"), ("API Server", "API Server"), @@ -268,7 +268,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("android_start_service_tip", "Ketuk izin [Mulai Layanan] atau BUKA [Tangkapan Layar] untuk memulai layanan berbagi layar."), ("Account", "Akun"), ("Overwrite", "Timpa"), - ("This file exists, skip or overwrite this file?", ""), + ("This file exists, skip or overwrite this file?", "File ini sudah ada, lewati atau timpa file ini?"), ("Quit", "Keluar"), ("doc_mac_permission", "https://rustdesk.com/docs/en/manual/mac/#enable-permissions"), ("Help", "Bantuan"), @@ -283,21 +283,21 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Turned off", "Matikan"), ("In privacy mode", "Dalam mode privasi"), ("Out privacy mode", "Keluar dari mode privasi"), - ("Language", ""), - ("Keep RustDesk background service", ""), - ("Ignore Battery Optimizations", ""), + ("Language", "Bahasa"), + ("Keep RustDesk background service", "Pertahankan RustDesk berjalan pada background service"), + ("Ignore Battery Optimizations", "Abaikan Pengoptimalan Baterai"), ("android_open_battery_optimizations_tip", ""), - ("Connection not allowed", ""), - ("Use temporary password", ""), - ("Use permanent password", ""), - ("Use both passwords", ""), - ("Set permanent password", ""), - ("Set temporary password length", ""), - ("Enable Remote Restart", ""), - ("Allow remote restart", ""), - ("Restart Remote Device", ""), - ("Are you sure you want to restart", ""), - ("Restarting Remote Device", ""), + ("Connection not allowed", "Koneksi tidak dijinkan"), + ("Use temporary password", "Gunakan kata sandi sementara"), + ("Use permanent password", "Gunakan kata sandi permanaen"), + ("Use both passwords", "Gunakan kedua kata sandi "), + ("Set permanent password", "Setel kata sandi permanen"), + ("Set temporary password length", "Setel panjang kata sandi sementara"), + ("Enable Remote Restart", "Aktifkan Restart Jarak Jauh"), + ("Allow remote restart", "Ijinkan Restart Jarak Jauh"), + ("Restart Remote Device", "Restart Perangkat Jarak Jauh"), + ("Are you sure you want to restart", "Apakah Anda yakin untuk memulai ulang"), + ("Restarting Remote Device", "Memulai Ulang Perangkat Jarak Jauh"), ("remote_restarting_tip", ""), ].iter().cloned().collect(); }