diff --git a/src/translations/vnote_zh_CN.qm b/src/translations/vnote_zh_CN.qm
index 252c9c08..aeef3823 100644
Binary files a/src/translations/vnote_zh_CN.qm and b/src/translations/vnote_zh_CN.qm differ
diff --git a/src/translations/vnote_zh_CN.ts b/src/translations/vnote_zh_CN.ts
index e1a7ddb9..436dbc26 100644
--- a/src/translations/vnote_zh_CN.ts
+++ b/src/translations/vnote_zh_CN.ts
@@ -189,8 +189,8 @@
- Please check if there alread exists a directory with the same name.
- 请检查目标文件夹中是否已经存在同名文件夹。
+ Please check if there already exists a directory with the same name.
+ 请检查是否存在同名目录。
@@ -384,7 +384,8 @@
-
+
+ Warning警告
@@ -404,12 +405,22 @@
该操作不可撤消!
-
+
+ Fail to copy note %1.
+ 复制笔记失败: %1。
+
+
+
+ Please check if there already exists a file with the same name in the target directory.
+ 请检查目标文件夹中是否存在同名文件。
+
+
+ The renaming will change the note type.重命名会更改笔记类型。
-
+ You should close the note %1 before continue.请在继续前先关闭笔记: %1。
diff --git a/src/vdirectorytree.cpp b/src/vdirectorytree.cpp
index f39249fe..98ad08ff 100644
--- a/src/vdirectorytree.cpp
+++ b/src/vdirectorytree.cpp
@@ -553,7 +553,7 @@ bool VDirectoryTree::copyDirectory(VDirectory *p_destDir, const QString &p_destN
} else {
VUtils::showMessage(QMessageBox::Warning, tr("Warning"),
tr("Fail to copy directory %1.").arg(srcName),
- tr("Please check if there alread exists a directory with the same name."),
+ tr("Please check if there already exists a directory with the same name."),
QMessageBox::Ok, QMessageBox::Ok, this);
}
diff --git a/src/vfilelist.cpp b/src/vfilelist.cpp
index 0be3255e..8031261f 100644
--- a/src/vfilelist.cpp
+++ b/src/vfilelist.cpp
@@ -410,6 +410,11 @@ void VFileList::pasteFiles(VDirectory *p_destDir)
}
if (copyFile(p_destDir, fileName, srcFile, isCut)) {
nrPasted++;
+ } else {
+ VUtils::showMessage(QMessageBox::Warning, tr("Warning"),
+ tr("Fail to copy note %1.").arg(srcFile->getName()),
+ tr("Please check if there already exists a file with the same name in the target directory."),
+ QMessageBox::Ok, QMessageBox::Ok, this);
}
}