← Back to branch summary

~jocave/checkbox/hybrid-amd-gpu-mods

« back to all changes in this revision

Viewing changes to checkbox-touch/checkbox-touch.qml

  • Committer: Sylvain Pineau
  • Author(s): Po-Hsu Lin
  • Date: 2016-05-18 10:22:30 UTC
  • mfrom: (4352.3.1 touch-i18n-fix)
  • Revision ID: sylvain_pineau-20160518102230-fquud7dskld1f0mh
"automatic merge of lp:~cypressyew/checkbox/cbt-i18n/ by tarmac [r=kissiel][bug=][author=cypressyew]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkbox-touch/checkbox-touch.qml
281
281
        onRerunLast: app.resumeSession(true, processNextTest)
282
282
        onContinueSession: app.resumeSession(false, processNextTest)
283
283
        resumeText: i18n.tr("Checkbox session got suspended.\nDo you want \
284
 
 to rerun last test, continue to the next test, or start a new session?")
 
284
to rerun last test, continue to the next test, or start a new session?")
285
285
        onRestartSession: {
286
286
            pageStack.clear();
287
287
            pageStack.push(welcomePage);
435
435
    function createPage(url, test) {
436
436
        var pageComponent = Qt.createComponent(Qt.resolvedUrl(url));
437
437
        if (pageComponent.status == Component.Error) {
438
 
            var msg = i18n.tr("Could not create component '") + url + "'\n" + pageComponent.errorString();
 
438
            var msg = i18n.tr("Could not create component '%1'\n").arg(url) + pageComponent.errorString();
439
439
            console.error(msg);
440
440
            ErrorLogic.showError(mainView, msg, Qt.quit, i18n.tr("Quit"));
441
441
        } else {
573
573
                    }
574
574
                    CbtDialogLogic.showDialog(
575
575
                        resultsPage,
576
 
                        i18n.tr("Report has been submited.\n" + s),
 
576
                        i18n.tr("Report has been submitted.\n" + s),
577
577
                        [{"text": i18n.tr("OK"), "color": UbuntuColors.green}]);
578
578
                },
579
579
                function(error) {