From 050952e5e8bbd2c8df2a2a3b79985268f0079f70 Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Sun, 8 May 2022 16:08:30 +0800
Subject: [PATCH] fix: confirmDelete -> cancel Delete

---
 src/lang/cn.rs       | 2 ++
 src/lang/ru.rs       | 2 ++
 src/lang/template.rs | 2 ++
 src/lang/tw.rs       | 2 ++
 src/ui/cm.rs         | 4 ----
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/lang/cn.rs b/src/lang/cn.rs
index c7849b11b..bfbef4875 100644
--- a/src/lang/cn.rs
+++ b/src/lang/cn.rs
@@ -266,6 +266,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("android_start_service_tip", "点击 [启动服务] 或打开 [屏幕录制] 权限开启手机屏幕共享服务。"),
         ("Account", "账号"),
         ("Quit", "退出"),
+        ("Overwrite", "覆盖"),
+        ("This file exists, skip or overwrite this file?", "这个文件/文件夹已存在，跳过/覆盖?")
         ("doc_mac_permission", "https://rustdesk.com/docs/zh-cn/manual/mac/#启用权限"),
         ("Help", "帮助"),
     ].iter().cloned().collect();
diff --git a/src/lang/ru.rs b/src/lang/ru.rs
index 0249b4eee..5ce96ab33 100644
--- a/src/lang/ru.rs
+++ b/src/lang/ru.rs
@@ -266,6 +266,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("android_start_service_tip", "Нажмите [Запуск промежуточного сервера] или ОТКРЫТЬ разрешение [Скриншот], чтобы запустить службу демонстрации экрана."),
         ("Account", "Аккаунт"),
         ("Quit", "Выйти"),
+        ("Overwrite", "крышка"),
+        ("This file exists, skip or overwrite this file?", "Этот файл существует, пропустить или перезаписать этот файл?")
         ("doc_mac_permission", "https://rustdesk.com/docs/en/manual/mac/#enable-permissions"),
         ("Help", "Помощь"),
     ].iter().cloned().collect();
diff --git a/src/lang/template.rs b/src/lang/template.rs
index 9cfed1283..84be6ed8d 100644
--- a/src/lang/template.rs
+++ b/src/lang/template.rs
@@ -265,6 +265,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("android_version_audio_tip", ""),
         ("android_start_service_tip", ""),
         ("Account", ""),
+        ("Overwrite", ""),
+        ("This file exists, skip or overwrite this file?", "")
         ("Quit", ""),
         ("doc_mac_permission", ""),
         ("Help", ""),
diff --git a/src/lang/tw.rs b/src/lang/tw.rs
index 6d9e2814a..b8e422d4b 100644
--- a/src/lang/tw.rs
+++ b/src/lang/tw.rs
@@ -266,6 +266,8 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
         ("android_start_service_tip", "點擊 [啟動服務] 或打開 [屏幕錄製] 權限開啟手機屏幕共享服務。"),
         ("Account", "帳戶"),
         ("Quit", "退出"),
+        ("Overwrite", "覆蓋"),
+        ("This file exists, skip or overwrite this file?", "這個文件/文件夾已存在，跳過/覆蓋？")
         ("doc_mac_permission", "https://rustdesk.com/docs/zh-tw/manual/mac/#啟用權限"),
         ("Help", "幫助"),
     ].iter().cloned().collect();
diff --git a/src/ui/cm.rs b/src/ui/cm.rs
index ed6f47d96..9a4779664 100644
--- a/src/ui/cm.rs
+++ b/src/ui/cm.rs
@@ -136,7 +136,6 @@ impl ConnectionManager {
                     dir,
                     include_hidden,
                 } => {
-                    // println!("[cm.rs:126] ipc::FS::ReadDir recved");
                     Self::read_dir(&dir, include_hidden, conn).await;
                 }
                 ipc::FS::RemoveDir {
@@ -157,7 +156,6 @@ impl ConnectionManager {
                     id,
                     mut files,
                 } => {
-                    println!("new write in ipc::FS::NewWrite");
                     write_jobs.push(fs::TransferJob::new_write(
                         id,
                         path,
@@ -293,7 +291,6 @@ impl ConnectionManager {
             let mut file_response = FileResponse::new();
             file_response.set_dir(fd);
             msg_out.set_file_response(file_response);
-            // println!("[cm.rs:229] set dir");
             Self::send(msg_out, conn).await;
         }
     }
@@ -356,7 +353,6 @@ impl ConnectionManager {
     }
 
     async fn send(msg: Message, conn: &mut Connection) {
-        println!("send msg: {:?}", msg);
         match msg.write_to_bytes() {
             Ok(bytes) => allow_err!(conn.send(&Data::RawMessage(bytes)).await),
             err => allow_err!(err),