diff --git a/libfm-qt-0.14.1/src/fileoperation.cpp b/libfm-qt-0.14.1/src/fileoperation.cpp
index aa79ac0edb46daf3767bd97749de2f005e5d2325..4bd932385d91bad457898f2cad07e4b2ae73ad11 100644
--- a/libfm-qt-0.14.1/src/fileoperation.cpp
+++ b/libfm-qt-0.14.1/src/fileoperation.cpp
@@ -328,7 +328,7 @@ void FileOperation::onJobFinish() {
tr("Error"),
tr("Some files cannot be moved to trash can because "
"the underlying file systems don't support this operation.\n"
- "Do you want to delete them instead?"),tr("确定"),tr("取消"));
+ "Do you want to delete them instead?"),tr("Yes"),tr("No"));
if( result== 0) {
deleteFiles(std::move(unsupportedFiles), false);
Q_EMIT fileOperatopnFinished(srcPaths_, Trash, destPath_);
@@ -408,7 +408,7 @@ FileOperation* FileOperation::deleteFiles(Fm::FilePathList srcFiles, bool prompt
int result = QMessageBox::warning(parent ? parent->window() : nullptr,
tr("Confirm"),
tr("Do you want to delete the selected files?"),
- tr("确定"),tr("取消")
+ tr("Yes"),tr("No")
);
if(result !=0 ) {
@@ -439,7 +439,7 @@ FileOperation* FileOperation::trashFiles(Fm::FilePathList srcFiles, bool prompt,
int result = QMessageBox::warning(parent ? parent->window() : nullptr,
tr("Confirm"),
tr("Do you want to move the selected files to trash can?"),
- tr("确定"),tr("取消")
+ tr("Yes"),tr("No")
);
if(result != 0) {
return nullptr;
diff --git a/libfm-qt-0.14.1/src/filepropsdialog.cpp b/libfm-qt-0.14.1/src/filepropsdialog.cpp
index 9770e3e6b4d3cc3fe007c1ef4018a771d495f800..1e6a9867983aa538a16ea597d44d55ffe4e50810 100644
--- a/libfm-qt-0.14.1/src/filepropsdialog.cpp
+++ b/libfm-qt-0.14.1/src/filepropsdialog.cpp
@@ -522,7 +522,7 @@ void FilePropsDialog::accept() {
int result = QMessageBox::question(this,
tr("Apply changes"),
tr("Do you want to recursively apply these changes to all files and sub-folders?"),
- tr("确认"),tr("取消"));
+ tr("Yes"),tr("No"));
if(result == 0) {
op->setRecursiveChattr(true);
}
diff --git a/libfm-qt-0.14.1/src/folderview.cpp b/libfm-qt-0.14.1/src/folderview.cpp
index 84e0420c02d72abc7d0df9d321db7f8f4cf9505d..cf25548ff6a4829857e4b5076e1d6520495d61ed 100644
--- a/libfm-qt-0.14.1/src/folderview.cpp
+++ b/libfm-qt-0.14.1/src/folderview.cpp
@@ -1368,7 +1368,7 @@ void FolderView::updateGridSize() {
// 13 chars x 3 lines should be enough to show the full filenames for most files.
// int textWidth = fm.averageCharWidth() * 6;
// int textHeight = fm.lineSpacing() * 2;
- int textWidth = 18 * 6;
+ int textWidth = 15 * 6;
int textHeight = 22 * 2;
grid.setWidth(qMax(icon.width(), textWidth) + 4); // a margin of 2 px for selection rects
grid.setHeight(icon.height() + textHeight + 4); // a margin of 2 px for selection rects
diff --git a/libfm-qt-0.14.1/src/placesmodel.cpp b/libfm-qt-0.14.1/src/placesmodel.cpp
index a0bfc655b7c445adf53ad505f1a40a80a1d73eba..c9fc9b43cd55683ec3125a8d630ff9a29e2be056 100644
--- a/libfm-qt-0.14.1/src/placesmodel.cpp
+++ b/libfm-qt-0.14.1/src/placesmodel.cpp
@@ -114,7 +114,7 @@ PlacesModel::PlacesModel(QObject* parent):
networkRoot->setFont(f);
appendRow(networkRoot);
- serverItem = new PlacesModelItem(QIcon(":/res/service.png"),QIcon(":/res/service-click.png"), tr("Connet to Server"));
+ serverItem = new PlacesModelItem(QIcon(":/res/service.png"),QIcon(":/res/service-click.png"), tr("Connect To Server"));
serverItem->setType(PlacesModelItem::Type::NetServer);
networkRoot->appendRow(serverItem);
diff --git a/libfm-qt-0.14.1/src/translations/libfm-qt.ts b/libfm-qt-0.14.1/src/translations/libfm-qt.ts
index 0f752f61c25c49b227939e3960ec42d764a42d07..e59971d3ae72e934cb74b525185d3b416758078f 100644
--- a/libfm-qt-0.14.1/src/translations/libfm-qt.ts
+++ b/libfm-qt-0.14.1/src/translations/libfm-qt.ts
@@ -1106,7 +1106,7 @@ Do you want to delete them instead?
- Connet to Server
+ Connect To Server
diff --git a/libfm-qt-0.14.1/src/translations/libfm-qt_zh_CN.ts b/libfm-qt-0.14.1/src/translations/libfm-qt_zh_CN.ts
index 7ed7a114ab5d16c994771fa1c6e3489bc5abac7f..2035c4180d0780a90a27ddecb3c87ad000df0141 100644
--- a/libfm-qt-0.14.1/src/translations/libfm-qt_zh_CN.ts
+++ b/libfm-qt-0.14.1/src/translations/libfm-qt_zh_CN.ts
@@ -786,18 +786,18 @@ Do you want to delete them instead?
是否直接删除这些文件？
-
-
-
- 确定
-
+
+
+
+ Yes
+ 确定
-
-
-
- 取消
-
+
+
+
+ No
+ 取消
@@ -1018,6 +1018,16 @@ Do you want to delete them instead?
Do you want to recursively apply these changes to all files and sub-folders?
您是否要将这些更改应用于所有子文件夹和文件?
+
+
+ Yes
+ 确定
+
+
+
+ No
+ 取消
+
Fm::FileSearchDialog
@@ -1450,7 +1460,7 @@ Do you want to delete them instead?
- Connet to Server
+ Connect To Server
连接至服务器
diff --git a/libfm-qt.spec b/libfm-qt.spec
index da4c8d55ea20ab53a1e3659b7fb4a358381aeea8..8eb23f7a42b99ee0c36c0f8da94edf2c12d764db 100644
--- a/libfm-qt.spec
+++ b/libfm-qt.spec
@@ -1,6 +1,6 @@
Name: libfm-qt
Version: 0.14.1
-Release: 197%{?dist}
+Release: 199%{?dist}
Summary: Companion library for PCManFM
License: GPLv2+
URL: http://www.gd-linux.com
@@ -129,6 +129,12 @@ sed -i "s/Requires:.*/Requires: Qt5Widgets Qt5X11Extras/" %{buildroot}/%{_libdir
%dir %{_datadir}/libfm-qt/translations
%changelog
+* Wed Nov 10 2021 Wu Shangmin - 0.14.1-199
+- 修复中文翻译问题
+
+* Fri Oct 08 2021 Wu Shangmin - 0.14.1-198
+- 调整桌面图标宽度
+
* Thu Sep 30 2021 Wu Shangmin - 0.14.1-197
- 禁止删除用户目录下的默认文件夹和桌面的默认图标