Update translate source texts

linuxdeepin/internal-discussion#1269
linuxdeepin · Apr 8, 2019 · 6971ea7 · 6971ea7
1 parent 2db5fc4
commit 6971ea7
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 55 deletions.
diff --git a/app/com.deepin.pkexec.deepin-clone.policy.tmp b/app/com.deepin.pkexec.deepin-clone.policy.tmp
@@ -5,7 +5,7 @@
 <policyconfig>
 
   <action id="com.deepin.pkexec.deepin-clone">
-    <message>Password required to run Deepin Clone</message>
+    <message>Authentication is required to run Deepin Clone</message>
     <description>Deepin Clone needs to do operations on block device, such as write and read, get info and etc.</description>
     <icon_name>deepin-clone</icon_name>
     <defaults>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     <name>CloneJob</name>
     <message>
         <location filename="../src/corelib/clonejob.cpp" line="146"/>
-        <source>Writing data to %1 failed, %2 byte data should be written, but actually %3 wrote, error: %4</source>
+        <source>Writing data to %1 failed, expected write size: %2 — only %3 written, error: %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -103,21 +103,6 @@
         <source>Storage location can not be in the partition to backup, please reselect</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widgets/mainwindow.cpp" line="436"/>
-        <source>Not enough total capacity in target disk, please select another one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/mainwindow.cpp" line="438"/>
-        <source>Not enough total capacity in target partition, please select another one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/mainwindow.cpp" line="463"/>
-        <source>Not enough total capacity, please select another disk</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/widgets/mainwindow.cpp" line="492"/>
         <source>Proceed to clone?</source>
@@ -142,6 +127,21 @@
         <source>The selected storage location not found</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/widgets/mainwindow.cpp" line="652"/>
+        <source>Task completed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/mainwindow.cpp" line="664"/>
+        <source>Clone Successful</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/mainwindow.cpp" line="668"/>
+        <source>Restore Succeessful</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/widgets/mainwindow.cpp" line="736"/>
         <source>Failed to restart system</source>
@@ -162,6 +162,21 @@
         <source>Restore boot</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/widgets/mainwindow.cpp" line="436"/>
+        <source>No enough total capacity in target disk, please select another one</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/mainwindow.cpp" line="438"/>
+        <source>No enough total capacity in target partition, please select another one</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/widgets/mainwindow.cpp" line="463"/>
+        <source>No enough total capacity, please select another disk</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/widgets/mainwindow.cpp" line="493"/>
         <source>All data in the target disk (partition) will be formatted during cloning or restoring, which cannot be cancelled during the process.</source>
@@ -218,11 +233,6 @@
         <source>Retry</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widgets/mainwindow.cpp" line="652"/>
-        <source>Task done</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/widgets/mainwindow.cpp" line="655"/>
         <source>Backup Succeeded</source>
@@ -233,16 +243,6 @@
         <source>View Backup File</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widgets/mainwindow.cpp" line="664"/>
-        <source>Clone Succeeded</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/widgets/mainwindow.cpp" line="668"/>
-        <source>Restore Succeeded</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/widgets/mainwindow.cpp" line="669"/>
         <source>Restart</source>
@@ -330,21 +330,21 @@
     </message>
     <message>
         <location filename="../src/main.cpp" line="153"/>
-        <source>Deepin Clone is a tool to backup and restore in deepin. It supports to clone, backup and restore disk or partition and other functions.</source>
+        <source>Deepin Clone is a backup and restore tool in deepin. It supports disk or partition clone, backup and restore, and other functions.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/helper.cpp" line="890"/>
+        <location filename="../src/corelib/helper.cpp" line="850"/>
         <source>Partition &quot;%1&quot; not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/helper.cpp" line="892"/>
+        <location filename="../src/corelib/helper.cpp" line="852"/>
         <source>Disk &quot;%1&quot; not found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/corelib/helper.cpp" line="917"/>
+        <location filename="../src/corelib/helper.cpp" line="877"/>
         <location filename="../src/fixboot/bootdoctor.cpp" line="53"/>
         <location filename="../src/fixboot/bootdoctor.cpp" line="86"/>
         <location filename="../src/fixboot/bootdoctor.cpp" line="161"/>
@@ -358,7 +358,7 @@
     </message>
     <message>
         <location filename="../src/fixboot/bootdoctor.cpp" line="177"/>
-        <source>Unknown partition table format</source>
+        <source>Unknown partition style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -525,11 +525,6 @@
         <source>Select image file</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/widgets/selectfilepage.cpp" line="107"/>
-        <source>Drag and drop backup image file here</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/widgets/selectfilepage.cpp" line="223"/>
         <location filename="../src/widgets/selectfilepage.cpp" line="260"/>
@@ -541,6 +536,11 @@
         <source>Reselect image file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/widgets/selectfilepage.cpp" line="107"/>
+        <source>Drag and drop the backup image file here</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/widgets/selectfilepage.cpp" line="184"/>
         <source>Reselect storage location</source>
@@ -561,7 +561,7 @@
     </message>
     <message>
         <location filename="../src/widgets/workingpage.cpp" line="62"/>
-        <source>Remaining time: %1</source>
+        <source>Time remaining: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>