From 4d3e3f3aed446b83ad419853702dc81757f4a4f8 Mon Sep 17 00:00:00 2001 From: Integral Date: Mon, 30 Oct 2023 15:39:09 +0800 Subject: [PATCH 1/2] Update cn.rs --- src/lang/cn.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 4cf749ffa..1792c9ead 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -566,10 +566,10 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Show displays as individual windows", "在单个窗口中打开显示器"), ("Use all my displays for the remote session", "将我的所有显示器用于远程会话"), ("selinux_tip", "SELinux 处于启用状态，RustDesk 可能无法作为被控正常运行。"), - ("Change view", ""), - ("Big tiles", ""), - ("Small tiles", ""), - ("List", ""), + ("Change view", "更改视图"), + ("Big tiles", "大磁贴"), + ("Small tiles", "小磁贴"), + ("List", "列表"), ("Virtual display", "虚拟显示器"), ("Plug out all", "拔出所有"), ].iter().cloned().collect(); From 7b9ce072d99bbe9b8d2e36a3fc933ecb0210ff2e Mon Sep 17 00:00:00 2001 From: ClSlaid Date: Mon, 30 Oct 2023 15:41:39 +0800 Subject: [PATCH 2/2] patch: fix local file test Signed-off-by: ClSlaid --- libs/clipboard/src/platform/unix/local_file.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/clipboard/src/platform/unix/local_file.rs b/libs/clipboard/src/platform/unix/local_file.rs index be7ef557e..c9186c4fa 100644 --- a/libs/clipboard/src/platform/unix/local_file.rs +++ b/libs/clipboard/src/platform/unix/local_file.rs @@ -259,7 +259,7 @@ pub(super) fn construct_file_list(paths: &[PathBuf]) -> Result, C #[cfg(test)] mod file_list_test { - use std::path::PathBuf; + use std::{path::PathBuf, sync::atomic::AtomicU64}; use hbb_common::bytes::{BufMut, BytesMut}; @@ -281,6 +281,7 @@ mod file_list_test { handle: None, name: name.to_string(), size: 0, + offset: AtomicU64::new(0), last_write_time: std::time::SystemTime::UNIX_EPOCH, read_only: false, is_dir,