diff --git a/app/com.deepin.pkexec.deepin-clone.policy.tmp b/app/com.deepin.pkexec.deepin-clone.policy.tmp index 9a9369c..fa71e3a 100644 --- a/app/com.deepin.pkexec.deepin-clone.policy.tmp +++ b/app/com.deepin.pkexec.deepin-clone.policy.tmp @@ -5,7 +5,7 @@ - Password required to run Deepin Clone + Authentication is required to run Deepin Clone Deepin Clone needs to do operations on block device, such as write and read, get info and etc. deepin-clone diff --git a/app/src/corelib/clonejob.cpp b/app/src/corelib/clonejob.cpp index 52dd96a..9e5ba39 100644 --- a/app/src/corelib/clonejob.cpp +++ b/app/src/corelib/clonejob.cpp @@ -143,7 +143,7 @@ static bool diskInfoPipe(DDiskInfo &from, DDiskInfo &to, DDiskInfo::DataScope sc if (write_size < read_size) { if (error) - *error = QCoreApplication::translate("CloneJob", "Writing data to %1 failed, %2 byte data should be written, but actually %3 wrote, error: %4").arg(to.filePath()).arg(read_size).arg(write_size).arg(to.errorString()); + *error = QCoreApplication::translate("CloneJob", "Writing data to %1 failed, expected write size: %2 — only %3 written, error: %4").arg(to.filePath()).arg(read_size).arg(write_size).arg(to.errorString()); goto exit; } diff --git a/app/src/fixboot/bootdoctor.cpp b/app/src/fixboot/bootdoctor.cpp index 846c7c8..877a979 100644 --- a/app/src/fixboot/bootdoctor.cpp +++ b/app/src/fixboot/bootdoctor.cpp @@ -174,7 +174,7 @@ bool BootDoctor::fix(const QString &partDevice) ok = false; } } else if (info.ptType() == DDeviceDiskInfo::Unknow) { - m_lastErrorString = QObject::tr("Unknown partition table format"); + m_lastErrorString = QObject::tr("Unknown partition style"); ok = false; } } diff --git a/app/src/main.cpp b/app/src/main.cpp index b71a5d2..b4596cc 100644 --- a/app/src/main.cpp +++ b/app/src/main.cpp @@ -150,8 +150,8 @@ int main(int argc, char *argv[]) } app->setApplicationDisplayName(QObject::tr("Deepin Clone")); - app->setApplicationDescription(QObject::tr("Deepin Clone is a tool to backup and restore in deepin. " - "It supports to clone, backup and restore disk or partition and other functions.")); + app->setApplicationDescription(QObject::tr("Deepin Clone is a backup and restore tool in deepin. " + "It supports disk or partition clone, backup and restore, and other functions.")); app->setApplicationAcknowledgementPage("https://www.deepin.org/acknowledgments/deepin-clone/"); app->setTheme("light"); a = app; diff --git a/app/src/widgets/mainwindow.cpp b/app/src/widgets/mainwindow.cpp index b50a0d1..c0b843d 100644 --- a/app/src/widgets/mainwindow.cpp +++ b/app/src/widgets/mainwindow.cpp @@ -433,9 +433,9 @@ void MainWindow::setStatus(MainWindow::Status status) dCError("Not enough total capacity in target device, source size: %lld, target size: %lld", disk_info.totalSize(), target_disk_info.totalSize()); if (m_operateObject == SelectActionPage::Disk) - m_subTitle->setText(tr("Not enough total capacity in target disk, please select another one")); + m_subTitle->setText(tr("No enough total capacity in target disk, please select another one")); else - m_subTitle->setText(tr("Not enough total capacity in target partition, please select another one")); + m_subTitle->setText(tr("No enough total capacity in target partition, please select another one")); m_bottomButton->setEnabled(false); @@ -460,7 +460,7 @@ void MainWindow::setStatus(MainWindow::Status status) if (storage_info.bytesAvailable() < disk_info.totalReadableDataSize()) { dCError("Not enough total capacity, source size: %lld, target available size: %lld", disk_info.totalSize(), storage_info.bytesAvailable()); - m_subTitle->setText(tr("Not enough total capacity, please select another disk")); + m_subTitle->setText(tr("No enough total capacity, please select another disk")); m_bottomButton->setEnabled(false); return; @@ -649,7 +649,7 @@ void MainWindow::setStatus(MainWindow::Status status) dCDebug("\n\"%s\"\n", qPrintable(Helper::lastProcessStandardOutput())); } } else { - page->setTitle(tr("Task done")); + page->setTitle(tr("Task completed")); if (m_currentMode == SelectActionPage::Backup) { m_title->setTitle(tr("Backup Succeeded")); @@ -661,11 +661,11 @@ void MainWindow::setStatus(MainWindow::Status status) dCDebug("Set the file permissions failed"); } } else if (m_currentMode == SelectActionPage::Clone) { - m_title->setTitle(tr("Clone Succeeded")); + m_title->setTitle(tr("Clone Successful")); m_bottomButton->setText(tr("OK")); m_buttonAction = Quit; } else { - m_title->setTitle(tr("Restore Succeeded")); + m_title->setTitle(tr("Restore Succeessful")); m_bottomButton->setText(tr("Restart")); m_buttonAction = RestartSystem; } diff --git a/app/src/widgets/selectfilepage.cpp b/app/src/widgets/selectfilepage.cpp index 0bc56b3..2a1e8fd 100644 --- a/app/src/widgets/selectfilepage.cpp +++ b/app/src/widgets/selectfilepage.cpp @@ -104,7 +104,7 @@ SelectFileWidget::SelectFileWidget(Mode mode, QWidget *parent) layout->addWidget(m_label, 0, Qt::AlignHCenter); if (mode == GetFile) { - m_dragDropLabel = new QLabel(tr("Drag and drop backup image file here"), this); + m_dragDropLabel = new QLabel(tr("Drag and drop the backup image file here"), this); m_dragDropLabel->setObjectName("DragDropLabel"); QWidget *split_line = new QWidget(this); diff --git a/app/src/widgets/workingpage.cpp b/app/src/widgets/workingpage.cpp index 8e65397..0f1298c 100644 --- a/app/src/widgets/workingpage.cpp +++ b/app/src/widgets/workingpage.cpp @@ -59,7 +59,7 @@ WorkingPage::WorkingPage(const QString &from, const QString &to, QWidget *parent connect(m_job, &CloneJob::progressChanged, this, [this, total_readable_data_size] (qreal progress) { m_progress->setValue(progress * 100); m_writtenSizeLabel->setText(tr("Progress: %1/%2").arg(Helper::sizeDisplay(total_readable_data_size * progress)).arg(Helper::sizeDisplay(total_readable_data_size))); - m_timeRemainingLabel->setText(tr("Remaining time: %1").arg(Helper::secondsToString(m_job->estimateTime()))); + m_timeRemainingLabel->setText(tr("Time remaining: %1").arg(Helper::secondsToString(m_job->estimateTime()))); }); connect(m_job, &CloneJob::finished, this, &WorkingPage::finished); connect(m_job, &CloneJob::statusChanged, this, [this, tip_label] (CloneJob::Status s) { diff --git a/app/translations/deepin-clone.ts b/app/translations/deepin-clone.ts index e467c12..1b446bb 100644 --- a/app/translations/deepin-clone.ts +++ b/app/translations/deepin-clone.ts @@ -5,7 +5,7 @@ CloneJob - Writing data to %1 failed, %2 byte data should be written, but actually %3 wrote, error: %4 + Writing data to %1 failed, expected write size: %2 — only %3 written, error: %4 @@ -103,21 +103,6 @@ Storage location can not be in the partition to backup, please reselect - - - Not enough total capacity in target disk, please select another one - - - - - Not enough total capacity in target partition, please select another one - - - - - Not enough total capacity, please select another disk - - Proceed to clone? @@ -142,6 +127,21 @@ The selected storage location not found + + + Task completed + + + + + Clone Successful + + + + + Restore Succeessful + + Failed to restart system @@ -162,6 +162,21 @@ Restore boot + + + No enough total capacity in target disk, please select another one + + + + + No enough total capacity in target partition, please select another one + + + + + No enough total capacity, please select another disk + + All data in the target disk (partition) will be formatted during cloning or restoring, which cannot be cancelled during the process. @@ -218,11 +233,6 @@ Retry - - - Task done - - Backup Succeeded @@ -233,16 +243,6 @@ View Backup File - - - Clone Succeeded - - - - - Restore Succeeded - - Restart @@ -330,21 +330,21 @@ - Deepin Clone is a tool to backup and restore in deepin. It supports to clone, backup and restore disk or partition and other functions. + Deepin Clone is a backup and restore tool in deepin. It supports disk or partition clone, backup and restore, and other functions. - + Partition "%1" not found - + Disk "%1" not found - + @@ -358,7 +358,7 @@ - Unknown partition table format + Unknown partition style @@ -525,11 +525,6 @@ Select image file - - - Drag and drop backup image file here - - @@ -541,6 +536,11 @@ Reselect image file + + + Drag and drop the backup image file here + + Reselect storage location @@ -561,7 +561,7 @@ - Remaining time: %1 + Time remaining: %1