From 3a3fcdda13cc094e7c5322824a04cb18ba739be0 Mon Sep 17 00:00:00 2001 From: NewStart Date: Mon, 13 May 2024 04:10:27 -0400 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libfm-qt-0.14.1/src/fileoperation.cpp | 6 ++-- libfm-qt-0.14.1/src/filepropsdialog.cpp | 2 +- libfm-qt-0.14.1/src/folderview.cpp | 2 +- libfm-qt-0.14.1/src/placesmodel.cpp | 2 +- libfm-qt-0.14.1/src/translations/libfm-qt.ts | 2 +- .../src/translations/libfm-qt_zh_CN.ts | 32 ++++++++++++------- libfm-qt.spec | 8 ++++- 7 files changed, 35 insertions(+), 19 deletions(-) diff --git a/libfm-qt-0.14.1/src/fileoperation.cpp b/libfm-qt-0.14.1/src/fileoperation.cpp index aa79ac0..4bd9323 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 9770e3e..1e6a986 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 84e0420..cf25548 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 a0bfc65..c9fc9b4 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 0f752f6..e59971d 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 7ed7a11..2035c41 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 da4c8d5..8eb23f7 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 - 禁止删除用户目录下的默认文件夹和桌面的默认图标 -- Gitee