Merge lp:~cypressyew/checkbox/cbt-i18n into lp:checkbox

[Po-Hsu Lin]

Remove extra space, and some minor typo correction.
Regroup strings with arg() to make it more complete to translators.

[Maciej Kisielewski (kissiel)]

Goodies! +1, Thanks!

review: Approve

=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2016-02-17 09:31:44 +0000
+++ checkbox-touch/checkbox-touch.qml	2016-05-18 07:23:38 +0000
@@ -281,7 +281,7 @@
         onRerunLast: app.resumeSession(true, processNextTest)
         onContinueSession: app.resumeSession(false, processNextTest)
         resumeText: i18n.tr("Checkbox session got suspended.\nDo you want \
- to rerun last test, continue to the next test, or start a new session?")
+to rerun last test, continue to the next test, or start a new session?")
         onRestartSession: {
             pageStack.clear();
             pageStack.push(welcomePage);
@@ -435,7 +435,7 @@
     function createPage(url, test) {
         var pageComponent = Qt.createComponent(Qt.resolvedUrl(url));
         if (pageComponent.status == Component.Error) {
-            var msg = i18n.tr("Could not create component '") + url + "'\n" + pageComponent.errorString();
+            var msg = i18n.tr("Could not create component '%1'\n").arg(url) + pageComponent.errorString();
             console.error(msg);
             ErrorLogic.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
         } else {
@@ -573,7 +573,7 @@
                     }
                     CbtDialogLogic.showDialog(
                         resultsPage,
-                        i18n.tr("Report has been submited.\n" + s),
+                        i18n.tr("Report has been submitted.\n" + s),
                         [{"text": i18n.tr("OK"), "color": UbuntuColors.green}]);
                 },
                 function(error) {

=== modified file 'checkbox-touch/components/CheckboxTouchApplication.qml'
--- checkbox-touch/components/CheckboxTouchApplication.qml	2016-02-17 09:31:44 +0000
+++ checkbox-touch/components/CheckboxTouchApplication.qml	2016-05-18 07:23:38 +0000
@@ -52,7 +52,7 @@
         }, function(error) {
             console.error("Unable to start session: " + error);
             ErrorLogic.showError(mainView,
-                                 i18n.tr("Could not start a session.  Reason:\n" + error),
+                                 i18n.tr("Could not start a session. Reason:\n" + error),
                                  Qt.quit,
                                  i18n.tr("Quit"));
         });

=== modified file 'checkbox-touch/components/ResultsPage.qml'
--- checkbox-touch/components/ResultsPage.qml	2015-11-16 10:20:39 +0000
+++ checkbox-touch/components/ResultsPage.qml	2016-05-18 07:23:38 +0000
@@ -132,7 +132,8 @@
                 }
                 Text {
                     objectName: "passedLabel"
-                    text: results.totalPassed + " " + i18n.tr("tests passed")
+                    // TRANSLATORS: %1 will be a number, please do not translate it
+                    text: i18n.tr("%1 tests passed").arg(results.totalPassed)
                 }
             }
             Row {
@@ -143,7 +144,8 @@
                 }
                 Text {
                     objectName: "failedLabel"
-                    text: results.totalFailed + " " + i18n.tr("tests failed")
+                    // TRANSLATORS: %1 will be a number, please do not translate it
+                    text: i18n.tr("%1 tests failed").arg(results.totalFailed)
                 }
             }
             Row {
@@ -154,7 +156,8 @@
                 }
                 Text {
                     objectName: "skippedLabel"
-                    text: results.totalSkipped + " " + i18n.tr("tests skipped")
+                    // TRANSLATORS: %1 will be a number, please do not translate it
+                    text: i18n.tr("%1 tests skipped").arg(results.totalSkipped)
                 }
             }
         }
@@ -174,7 +177,7 @@
             unlatchedColor: UbuntuColors.green
             visible: submissionName
             Layout.fillWidth: true
-            // TRANSLATORS: follwing string will be followed by a service name, e.g. "certification website"
+            // TRANSLATORS: following string will be followed by a service name, e.g. "certification website"
             text: i18n.tr("Submit results to " + submissionName)
             onLatchedClicked: {
                 rerunAction.enabled = false;

=== modified file 'checkbox-touch/components/ResumeSessionPage.qml'
--- checkbox-touch/components/ResumeSessionPage.qml	2016-01-06 20:21:32 +0000
+++ checkbox-touch/components/ResumeSessionPage.qml	2016-05-18 07:23:38 +0000
@@ -71,7 +71,7 @@
             id: deleteIncompleteButton
             objectName: "deleteIncompleteButton"
             visible: incompleteSessionCount > 0
-            text: i18n.tr("Delete incomplete sessions (%0)".arg(incompleteSessionCount))
+            text: i18n.tr("Delete incomplete sessions (%0)").arg(incompleteSessionCount)
             unlatchedColor: UbuntuColors.red
             Layout.fillWidth: true
             onLatchedClicked: {