Merge lp:~nskaggs/checkbox/pilot into lp:~canonical-platform-qa/checkbox/easing-login-pain

[Nicholas Skaggs]

This is the code for version 1.0 in the store of pilot. It likely won't ever really be merged down into checkbox itself.

In other words, herein lies the hackery and bundled providers. Yummy.

[lp:~nskaggs/checkbox/pilot]

4026. By Nicholas Skaggs on 2015-09-30

new logo, remove unneeded signal

4027. By Nicholas Skaggs on 2015-09-30

fix icon sizing :p

4028. By Nicholas Skaggs on 2015-10-01

make it a confined app, update icon again

4029. By Nicholas Skaggs on 2015-10-01

add system info to all providers

4030. By Nicholas Skaggs on 2015-10-01

fix system info jobs

4031. By Nicholas Skaggs on 2015-10-01

use _256 version of icon. Fix apparmor confinement. Clarify system-information tests

4032. By Nicholas Skaggs on 2015-10-01

fix for 1501509, per nik90

4033. By Nicholas Skaggs on 2015-10-01

add more input hints

4034. By Nicholas Skaggs on 2015-10-01

fix policy version

4035. By Nicholas Skaggs on 2015-10-01

fix policy

4036. By Nicholas Skaggs on 2015-10-01

back to unconfined

4037. By Nicholas Skaggs on 2015-10-01

store version

4038. By Nicholas Skaggs on 2015-10-01

remove PT reference, and clarify ubuntu SSO login

4039. By Nicholas Skaggs on 2015-10-01

bump for store version 1.1.3

4040. By Nicholas Skaggs on 2015-10-23

rebase to trunk

4041. By Nicholas Skaggs on 2015-12-16

fix weather test error

4042. By Nicholas Skaggs on 2015-12-16

merge-down trunk. This killed hacks for re-run screen and submission screen

4043. By Nicholas Skaggs on 2016-01-05

re-merge checkbox trunk

4044. By Nicholas Skaggs on 2016-01-05

remove the coreapps providers from tree

Unmerged revisions

4044. By Nicholas Skaggs on 2016-01-05

remove the coreapps providers from tree

4043. By Nicholas Skaggs on 2016-01-05

re-merge checkbox trunk

4042. By Nicholas Skaggs on 2015-12-16

merge-down trunk. This killed hacks for re-run screen and submission screen

4041. By Nicholas Skaggs on 2015-12-16

fix weather test error

4040. By Nicholas Skaggs on 2015-10-23

rebase to trunk

4039. By Nicholas Skaggs on 2015-10-01

bump for store version 1.1.3

4038. By Nicholas Skaggs on 2015-10-01

remove PT reference, and clarify ubuntu SSO login

4037. By Nicholas Skaggs on 2015-10-01

store version

4036. By Nicholas Skaggs on 2015-10-01

back to unconfined

4035. By Nicholas Skaggs on 2015-10-01

fix policy

=== modified file 'checkbox-ng/checkbox_ng/__init__.py'
--- checkbox-ng/checkbox_ng/__init__.py	2015-07-16 20:50:36 +0000
+++ checkbox-ng/checkbox_ng/__init__.py	2016-01-05 21:24:37 +0000
@@ -24,4 +24,4 @@
 CheckBoxNG is a new version of CheckBox built on top of PlainBox
 """
 
-__version__ = (0, 21, 0, "dev", 0)
+__version__ = (0, 24, 0, "dev", 0)
 
=== modified file 'checkbox-ng/checkbox_ng/commands/newcli.py'
--- checkbox-ng/checkbox_ng/commands/newcli.py	2015-09-08 13:11:18 +0000
+++ checkbox-ng/checkbox_ng/commands/newcli.py	2016-01-05 21:24:37 +0000
@@ -46,8 +46,9 @@
 from plainbox.impl.secure.qualifiers import RegExpJobQualifier
 from plainbox.impl.secure.qualifiers import select_jobs
 from plainbox.impl.session import SessionMetaData
+from plainbox.impl.session.jobs import InhibitionCause
+from plainbox.impl.transport import TransportError
 from plainbox.impl.transport import get_all_transports
-from plainbox.impl.transport import TransportError
 from plainbox.vendor.textland import get_display
 
 from checkbox_ng.misc import SelectableJobTreeNode
@@ -318,7 +319,7 @@
         # NOTE: tree.selection is correct but ordered badly.  To retain
         # the original ordering we should just treat it as a mask and
         # use it to filter jobs from desired_job_list.
-        wanted_set = frozenset(tree.selection)
+        wanted_set = frozenset(tree.selection + tree.resource_jobs)
         job_list = [job for job in self.manager.state.run_list
                     if job in wanted_set]
         self._update_desired_job_list(job_list)
@@ -435,7 +436,7 @@
             self.config.email_address)
         transport = transport_cls(self.config.lp_url, options_string)
         # TRANSLATORS: Do not translate the {} format markers.
-        print(_("Submitting results to {0} for email_address {1})").format(
+        print(_("Submitting results to {0} for email_address {1}").format(
             self.config.lp_url, self.config.email_address))
         with open(self.submission_file, encoding='utf-8') as stream:
             try:
@@ -460,7 +461,7 @@
         from checkbox_ng.certification import InvalidSecureIDError
         transport_cls = get_all_transports().get('certification')
         # TRANSLATORS: Do not translate the {} format markers.
-        print(_("Submitting results to {0} for secure_id {1})").format(
+        print(_("Submitting results to {0} for secure_id {1}").format(
             self.config.c3_url, self.config.secure_id))
         option_chunks = []
         option_chunks.append("secure_id={0}".format(self.config.secure_id))
@@ -491,19 +492,23 @@
                 print(str(exc))
 
     def maybe_rerun_jobs(self):
-        def rerun_predicate(job_state):
-            return job_state.result.outcome in (
-                IJobResult.OUTCOME_FAIL, IJobResult.OUTCOME_CRASH)
         # create a list of jobs that qualify for rerunning
         rerun_candidates = []
         for job in self.manager.state.run_list:
-            if rerun_predicate(self.manager.state.job_state_map[job.id]):
+            job_state = self.manager.state.job_state_map[job.id]
+            if job_state.result.outcome in (
+                IJobResult.OUTCOME_FAIL, IJobResult.OUTCOME_CRASH,
+                    IJobResult.OUTCOME_NOT_SUPPORTED):
                 rerun_candidates.append(job)
+
         # bail-out early if no job qualifies for rerunning
         if not rerun_candidates:
             return False
         tree = SelectableJobTreeNode.create_tree(
             self.manager.state, rerun_candidates)
+        # nothing to select in root node and categories - bailing out
+        if not tree.jobs and not tree._categories:
+            return False
         # deselect all by default
         tree.set_descendants_state(False)
         self.display.run(ShowRerun(tree, _("Select jobs to re-run")))
@@ -511,10 +516,15 @@
         if not wanted_set:
             # nothing selected - nothing to run
             return False
-        rerun_job_list = [job for job in self.manager.state.run_list
-                          if job in wanted_set]
+        # include resource jobs that selected jobs depend on
+        resources_to_rerun = []
+        for job in wanted_set:
+            job_state = self.manager.state.job_state_map[job.id]
+            for inhibitor in job_state.readiness_inhibitor_list:
+                if inhibitor.cause == InhibitionCause.FAILED_DEP:
+                    resources_to_rerun.append(inhibitor.related_job)
         # reset outcome of jobs that are selected for re-running
-        for job in wanted_set:
+        for job in list(wanted_set) + resources_to_rerun:
             from plainbox.impl.result import MemoryJobResult
             self.manager.state.job_state_map[job.id].result = \
                 MemoryJobResult({})
 
=== modified file 'checkbox-ng/checkbox_ng/commands/sru.py'
--- checkbox-ng/checkbox_ng/commands/sru.py	2015-09-07 13:40:15 +0000
+++ checkbox-ng/checkbox_ng/commands/sru.py	2016-01-05 21:24:37 +0000
@@ -128,7 +128,7 @@
 
     def _collect_info(self, rc, sa):
         sa.select_providers('*')
-        sa.start_new_session(_("Hardware Collection Session"))
+        sa.start_new_session(_("SRU Session"))
         sa.select_test_plan(self.config.test_plan)
         sa.bootstrap()
         for job_id in sa.get_static_todo_list():
 
=== modified file 'checkbox-ng/checkbox_ng/misc.py'
--- checkbox-ng/checkbox_ng/misc.py	2015-09-17 13:32:38 +0000
+++ checkbox-ng/checkbox_ng/misc.py	2016-01-05 21:24:37 +0000
@@ -145,6 +145,28 @@
             builder.auto_add_job(job)
         return builder.root_node
 
+    @classmethod
+    def create_simple_tree(cls, sa, job_list):
+        """
+        Build a rooted JobTreeNode from a job list.
+
+        :argument sa:
+            A session assistant object
+        :argument job_list:
+            List of jobs to consider for building the tree.
+        """
+        root_node = cls()
+        for job in job_list:
+            cat_name = sa.get_category(job.category_id).tr_name()
+            matches = [n for n in root_node.categories if n.name == cat_name]
+            if not matches:
+                node = cls(cat_name)
+                root_node.add_category(node)
+            else:
+                node = matches[0]
+            node.add_job(job)
+        return root_node
+
 
 class TreeBuilder:
 
@@ -349,11 +371,13 @@
         for job in self.job_selection:
             if self.job_selection[job]:
                 self._selection_list.append(job)
-        # Don't forget to append the collected resource jobs to the final
-        # selection
-        self._selection_list.extend(self._resource_jobs)
         return self._selection_list
 
+    @property
+    def resource_jobs(self):
+        """Return all the resource jobs."""
+        return self._resource_jobs
+
     def set_ancestors_state(self, new_state):
         """
         Set the selection state of all ancestors consistently
 
=== modified file 'checkbox-ng/checkbox_ng/test_misc.py'
--- checkbox-ng/checkbox_ng/test_misc.py	2015-09-17 13:32:38 +0000
+++ checkbox-ng/checkbox_ng/test_misc.py	2016-01-05 21:24:37 +0000
@@ -180,4 +180,4 @@
         # Note that in addition to the selected (D) test, we need the
         # tree selection to contain the resource (F), even though the
         # user never saw it in the previous tests for visual presentation.
-        self.assertEqual(self.tree.selection, [self.D, self.F])
+        self.assertEqual(self.tree.selection, [self.D])
 
=== modified file 'checkbox-ng/checkbox_ng/ui.py'
--- checkbox-ng/checkbox_ng/ui.py	2015-06-10 15:04:50 +0000
+++ checkbox-ng/checkbox_ng/ui.py	2016-01-05 21:24:37 +0000
@@ -77,12 +77,13 @@
     """
     Display the appropriate menu and return the selected options
     """
-    def __init__(self, title, menu, selection=[0]):
+    def __init__(self, title, menu, selection=[0], multiple_allowed=True):
         self.image = TextImage(Size(0, 0))
         self.title = title
         self.menu = menu
         self.option_count = len(menu)
         self.position = 0  # Zero-based index of the selected menu option
+        self.multiple_allowed = multiple_allowed
         if self.option_count:
             self.selection = selection
         else:
@@ -110,6 +111,8 @@
                     self.selection.remove(self.position)
                 elif self.position < self.option_count:
                     self.selection.append(self.position)
+                    if not self.multiple_allowed:
+                        self.selection = [self.position]
         self.repaint(event)
         return self.image
 
 
=== modified file 'checkbox-ng/docs/changelog.rst'
--- checkbox-ng/docs/changelog.rst	2014-09-16 12:53:41 +0000
+++ checkbox-ng/docs/changelog.rst	2016-01-05 21:24:37 +0000
@@ -6,18 +6,32 @@
     accounting of development history please inspect the source history
     directly.
 
+.. _version_0_23:
+
+CheckboxNG 0.23 (unreleased)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+* Bugfixes: https://launchpad.net/checkbox-ng/+milestone/0.23
+
+.. _version_0_22:
+
+CheckboxNG 0.22
+^^^^^^^^^^^^^^^
+
+* Bugfixes: https://launchpad.net/checkbox-ng/+milestone/0.22
+
 CheckboxNG 0.3
---------------
+^^^^^^^^^^^^^^
 
 * Bugfixes: https://launchpad.net/checkbox-ng/+milestone/0.3
 
 CheckboxNG 0.2
---------------
+^^^^^^^^^^^^^^
 
-???
+* Bugfixes: https://launchpad.net/checkbox-ng/+milestone/0.2
 
 CheckboxNG 0.1
---------------
+^^^^^^^^^^^^^^
 
 * Initial release
 * Support for displaying configuration
 
=== added file 'checkbox-ng/launchers/checkbox-cli2'
--- checkbox-ng/launchers/checkbox-cli2	1970-01-01 00:00:00 +0000
+++ checkbox-ng/launchers/checkbox-cli2	2016-01-05 21:24:37 +0000
@@ -0,0 +1,596 @@
+#!/usr/bin/env python3
+# This file is part of Checkbox.
+#
+# Copyright 2015 Canonical Ltd.
+# Written by:
+#   Sylvain Pineau <[e-mail]>
+#
+# Checkbox is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3,
+# as published by the Free Software Foundation.
+#
+# Checkbox is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
+
+"""
+Checkbox CLI Application.
+
+WARNING: this is not a launcher interpreter.
+"""
+
+from argparse import SUPPRESS
+from shutil import copyfileobj
+import gettext
+import io
+import json
+import logging
+import os
+import sys
+
+from guacamole import Command
+from guacamole.core import Ingredient
+from guacamole.ingredients import ansi
+from guacamole.ingredients import argparse
+from guacamole.ingredients import cmdtree
+from guacamole.recipes.cmd import CommandRecipe
+
+# TODO: use public APIs here
+from plainbox.abc import IJobResult
+from plainbox.i18n import ngettext
+from plainbox.i18n import pgettext as C_
+from plainbox.impl.commands.inv_run import seconds_to_human_duration
+from plainbox.impl.commands.inv_run import Action
+from plainbox.impl.commands.inv_run import ActionUI
+from plainbox.impl.commands.inv_run import NormalUI
+from plainbox.impl.commands.inv_run import ReRunJob
+from plainbox.impl.color import Colorizer
+from plainbox.impl.exporter import ByteStringStreamTranslator
+from plainbox.impl.ingredients import CanonicalCrashIngredient
+from plainbox.impl.ingredients import RenderingContextIngredient
+from plainbox.impl.ingredients import SessionAssistantIngredient
+from plainbox.impl.result import tr_outcome
+from plainbox.impl.result import JobResultBuilder
+from plainbox.impl.result import MemoryJobResult
+from plainbox.impl.session.assistant import SA_RESTARTABLE
+from plainbox.impl.session.jobs import InhibitionCause
+from plainbox.vendor.textland import get_display
+
+from checkbox_ng.misc import SelectableJobTreeNode
+from checkbox_ng.ui import ScrollableTreeNode
+from checkbox_ng.ui import ShowMenu
+from checkbox_ng.ui import ShowRerun
+
+
+_ = gettext.gettext
+
+_logger = logging.getLogger("checkbox-cli")
+
+
+class DisplayIngredient(Ingredient):
+
+    """Ingredient that adds a Textland display to guacamole."""
+
+    def late_init(self, context):
+        """Add a DisplayIngredient as ``display`` to the guacamole context."""
+        context.display = get_display()
+
+
+class CheckboxCommandRecipe(CommandRecipe):
+
+    """A recipe for using Checkbox-enhanced commands."""
+
+    def get_ingredients(self):
+        """Get a list of ingredients for guacamole."""
+        return [
+            cmdtree.CommandTreeBuilder(self.command),
+            cmdtree.CommandTreeDispatcher(),
+            argparse.ParserIngredient(),
+            CanonicalCrashIngredient(),
+            ansi.ANSIIngredient(),
+            SessionAssistantIngredient(),
+            RenderingContextIngredient(),
+            DisplayIngredient()
+        ]
+
+
+class CheckboxUI(NormalUI):
+
+    def considering_job(self, job, job_state):
+        pass
+
+
+class CheckboxCommand(Command):
+
+    """
+    A command with Checkbox-enhanced ingredients.
+
+    This command has two additional items in the guacamole execution context,
+    the :class:`DisplayIngredient` object ``display`` and the
+    :class:`SessionAssistant` object ``sa``.
+    """
+
+    bug_report_url = "https://bugs.launchpad.net/checkbox-ng/+filebug"
+
+    def main(self, argv=None, exit=True):
+        """
+        Shortcut for running a command.
+
+        See :meth:`guacamole.recipes.Recipe.main()` for details.
+        """
+        return CheckboxCommandRecipe(self).main(argv, exit)
+
+
+class checkbox_cli(CheckboxCommand):
+
+    """Tool to run Checkbox jobs interactively from the command line."""
+
+    app_id = 'checkbox-cli'
+
+    def get_sa_api_version(self):
+        return '0.99'
+
+    def get_sa_api_flags(self):
+        return (SA_RESTARTABLE,)
+
+    def register_arguments(self, parser):
+        """Method called to register command line arguments."""
+        parser.add_argument(
+            '-t', '--test-plan', action="store", metavar=_("TEST-PLAN-ID"),
+            default=None,
+            # TRANSLATORS: this is in imperative form
+            help=_("load the specified test plan"))
+        parser.add_argument(
+            '--secure_id', metavar="SECURE_ID",
+            help=_("Canonical hardware identifier (optional)"))
+        parser.add_argument(
+            '--non-interactive', action='store_true',
+            help=_("skip tests that require interactivity"))
+        parser.add_argument(
+            '--dont-suppress-output', action="store_true", default=False,
+            help=_("don't suppress the output of certain job plugin types"))
+        parser.add_argument(
+            '--staging', action='store_true', default=False,
+            # Hide staging from help message (See pad.lv/1350005)
+            help=SUPPRESS)
+        parser.add_argument(
+            '--resume', dest='session_id', metavar="SESSION_ID",
+            help=SUPPRESS)
+
+    def invoked(self, ctx):
+        """Method called when the command is invoked."""
+        self.ctx = ctx
+        self.transport = self._create_transport()
+        self.C = Colorizer()
+        try:
+            self._do_normal_sequence()
+            self._export_results()
+            if ctx.args.secure_id:
+                self._send_results()
+            ctx.sa.finalize_session()
+        except KeyboardInterrupt:
+            return 1
+
+    def _export_results(self):
+        if self.is_interactive:
+            print(self.C.header(_("Results")))
+            # This requires a bit more finesse, as exporters output bytes
+            # and stdout needs a string.
+            translating_stream = ByteStringStreamTranslator(
+                sys.stdout, "utf-8")
+            self.ctx.sa.export_to_stream(
+                '2013.com.canonical.plainbox::text', (), translating_stream)
+        base_dir = os.path.join(
+            os.getenv(
+                'XDG_DATA_HOME', os.path.expanduser("~/.local/share/")),
+            "checkbox-ng")
+        if not os.path.exists(base_dir):
+            os.makedirs(base_dir)
+        exp_options = ['with-sys-info', 'with-summary', 'with-job-description',
+                       'with-text-attachments', 'with-certification-status',
+                       'with-job-defs', 'with-io-log', 'with-comments']
+        exporters = [
+            '2013.com.canonical.plainbox::hexr',
+            '2013.com.canonical.plainbox::html',
+            '2013.com.canonical.plainbox::xlsx',
+            '2013.com.canonical.plainbox::json',
+        ]
+        print()
+        for unit_name in exporters:
+            results_path = self.ctx.sa.export_to_file(unit_name, exp_options,
+                                                      base_dir)
+            print("file://{}".format(results_path))
+
+    def _send_results(self):
+        print()
+        print(_("Sending hardware report to Canonical Certification"))
+        print(_("Server URL is: {0}").format(self.transport.url))
+        result = self.ctx.sa.export_to_transport(
+            "2013.com.canonical.plainbox::hexr", self.transport)
+        if 'url' in result:
+            print(result['url'])
+
+    def _create_transport(self):
+        if self.ctx.args.secure_id:
+            return self.ctx.sa.get_canonical_certification_transport(
+                self.ctx.args.secure_id, staging=self.ctx.args.staging)
+
+    def _get_interactively_picked_testplans(self):
+        test_plan_ids = self.ctx.sa.get_test_plans()
+        test_plan_names = [self.ctx.sa.get_test_plan(tp_id).name for tp_id in
+                           test_plan_ids]
+        try:
+            selected_index = self.ctx.display.run(
+                ShowMenu(_("Select test plan"),
+                         test_plan_names, [],
+                         multiple_allowed=False))[0]
+        except IndexError:
+            return None
+        return test_plan_ids[selected_index]
+
+    def _interactively_pick_jobs_to_run(self):
+        job_list = [self.ctx.sa.get_job(job_id) for job_id in
+                    self.ctx.sa.get_static_todo_list()]
+        tree = SelectableJobTreeNode.create_simple_tree(self.ctx.sa, job_list)
+        title = _('Choose tests to run on your system:')
+        self.ctx.display.run(ScrollableTreeNode(tree, title))
+        # NOTE: tree.selection is correct but ordered badly. To retain
+        # the original ordering we should just treat it as a mask and
+        # use it to filter jobs from get_static_todo_list.
+        wanted_set = frozenset([job.id for job in tree.selection])
+        job_id_list = [job_id for job_id in self.ctx.sa.get_static_todo_list()
+                       if job_id in wanted_set]
+        self.ctx.sa.use_alternate_selection(job_id_list)
+
+    @property
+    def is_interactive(self):
+        """
+        Flag indicating that this is an interactive invocation.
+
+        We can then interact with the user when we encounter OUTCOME_UNDECIDED.
+        """
+        return (sys.stdin.isatty() and sys.stdout.isatty() and not
+                self.ctx.args.non_interactive)
+
+    def _get_ui_for_job(self, job):
+        if self.ctx.args.dont_suppress_output is False and job.plugin in (
+                'local', 'resource', 'attachment'):
+            return CheckboxUI(self.C.c, show_cmd_output=False)
+        else:
+            return CheckboxUI(self.C.c, show_cmd_output=True)
+
+    def _run_single_job_with_ui_loop(self, job, ui):
+        print(self.C.header(job.tr_summary(), fill='-'))
+        print(_("ID: {0}").format(job.id))
+        print(_("Category: {0}").format(
+            self.ctx.sa.get_job_state(job.id).effective_category_id))
+        comments = ""
+        while True:
+            if job.plugin in ('user-interact', 'user-interact-verify',
+                              'user-verify', 'manual'):
+                ui.notify_about_purpose(job)
+                if (self.is_interactive and
+                        job.plugin in ('user-interact',
+                                       'user-interact-verify',
+                                       'manual')):
+                    ui.notify_about_steps(job)
+                    if job.plugin == 'manual':
+                        cmd = 'run'
+                    else:
+                        cmd = ui.wait_for_interaction_prompt(job)
+                    if cmd == 'run' or cmd is None:
+                        result_builder = self.ctx.sa.run_job(job.id, ui, False)
+                    elif cmd == 'comment':
+                        new_comment = input(self.C.BLUE(
+                            _('Please enter your comments:') + '\n'))
+                        if new_comment:
+                            comments += new_comment + '\n'
+                        continue
+                    elif cmd == 'skip':
+                        result_builder = JobResultBuilder(
+                            outcome=IJobResult.OUTCOME_SKIP,
+                            comments=_("Explicitly skipped before"
+                                       " execution"))
+                        if comments != "":
+                            result_builder.comments = comments
+                        break
+                    elif cmd == 'quit':
+                        raise SystemExit()
+                else:
+                    result_builder = self.ctx.sa.run_job(job.id, ui, False)
+            else:
+                if 'noreturn' in job.get_flag_set():
+                    ui.noreturn_job()
+                result_builder = self.ctx.sa.run_job(job.id, ui, False)
+            if (self.is_interactive and
+                    result_builder.outcome == IJobResult.OUTCOME_UNDECIDED):
+                try:
+                    if comments != "":
+                        result_builder.comments = comments
+                    ui.notify_about_verification(job)
+                    self._interaction_callback(job, result_builder)
+                except ReRunJob:
+                    self.ctx.sa.use_job_result(job.id,
+                                               result_builder.get_result())
+                    continue
+            break
+        return result_builder
+
+    def _pick_action_cmd(self, action_list, prompt=None):
+        return ActionUI(action_list, prompt).run()
+
+    def _interaction_callback(self, job, result_builder,
+                              prompt=None, allowed_outcome=None):
+        result = result_builder.get_result()
+        if prompt is None:
+            prompt = _("Select an outcome or an action: ")
+        if allowed_outcome is None:
+            allowed_outcome = [IJobResult.OUTCOME_PASS,
+                               IJobResult.OUTCOME_FAIL,
+                               IJobResult.OUTCOME_SKIP]
+        allowed_actions = [
+            Action('c', _('add a comment'), 'set-comments')
+        ]
+        if IJobResult.OUTCOME_PASS in allowed_outcome:
+            allowed_actions.append(
+                Action('p', _('set outcome to {0}').format(
+                    self.C.GREEN(C_('set outcome to <pass>', 'pass'))),
+                    'set-pass'))
+        if IJobResult.OUTCOME_FAIL in allowed_outcome:
+            allowed_actions.append(
+                Action('f', _('set outcome to {0}').format(
+                    self.C.RED(C_('set outcome to <fail>', 'fail'))),
+                    'set-fail'))
+        if IJobResult.OUTCOME_SKIP in allowed_outcome:
+            allowed_actions.append(
+                Action('s', _('set outcome to {0}').format(
+                    self.C.YELLOW(C_('set outcome to <skip>', 'skip'))),
+                    'set-skip'))
+        if job.command is not None:
+            allowed_actions.append(
+                Action('r', _('re-run this job'), 're-run'))
+        if result.return_code is not None:
+            if result.return_code == 0:
+                suggested_outcome = IJobResult.OUTCOME_PASS
+            else:
+                suggested_outcome = IJobResult.OUTCOME_FAIL
+            allowed_actions.append(
+                Action('', _('set suggested outcome [{0}]').format(
+                    tr_outcome(suggested_outcome)), 'set-suggested'))
+        while result.outcome not in allowed_outcome:
+            print(_("Please decide what to do next:"))
+            print("  " + _("outcome") + ": {0}".format(
+                self.C.result(result)))
+            if result.comments is None:
+                print("  " + _("comments") + ": {0}".format(
+                    C_("none comment", "none")))
+            else:
+                print("  " + _("comments") + ": {0}".format(
+                    self.C.CYAN(result.comments, bright=False)))
+            cmd = self._pick_action_cmd(allowed_actions)
+            if cmd == 'set-pass':
+                result_builder.outcome = IJobResult.OUTCOME_PASS
+            elif cmd == 'set-fail':
+                result_builder.outcome = IJobResult.OUTCOME_FAIL
+            elif cmd == 'set-skip' or cmd is None:
+                result_builder.outcome = IJobResult.OUTCOME_SKIP
+            elif cmd == 'set-suggested':
+                result_builder.outcome = suggested_outcome
+            elif cmd == 'set-comments':
+                new_comment = input(self.C.BLUE(
+                    _('Please enter your comments:') + '\n'))
+                if new_comment:
+                    result_builder.add_comment(new_comment)
+            elif cmd == 're-run':
+                raise ReRunJob
+            result = result_builder.get_result()
+
+    def _run_jobs(self, jobs_to_run):
+        estimated_time = 0
+        for job_id in jobs_to_run:
+            job = self.ctx.sa.get_job(job_id)
+            if (job.estimated_duration is not None
+                    and estimated_time is not None):
+                estimated_time += job.estimated_duration
+            else:
+                estimated_time = None
+        for job_no, job_id in enumerate(jobs_to_run, start=1):
+            print(self.C.header(
+                _('Running job {} / {}. Estimated time left: {}').format(
+                    job_no, len(jobs_to_run),
+                    seconds_to_human_duration(max(0, estimated_time))
+                    if estimated_time is not None else _("unknown")),
+                fill='-'))
+            job = self.ctx.sa.get_job(job_id)
+            builder = self._run_single_job_with_ui_loop(
+                job, self._get_ui_for_job(job))
+            result = builder.get_result()
+            self.ctx.sa.use_job_result(job_id, result)
+            if (job.estimated_duration is not None
+                    and estimated_time is not None):
+                estimated_time -= job.estimated_duration
+
+    def _get_rerun_candidates(self):
+        """Get all the tests that might be selected for rerunning."""
+        def rerun_predicate(job_state):
+            return job_state.result.outcome in (
+                IJobResult.OUTCOME_FAIL, IJobResult.OUTCOME_CRASH,
+                IJobResult.OUTCOME_NOT_SUPPORTED, IJobResult.OUTCOME_SKIP)
+        rerun_candidates = []
+        todo_list = self.ctx.sa.get_static_todo_list()
+        job_states = {job_id: self.ctx.sa.get_job_state(job_id) for job_id
+                      in todo_list}
+        for job_id, job_state in job_states.items():
+            if rerun_predicate(job_state):
+                rerun_candidates.append(self.ctx.sa.get_job(job_id))
+        return rerun_candidates
+
+    def _maybe_rerun_jobs(self):
+        # create a list of jobs that qualify for rerunning
+        rerun_candidates = self._get_rerun_candidates()
+        # bail-out early if no job qualifies for rerunning
+        if not rerun_candidates:
+            return False
+        tree = SelectableJobTreeNode.create_simple_tree(self.ctx.sa,
+                                                        rerun_candidates)
+        # nothing to select in root node and categories - bailing out
+        if not tree.jobs and not tree._categories:
+            return False
+        # deselect all by default
+        tree.set_descendants_state(False)
+        self.ctx.display.run(ShowRerun(tree, _("Select jobs to re-run")))
+        wanted_set = frozenset(tree.selection)
+        if not wanted_set:
+            # nothing selected - nothing to run
+            return False
+        rerun_candidates = []
+        # include resource jobs that selected jobs depend on
+        resources_to_rerun = []
+        for job in wanted_set:
+            job_state = self.ctx.sa.get_job_state(job.id)
+            for inhibitor in job_state.readiness_inhibitor_list:
+                if inhibitor.cause == InhibitionCause.FAILED_DEP:
+                    resources_to_rerun.append(inhibitor.related_job)
+        # reset outcome of jobs that are selected for re-running
+        for job in list(wanted_set) + resources_to_rerun:
+            self.ctx.sa.get_job_state(job.id).result = MemoryJobResult({})
+            rerun_candidates.append(job.id)
+        self._run_jobs(rerun_candidates)
+        return True
+
+    def _do_normal_sequence(self):
+        self.ctx.sa.select_providers("*")
+        self.ctx.sa.configure_application_restart(
+            lambda session_id: [
+                'sh', '-c', ' '.join([
+                    os.path.abspath(__file__),
+                    "--resume", session_id])
+            ])
+        resumed = self._maybe_resume_session()
+        if not resumed:
+            print(_("Preparing..."))
+            self.ctx.sa.start_new_session(_("Checkbox CLI Session"))
+            testplan_id = None
+            if self.ctx.args.test_plan:
+                if self.ctx.args.test_plan in self.ctx.sa.get_test_plans():
+                    testplan_id = self.ctx.args.test_plan
+            elif self.is_interactive:
+                testplan_id = self._get_interactively_picked_testplans()
+            if not testplan_id:
+                self.ctx.rc.reset()
+                self.ctx.rc.bg = 'red'
+                self.ctx.rc.fg = 'bright_white'
+                self.ctx.rc.bold = 1
+                self.ctx.rc.para(_("Test plan not found!"))
+                raise SystemExit(1)
+            self.ctx.sa.select_test_plan(testplan_id)
+            self.ctx.sa.update_app_blob(json.dumps(
+                {'testplan_id': testplan_id, }).encode("UTF-8"))
+            self.ctx.sa.bootstrap()
+            if self.is_interactive:
+                self._interactively_pick_jobs_to_run()
+            self._run_jobs(self.ctx.sa.get_dynamic_todo_list())
+        if self.is_interactive:
+            while True:
+                if self._maybe_rerun_jobs():
+                    continue
+                else:
+                    break
+
+    def _handle_last_job_after_resume(self, metadata):
+        last_job = metadata.running_job_name
+        if last_job is None:
+            return
+        print(_("Previous session run tried to execute job: {}").format(
+            last_job))
+        cmd = self._pick_action_cmd([
+            Action('s', _("skip that job"), 'skip'),
+            Action('p', _("mark it as passed and continue"), 'pass'),
+            Action('f', _("mark it as failed and continue"), 'fail'),
+            Action('r', _("run it again"), 'run'),
+        ], _("What do you want to do with that job?"))
+        if cmd == 'skip' or cmd is None:
+            result = MemoryJobResult({
+                'outcome': IJobResult.OUTCOME_SKIP,
+                'comments': _("Skipped after resuming execution")
+            })
+        elif cmd == 'pass':
+            result = MemoryJobResult({
+                'outcome': IJobResult.OUTCOME_PASS,
+                'comments': _("Passed after resuming execution")
+            })
+        elif cmd == 'fail':
+            result = MemoryJobResult({
+                'outcome': IJobResult.OUTCOME_FAIL,
+                'comments': _("Failed after resuming execution")
+            })
+        elif cmd == 'run':
+            result = None
+        if result:
+            self.ctx.sa.use_job_result(last_job, result)
+
+    def _maybe_resume_session(self):
+        # Try to use the first session that can be resumed if the user agrees
+        resume_candidates = list(self.ctx.sa.get_resumable_sessions())
+        resumed = False
+        if resume_candidates:
+            if self.ctx.args.session_id:
+                for candidate in resume_candidates:
+                    if candidate.id == self.ctx.args.session_id:
+                        resume_candidates = (candidate, )
+                        break
+                else:
+                    raise RuntimeError("Requested session is not resumable!")
+            elif self.is_interactive:
+                print(self.C.header(_("Resume Incomplete Session")))
+                print(ngettext(
+                    "There is {0} incomplete session that might be resumed",
+                    "There are {0} incomplete sessions that might be resumed",
+                    len(resume_candidates)
+                ).format(len(resume_candidates)))
+            else:
+                return
+            for candidate in resume_candidates:
+                if self.ctx.args.session_id:
+                    cmd = 'resume'
+                else:
+                    # Skip sessions that the user doesn't want to resume
+                    cmd = self._pick_action_cmd([
+                        Action('r', _("resume this session"), 'resume'),
+                        Action('n', _("next session"), 'next'),
+                        Action('c', _("create new session"), 'create')
+                    ], _("Do you want to resume session {0!a}?").format(
+                        candidate.id))
+                if cmd == 'next':
+                    continue
+                elif cmd == 'create' or cmd is None:
+                    break
+                elif cmd == 'resume':
+                    metadata = self.ctx.sa.resume_session(candidate.id)
+                    app_blob = json.loads(metadata.app_blob.decode("UTF-8"))
+                    test_plan_id = app_blob['testplan_id']
+                    # FIXME selecting again the testplan on resume resets both
+                    # the static and dynamic todo lists.
+                    # We're then saving the selection from the saved run_list
+                    # by accessing the session private context object.
+                    selected_id_list = [job.id for job in
+                                        self.ctx.sa._context.state.run_list]
+                    self.ctx.sa.select_test_plan(test_plan_id)
+                    self.ctx.sa.bootstrap()
+                    self.ctx.sa.use_alternate_selection(selected_id_list)
+                    # If we resumed maybe not rerun the same, probably broken
+                    # job
+                    self._handle_last_job_after_resume(metadata)
+                    self._run_jobs(self.ctx.sa.get_dynamic_todo_list())
+                    resumed = True
+                # Finally ignore other sessions that can be resumed
+                break
+        return resumed
+
+
+if __name__ == '__main__':
+    checkbox_cli().main()
 
=== modified file 'checkbox-ng/po/POTFILES.in'
--- checkbox-ng/po/POTFILES.in	2015-06-25 15:42:19 +0000
+++ checkbox-ng/po/POTFILES.in	2016-01-05 21:24:37 +0000
@@ -5,19 +5,13 @@
 ./checkbox_ng/commands/cli.py
 ./checkbox_ng/commands/launcher.py
 ./checkbox_ng/commands/newcli.py
-./checkbox_ng/commands/service.py
 ./checkbox_ng/commands/sru.py
 ./checkbox_ng/commands/submit.py
 ./checkbox_ng/commands/test_sru.py
 ./checkbox_ng/config.py
-./checkbox_ng/dbus_ex/__init__.py
-./checkbox_ng/dbus_ex/decorators.py
-./checkbox_ng/dbus_ex/service.py
-./checkbox_ng/dbus_ex/test_dbus.py
 ./checkbox_ng/launcher.py
 ./checkbox_ng/launchpad.py
 ./checkbox_ng/main.py
-./checkbox_ng/service.py
 ./checkbox_ng/test_certification.py
 ./checkbox_ng/test_config.py
 ./checkbox_ng/test_main.py
 
=== modified file 'checkbox-ng/po/checkbox-ng.pot'
--- checkbox-ng/po/checkbox-ng.pot	2015-05-19 05:10:52 +0000
+++ checkbox-ng/po/checkbox-ng.pot	2016-01-05 21:24:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 13:10+0800\n"
+"POT-Creation-Date: 2015-12-23 18:53+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -37,311 +37,247 @@
 msgstr ""
 
 #: .././checkbox_ng/certification.py:164 .././checkbox_ng/launchpad.py:183
-#, python-brace-format
 msgid "Request to {0} timed out: {1}"
 msgstr ""
 
 #: .././checkbox_ng/certification.py:167 .././checkbox_ng/launchpad.py:186
-#, python-brace-format
 msgid "Invalid destination URL: {0}"
 msgstr ""
 
 #: .././checkbox_ng/certification.py:170 .././checkbox_ng/launchpad.py:189
-#, python-brace-format
 msgid "Unable to connect to {0}: {1}"
 msgstr ""
 
-#: .././checkbox_ng/certification.py:188
+#: .././checkbox_ng/certification.py:189
 msgid "secure_id must be 15 or 18-character alphanumeric string"
 msgstr ""
 
-#: .././checkbox_ng/commands/cli.py:76
+#: .././checkbox_ng/commands/cli.py:70
 msgid "run check-config"
 msgstr ""
 
+#: .././checkbox_ng/commands/cli.py:71
+#: .././checkbox_ng/commands/launcher.py:108
+msgid "user interface options"
+msgstr ""
+
 #: .././checkbox_ng/commands/cli.py:77
-msgid "user interface options"
-msgstr ""
-
-#: .././checkbox_ng/commands/cli.py:83
+#: .././checkbox_ng/commands/launcher.py:111
 msgid "skip tests that require interactivity"
 msgstr ""
 
-#: .././checkbox_ng/commands/cli.py:86
+#: .././checkbox_ng/commands/cli.py:80
 msgid "don't suppress the output of certain job plugin types"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:121
-#: .././checkbox_ng/commands/newcli.py:132
+#: .././checkbox_ng/commands/launcher.py:64
+#, python-format
+msgid "Unable to load launcher definition: %s"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:69
+msgid "Unable to start launcher because of errors:"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:102
+msgid "LAUNCHER"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:103
+msgid "launcher definition file to use"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:119
+#: .././checkbox_ng/commands/newcli.py:130
 #, python-format
 msgid "Incorrect pattern %r: %s"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:149
+#: .././checkbox_ng/commands/newcli.py:147
 #, python-format
 msgid "There is no test plan: %s"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:235
+#: .././checkbox_ng/commands/newcli.py:236
 #, python-format
 msgid "Selected testplans: %r"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:258
+#: .././checkbox_ng/commands/newcli.py:259
 msgid "Suite selection"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:261
+#: .././checkbox_ng/commands/newcli.py:262
 msgid "No testplan selected, aborting"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:299
+#: .././checkbox_ng/commands/newcli.py:291
 msgid "Selecting Job Generators"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:318
+#: .././checkbox_ng/commands/newcli.py:310
 msgid "Selecting Jobs For Execution"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:325
+#: .././checkbox_ng/commands/newcli.py:317
 msgid "Choose tests to run on your system:"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:337
+#: .././checkbox_ng/commands/newcli.py:329
 msgid "Results"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:379
-msgid "Saving submission file to {}"
-msgstr ""
-
-#. FIXME: replacing extension is ugly
-#: .././checkbox_ng/commands/newcli.py:381
-#: .././checkbox_ng/commands/newcli.py:384
+#: .././checkbox_ng/commands/newcli.py:368
 msgid "View results"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:412
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:397
 msgid ""
 "\n"
 "Submit results to {0}?"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:415
+#: .././checkbox_ng/commands/newcli.py:400
 msgid "Secure ID: "
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:418
+#: .././checkbox_ng/commands/newcli.py:403
 msgid "ERROR: Secure ID must be 15 or 18-character alphanumeric string"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:436
+#: .././checkbox_ng/commands/newcli.py:421
 msgid ""
 "\n"
 "Submit results to launchpad.net/+hwdb?"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:438
+#: .././checkbox_ng/commands/newcli.py:423
 msgid "Email address: "
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format markers.
-#: .././checkbox_ng/commands/newcli.py:454
-#, python-brace-format
-msgid "Submitting results to {0} for email_address {1})"
+#: .././checkbox_ng/commands/newcli.py:439
+msgid "Submitting results to {0} for email_address {1}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:465
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:450
 msgid "Submission uploaded to: {0}"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:471
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:456
 msgid "Bad response from {0} transport"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format markers.
-#: .././checkbox_ng/commands/newcli.py:479
-#, python-brace-format
-msgid "Submitting results to {0} for secure_id {1})"
+#: .././checkbox_ng/commands/newcli.py:464
+msgid "Submitting results to {0} for secure_id {1}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:500
-#: .././checkbox_ng/commands/sru.py:142
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:485
+#: .././checkbox_ng/commands/submit.py:64
 msgid "Successfully sent, submission status at {0}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:504
-#: .././checkbox_ng/commands/sru.py:145
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:489
+#: .././checkbox_ng/commands/submit.py:68
 msgid "Successfully sent, server response: {0}"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:525
+#: .././checkbox_ng/commands/newcli.py:514
 msgid "Select jobs to re-run"
 msgstr ""
 
-#: .././checkbox_ng/commands/service.py:79
-msgid "Setting up DBus objects..."
-msgstr ""
-
-#. TODO: load sessions
-#: .././checkbox_ng/commands/service.py:81
-msgid "Constructing Service object"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:83
-msgid "Constructing ServiceWrapper"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:85
-msgid "Publishing all objects on DBus"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:88
-msgid "Publishing all managed objects (events should fire there)"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:90
-#, python-format
-msgid "Attempting to claim bus name: %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:93
-#, python-format
-msgid "PlainBox DBus service ready, claimed name: %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:99
-msgid ""
-"Main loop interrupted! It is recommended to call the Exit() method on the "
-"exported service object instead"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:103
-#, python-format
-msgid "Releasing %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:108
-#, python-format
-msgid "Closing %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:110
-msgid "Main loop terminated, exiting..."
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:122
-msgid "spawn dbus service"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:129
-msgid "use the specified DBus bus name"
-msgstr ""
-
-#. Handle possible DependencyDuplicateError that can happen if
-#. someone is using plainbox for job development.
+#: .././checkbox_ng/commands/sru.py:58 .././checkbox_ng/commands/submit.py:121
+msgid "SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:61
+msgid "Canonical hardware identifier"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:65
+msgid "TEST-PLAN-ID"
+msgstr ""
+
+#. TRANSLATORS: this is in imperative form
+#: .././checkbox_ng/commands/sru.py:68
+msgid "load the specified test plan"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:71 .././checkbox_ng/config.py:88
+msgid "Send the data to non-production test server"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:75
+msgid "run check-config before starting"
+msgstr ""
+
 #: .././checkbox_ng/commands/sru.py:88
-msgid "The job database you are currently using is broken"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:89
-#, python-brace-format
-msgid "At least two jobs contend for the name {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:91
-#, python-brace-format
-msgid "Second job defined in: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:112
-msgid "There were some problems with the selected jobs"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:115
-msgid "Problematic jobs will not be considered"
+msgid "Configuration problems prevent running SRU tests"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:113
+msgid "Results saved to {0}"
 msgstr ""
 
 #: .././checkbox_ng/commands/sru.py:118
-#, python-brace-format
-msgid "Saving results to {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:125
-#, python-brace-format
-msgid "Submitting results to {0} for secure_id {1}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:150
-#, python-brace-format
-msgid "Problem reading a file: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:180
-#, python-brace-format
-msgid "comments: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:182
-msgid "inhibitors:"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:220
-msgid "Configuration problems prevent running SRU tests"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:236
+msgid "Sending hardware report to Canonical Certification"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:119
+msgid "Server URL is: {0}"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:131
+msgid "SRU Session"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:172
 msgid "run automated stable release update tests"
 msgstr ""
 
-#: .././checkbox_ng/commands/sru.py:241
-msgid "run check-config before starting"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:249
-msgid "SECURE-ID"
-msgstr ""
-
-#. TRANSLATORS: Do not translate %(default)
-#: .././checkbox_ng/commands/sru.py:254
-#, python-format
-msgid "associate submission with a machine using this SECURE-ID (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:257
-msgid "FILE"
-msgstr ""
-
-#. TRANSLATORS: Do not translate %(default)s
-#: .././checkbox_ng/commands/sru.py:262
-#, python-format
-msgid "if submission fails save the test report as FILE (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:265
+#. TRANSLATORS: please leave various options (both long and short forms),
+#. environment variables and paths in their original form. Also keep the
+#. special @EPILOG@ string. The first line of the translation is special and
+#. is used as the help message. Please keep the pseudo-statement form and
+#. don't finish the sentence with a dot. Pay extra attention to whitespace.
+#. It must be correctly preserved or the result won't work. In particular
+#. the leading whitespace *must* be preserved and *must* have the same
+#. length on each line.
+#: .././checkbox_ng/commands/submit.py:81
+msgid ""
+"\n"
+"    submit test results to the Canonical certification website\n"
+"\n"
+"    This command sends the XML results file to the Certification website.\n"
+"    "
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:98
+msgid "submit test results to the Canonical certification website"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:104
+msgid "The path to the results xml file"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:114
+msgid "must be 15 or 18-character alphanumeric string"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:124
+msgid "associate submission with a machine using this SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:152
 msgid "URL"
 msgstr ""
 
-#. TRANSLATORS: Do not translate %(default)s
-#: .././checkbox_ng/commands/sru.py:269
-#, python-format
-msgid "POST the test report XML to this URL (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:277
-msgid "override --destination to use the staging certification website"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:284
-msgid "don't really run most jobs"
+#: .././checkbox_ng/commands/submit.py:154
+msgid "destination to submit to"
 msgstr ""
 
 #: .././checkbox_ng/config.py:43
@@ -376,13 +312,81 @@
 msgid "Optional whitelist with which to run SRU testing"
 msgstr ""
 
+#: .././checkbox_ng/config.py:82
+msgid "Optional test plan with which to run SRU testing"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:47
+msgid "Application Title"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:51
+msgid "Welcome Message"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:56
+msgid "Pattern that whitelists need to match to be displayed"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:61
+msgid "Pattern that whitelists need to match to be selected"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:67
+msgid "If enabled then suite selection screen is not displayed"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:73
+msgid "If enabled then test selection screen is not displayed"
+msgstr ""
+
+#. TODO: probably a choice validator
+#: .././checkbox_ng/launcher.py:78
+msgid "Type of the input field?"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:82
+msgid "Label on the 'send' button"
+msgstr ""
+
+#. TODO: default?
+#: .././checkbox_ng/launcher.py:88
+msgid "If enabled then test results will be also sent to HEXR"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:93
+msgid "Where to submit the test results to"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:98
+msgid ""
+"HTTP endpoint to submit data to, using the transport specified with "
+"submit_to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:104
+msgid "Secure ID to identify the system this submission belongs to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:109
+msgid "Name of custom configuration file"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:113
+msgid "Don't suppress the output of certain job plugin types."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:116
+msgid "Section with only exported unit ids as keys (no values)"
+msgstr ""
+
 #: .././checkbox_ng/launchpad.py:66
-#, python-brace-format
 msgid "Cannot get {0} resource job"
 msgstr ""
 
 #: .././checkbox_ng/launchpad.py:70
-#, python-brace-format
 msgid "{0} has no attribute {1}"
 msgstr ""
 
@@ -403,180 +407,22 @@
 msgid "The submission was uploaded to Launchpad successfully"
 msgstr ""
 
-#: .././checkbox_ng/service.py:37
-msgid "DBus parts require 'funcsigs' from pypi."
-msgstr ""
-
-#: .././checkbox_ng/service.py:86
-#, python-format
-msgid "Created DBus wrapper %s for: %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:90
-#, python-format
-msgid "DBus wrapper %s died"
-msgstr ""
-
-#: .././checkbox_ng/service.py:122
-#, python-format
-msgid "Published DBus wrapper for %r as %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:169 .././checkbox_ng/service.py:180
-#, python-brace-format
-msgid "object path {0} does not designate an existing object"
-msgstr ""
-
-#: .././checkbox_ng/service.py:188
-#, python-format
-msgid ""
-"Application error: %r should have returned native object but returned "
-"wrapper instead"
-msgstr ""
-
-#: .././checkbox_ng/service.py:195 .././checkbox_ng/service.py:206
-#: .././checkbox_ng/service.py:217
-#, python-brace-format
-msgid "({0}) internal error, unable to lookup object wrapper"
-msgstr ""
-
-#: .././checkbox_ng/service.py:224
-#, python-format
-msgid "wrapped %s called with %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:240 .././checkbox_ng/service.py:256
-msgid "unsupported translation {!r}"
-msgstr ""
-
-#: .././checkbox_ng/service.py:243
-#, python-format
-msgid "unwrapped %s called with %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:245
-#, python-format
-msgid "unwrapped %s returned %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:258
-#, python-format
-msgid "wrapped %s returned  %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:769
-#, python-format
-msgid "Adding result %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:788
-#, python-format
-msgid "Removing result %r from DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:811
-#, python-format
-msgid "Adding job %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:843
-#, python-format
-msgid "Adding job state %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:875
-#, python-brace-format
-msgid "Unable to wrap object of type {0}"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1000
-msgid "Remove() completed"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1075
-#, python-format
-msgid "AskForOutcome(%r) suggested outcome is (%s)"
-msgstr ""
-
-#. NOTE: this should:
-#. 1) attempt to cancel the future in the extremely rare case where it
-#. is not started yet
-#. 2) kill the job otherwise
-#: .././checkbox_ng/service.py:1391
-msgid "Kill() is not implemented"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1411
-msgid "RunCommand() should not be called for automated jobs"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1413
-msgid "RunCommand() is starting to run the job"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1417
-msgid "RunCommand() ignored, waiting for command to finish"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1435
-msgid "SetOutcome() called while the command is still running!"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1442
-msgid "SetOutcome() called before RunCommand()"
-msgstr ""
-
-#. TRANSLATORS: don't translate 'manual' translate it as
-#. 'of type manual' and leave the 'manual' string
-#. intact.
-#: .././checkbox_ng/service.py:1447
-#, python-format
-msgid "But the job is not manual, it is %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1480
-msgid "outcome_from_command() called too early!"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1481
-msgid "There is nothing to return yet"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1522
-msgid "Sending ShowInteractiveUI() and not starting the job..."
-msgstr ""
-
-#: .././checkbox_ng/service.py:1526
-#, python-format
-msgid "Running %r right away"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1563
-#, python-format
-msgid "calling JobResultAvailable(%r, %r)"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1570
-msgid ""
-"sending AskForOutcome() after job finished running with OUTCOME_UNDECIDED"
-msgstr ""
-
 #: .././checkbox_ng/ui.py:73
 msgid "< Continue >"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:191 .././checkbox_ng/ui.py:318
+#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
 msgid "Enter"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
+#: .././checkbox_ng/ui.py:197 .././checkbox_ng/ui.py:324
 msgid ": Expand/Collapse"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:210
+#: .././checkbox_ng/ui.py:213
 msgid "Start "
 msgstr ""
 
-#: .././checkbox_ng/ui.py:342
+#: .././checkbox_ng/ui.py:345
 msgid "inish"
 msgstr ""
 
=== modified file 'checkbox-ng/po/es.po'
--- checkbox-ng/po/es.po	2015-09-15 05:10:23 +0000
+++ checkbox-ng/po/es.po	2016-01-05 21:24:37 +0000
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2015-05-19 13:10+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-23 18:53+0800\n"
 "PO-Revision-Date: 2015-04-05 09:48+0000\n"
 "Last-Translator: Adolfo Jayme <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:10+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-12-26 05:07+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
+"Language: es\n"
 
 #: .././checkbox_ng/certification.py:135
 msgid "Secure ID not specified"
@@ -37,312 +38,247 @@
 msgstr ""
 
 #: .././checkbox_ng/certification.py:164 .././checkbox_ng/launchpad.py:183
-#, python-brace-format
 msgid "Request to {0} timed out: {1}"
 msgstr "Se agotó el tiempo de espera de conexión con {0}: {1}"
 
 #: .././checkbox_ng/certification.py:167 .././checkbox_ng/launchpad.py:186
-#, python-brace-format
 msgid "Invalid destination URL: {0}"
 msgstr "URL de destino no válido: {0}"
 
 #: .././checkbox_ng/certification.py:170 .././checkbox_ng/launchpad.py:189
-#, python-brace-format
 msgid "Unable to connect to {0}: {1}"
 msgstr "No se pudo conectar con {0}: {1}"
 
-#: .././checkbox_ng/certification.py:188
+#: .././checkbox_ng/certification.py:189
 msgid "secure_id must be 15 or 18-character alphanumeric string"
 msgstr ""
 
-#: .././checkbox_ng/commands/cli.py:76
+#: .././checkbox_ng/commands/cli.py:70
 msgid "run check-config"
 msgstr ""
 
-#: .././checkbox_ng/commands/cli.py:77
+#: .././checkbox_ng/commands/cli.py:71
+#: .././checkbox_ng/commands/launcher.py:108
 msgid "user interface options"
 msgstr "opciones de interfaz de usuario"
 
-#: .././checkbox_ng/commands/cli.py:83
+#: .././checkbox_ng/commands/cli.py:77
+#: .././checkbox_ng/commands/launcher.py:111
 msgid "skip tests that require interactivity"
 msgstr ""
 
-#: .././checkbox_ng/commands/cli.py:86
+#: .././checkbox_ng/commands/cli.py:80
 msgid "don't suppress the output of certain job plugin types"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:121
-#: .././checkbox_ng/commands/newcli.py:132
+#: .././checkbox_ng/commands/launcher.py:64
+#, python-format
+msgid "Unable to load launcher definition: %s"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:69
+msgid "Unable to start launcher because of errors:"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:102
+msgid "LAUNCHER"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:103
+msgid "launcher definition file to use"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:119
+#: .././checkbox_ng/commands/newcli.py:130
 #, python-format
 msgid "Incorrect pattern %r: %s"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:149
+#: .././checkbox_ng/commands/newcli.py:147
 #, python-format
 msgid "There is no test plan: %s"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:235
+#: .././checkbox_ng/commands/newcli.py:236
 #, python-format
 msgid "Selected testplans: %r"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:258
+#: .././checkbox_ng/commands/newcli.py:259
 msgid "Suite selection"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:261
+#: .././checkbox_ng/commands/newcli.py:262
 msgid "No testplan selected, aborting"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:299
+#: .././checkbox_ng/commands/newcli.py:291
 msgid "Selecting Job Generators"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:318
+#: .././checkbox_ng/commands/newcli.py:310
 msgid "Selecting Jobs For Execution"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:325
+#: .././checkbox_ng/commands/newcli.py:317
 msgid "Choose tests to run on your system:"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:337
+#: .././checkbox_ng/commands/newcli.py:329
 msgid "Results"
 msgstr "Resultados"
 
-#: .././checkbox_ng/commands/newcli.py:379
-msgid "Saving submission file to {}"
-msgstr ""
-
-#. FIXME: replacing extension is ugly
-#: .././checkbox_ng/commands/newcli.py:381
-#: .././checkbox_ng/commands/newcli.py:384
+#: .././checkbox_ng/commands/newcli.py:368
 msgid "View results"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:412
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:397
 msgid ""
 "\n"
 "Submit results to {0}?"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:415
+#: .././checkbox_ng/commands/newcli.py:400
 msgid "Secure ID: "
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:418
+#: .././checkbox_ng/commands/newcli.py:403
 msgid "ERROR: Secure ID must be 15 or 18-character alphanumeric string"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:436
+#: .././checkbox_ng/commands/newcli.py:421
 msgid ""
 "\n"
 "Submit results to launchpad.net/+hwdb?"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:438
+#: .././checkbox_ng/commands/newcli.py:423
 msgid "Email address: "
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format markers.
-#: .././checkbox_ng/commands/newcli.py:454
-#, python-brace-format
-msgid "Submitting results to {0} for email_address {1})"
+#: .././checkbox_ng/commands/newcli.py:439
+msgid "Submitting results to {0} for email_address {1}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:465
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:450
 msgid "Submission uploaded to: {0}"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:471
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:456
 msgid "Bad response from {0} transport"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format markers.
-#: .././checkbox_ng/commands/newcli.py:479
-#, python-brace-format
-msgid "Submitting results to {0} for secure_id {1})"
+#: .././checkbox_ng/commands/newcli.py:464
+msgid "Submitting results to {0} for secure_id {1}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:500
-#: .././checkbox_ng/commands/sru.py:142
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:485
+#: .././checkbox_ng/commands/submit.py:64
 msgid "Successfully sent, submission status at {0}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:504
-#: .././checkbox_ng/commands/sru.py:145
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:489
+#: .././checkbox_ng/commands/submit.py:68
 msgid "Successfully sent, server response: {0}"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:525
+#: .././checkbox_ng/commands/newcli.py:514
 msgid "Select jobs to re-run"
 msgstr ""
 
-#: .././checkbox_ng/commands/service.py:79
-msgid "Setting up DBus objects..."
-msgstr ""
-
-#. TODO: load sessions
-#: .././checkbox_ng/commands/service.py:81
-msgid "Constructing Service object"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:83
-msgid "Constructing ServiceWrapper"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:85
-msgid "Publishing all objects on DBus"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:88
-msgid "Publishing all managed objects (events should fire there)"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:90
-#, python-format
-msgid "Attempting to claim bus name: %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:93
-#, python-format
-msgid "PlainBox DBus service ready, claimed name: %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:99
-msgid ""
-"Main loop interrupted! It is recommended to call the Exit() method on the "
-"exported service object instead"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:103
-#, python-format
-msgid "Releasing %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:108
-#, python-format
-msgid "Closing %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:110
-msgid "Main loop terminated, exiting..."
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:122
-msgid "spawn dbus service"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:129
-msgid "use the specified DBus bus name"
-msgstr ""
-
-#. Handle possible DependencyDuplicateError that can happen if
-#. someone is using plainbox for job development.
+#: .././checkbox_ng/commands/sru.py:58 .././checkbox_ng/commands/submit.py:121
+msgid "SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:61
+msgid "Canonical hardware identifier"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:65
+msgid "TEST-PLAN-ID"
+msgstr ""
+
+#. TRANSLATORS: this is in imperative form
+#: .././checkbox_ng/commands/sru.py:68
+msgid "load the specified test plan"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:71 .././checkbox_ng/config.py:88
+msgid "Send the data to non-production test server"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:75
+msgid "run check-config before starting"
+msgstr ""
+
 #: .././checkbox_ng/commands/sru.py:88
-msgid "The job database you are currently using is broken"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:89
-#, python-brace-format
-msgid "At least two jobs contend for the name {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:91
-#, python-brace-format
-msgid "Second job defined in: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:112
-msgid "There were some problems with the selected jobs"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:115
-msgid "Problematic jobs will not be considered"
+msgid "Configuration problems prevent running SRU tests"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:113
+msgid "Results saved to {0}"
 msgstr ""
 
 #: .././checkbox_ng/commands/sru.py:118
-#, python-brace-format
-msgid "Saving results to {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:125
-#, python-brace-format
-msgid "Submitting results to {0} for secure_id {1}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:150
-#, python-brace-format
-msgid "Problem reading a file: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:180
-#, python-brace-format
-msgid "comments: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:182
-msgid "inhibitors:"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:220
-msgid "Configuration problems prevent running SRU tests"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:236
+msgid "Sending hardware report to Canonical Certification"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:119
+msgid "Server URL is: {0}"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:131
+msgid "SRU Session"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:172
 msgid "run automated stable release update tests"
 msgstr ""
 
-#: .././checkbox_ng/commands/sru.py:241
-msgid "run check-config before starting"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:249
-msgid "SECURE-ID"
-msgstr ""
-
-#. TRANSLATORS: Do not translate %(default)
-#: .././checkbox_ng/commands/sru.py:254
-#, python-format
+#. TRANSLATORS: please leave various options (both long and short forms),
+#. environment variables and paths in their original form. Also keep the
+#. special @EPILOG@ string. The first line of the translation is special and
+#. is used as the help message. Please keep the pseudo-statement form and
+#. don't finish the sentence with a dot. Pay extra attention to whitespace.
+#. It must be correctly preserved or the result won't work. In particular
+#. the leading whitespace *must* be preserved and *must* have the same
+#. length on each line.
+#: .././checkbox_ng/commands/submit.py:81
 msgid ""
-"associate submission with a machine using this SECURE-ID (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:257
-msgid "FILE"
-msgstr ""
-
-#. TRANSLATORS: Do not translate %(default)s
-#: .././checkbox_ng/commands/sru.py:262
-#, python-format
-msgid "if submission fails save the test report as FILE (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:265
+"\n"
+"    submit test results to the Canonical certification website\n"
+"\n"
+"    This command sends the XML results file to the Certification website.\n"
+"    "
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:98
+msgid "submit test results to the Canonical certification website"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:104
+msgid "The path to the results xml file"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:114
+msgid "must be 15 or 18-character alphanumeric string"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:124
+msgid "associate submission with a machine using this SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:152
 msgid "URL"
 msgstr ""
 
-#. TRANSLATORS: Do not translate %(default)s
-#: .././checkbox_ng/commands/sru.py:269
-#, python-format
-msgid "POST the test report XML to this URL (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:277
-msgid "override --destination to use the staging certification website"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:284
-msgid "don't really run most jobs"
+#: .././checkbox_ng/commands/submit.py:154
+msgid "destination to submit to"
 msgstr ""
 
 #: .././checkbox_ng/config.py:43
@@ -377,13 +313,81 @@
 msgid "Optional whitelist with which to run SRU testing"
 msgstr ""
 
+#: .././checkbox_ng/config.py:82
+msgid "Optional test plan with which to run SRU testing"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:47
+msgid "Application Title"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:51
+msgid "Welcome Message"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:56
+msgid "Pattern that whitelists need to match to be displayed"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:61
+msgid "Pattern that whitelists need to match to be selected"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:67
+msgid "If enabled then suite selection screen is not displayed"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:73
+msgid "If enabled then test selection screen is not displayed"
+msgstr ""
+
+#. TODO: probably a choice validator
+#: .././checkbox_ng/launcher.py:78
+msgid "Type of the input field?"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:82
+msgid "Label on the 'send' button"
+msgstr ""
+
+#. TODO: default?
+#: .././checkbox_ng/launcher.py:88
+msgid "If enabled then test results will be also sent to HEXR"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:93
+msgid "Where to submit the test results to"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:98
+msgid ""
+"HTTP endpoint to submit data to, using the transport specified with "
+"submit_to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:104
+msgid "Secure ID to identify the system this submission belongs to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:109
+msgid "Name of custom configuration file"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:113
+msgid "Don't suppress the output of certain job plugin types."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:116
+msgid "Section with only exported unit ids as keys (no values)"
+msgstr ""
+
 #: .././checkbox_ng/launchpad.py:66
-#, python-brace-format
 msgid "Cannot get {0} resource job"
 msgstr ""
 
 #: .././checkbox_ng/launchpad.py:70
-#, python-brace-format
 msgid "{0} has no attribute {1}"
 msgstr ""
 
@@ -404,180 +408,22 @@
 msgid "The submission was uploaded to Launchpad successfully"
 msgstr ""
 
-#: .././checkbox_ng/service.py:37
-msgid "DBus parts require 'funcsigs' from pypi."
-msgstr ""
-
-#: .././checkbox_ng/service.py:86
-#, python-format
-msgid "Created DBus wrapper %s for: %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:90
-#, python-format
-msgid "DBus wrapper %s died"
-msgstr ""
-
-#: .././checkbox_ng/service.py:122
-#, python-format
-msgid "Published DBus wrapper for %r as %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:169 .././checkbox_ng/service.py:180
-#, python-brace-format
-msgid "object path {0} does not designate an existing object"
-msgstr ""
-
-#: .././checkbox_ng/service.py:188
-#, python-format
-msgid ""
-"Application error: %r should have returned native object but returned "
-"wrapper instead"
-msgstr ""
-
-#: .././checkbox_ng/service.py:195 .././checkbox_ng/service.py:206
-#: .././checkbox_ng/service.py:217
-#, python-brace-format
-msgid "({0}) internal error, unable to lookup object wrapper"
-msgstr ""
-
-#: .././checkbox_ng/service.py:224
-#, python-format
-msgid "wrapped %s called with %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:240 .././checkbox_ng/service.py:256
-msgid "unsupported translation {!r}"
-msgstr ""
-
-#: .././checkbox_ng/service.py:243
-#, python-format
-msgid "unwrapped %s called with %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:245
-#, python-format
-msgid "unwrapped %s returned %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:258
-#, python-format
-msgid "wrapped %s returned  %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:769
-#, python-format
-msgid "Adding result %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:788
-#, python-format
-msgid "Removing result %r from DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:811
-#, python-format
-msgid "Adding job %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:843
-#, python-format
-msgid "Adding job state %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:875
-#, python-brace-format
-msgid "Unable to wrap object of type {0}"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1000
-msgid "Remove() completed"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1075
-#, python-format
-msgid "AskForOutcome(%r) suggested outcome is (%s)"
-msgstr ""
-
-#. NOTE: this should:
-#. 1) attempt to cancel the future in the extremely rare case where it
-#. is not started yet
-#. 2) kill the job otherwise
-#: .././checkbox_ng/service.py:1391
-msgid "Kill() is not implemented"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1411
-msgid "RunCommand() should not be called for automated jobs"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1413
-msgid "RunCommand() is starting to run the job"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1417
-msgid "RunCommand() ignored, waiting for command to finish"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1435
-msgid "SetOutcome() called while the command is still running!"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1442
-msgid "SetOutcome() called before RunCommand()"
-msgstr ""
-
-#. TRANSLATORS: don't translate 'manual' translate it as
-#. 'of type manual' and leave the 'manual' string
-#. intact.
-#: .././checkbox_ng/service.py:1447
-#, python-format
-msgid "But the job is not manual, it is %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1480
-msgid "outcome_from_command() called too early!"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1481
-msgid "There is nothing to return yet"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1522
-msgid "Sending ShowInteractiveUI() and not starting the job..."
-msgstr ""
-
-#: .././checkbox_ng/service.py:1526
-#, python-format
-msgid "Running %r right away"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1563
-#, python-format
-msgid "calling JobResultAvailable(%r, %r)"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1570
-msgid ""
-"sending AskForOutcome() after job finished running with OUTCOME_UNDECIDED"
-msgstr ""
-
 #: .././checkbox_ng/ui.py:73
 msgid "< Continue >"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:191 .././checkbox_ng/ui.py:318
+#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
 msgid "Enter"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
+#: .././checkbox_ng/ui.py:197 .././checkbox_ng/ui.py:324
 msgid ": Expand/Collapse"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:210
+#: .././checkbox_ng/ui.py:213
 msgid "Start "
 msgstr ""
 
-#: .././checkbox_ng/ui.py:342
+#: .././checkbox_ng/ui.py:345
 msgid "inish"
 msgstr ""
 
=== modified file 'checkbox-ng/po/pl.po'
--- checkbox-ng/po/pl.po	2015-09-15 05:10:23 +0000
+++ checkbox-ng/po/pl.po	2016-01-05 21:24:37 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: checkbox-ng 0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-19 13:10+0800\n"
+"POT-Creation-Date: 2015-12-23 18:53+0800\n"
 "PO-Revision-Date: 2014-04-17 06:45+0000\n"
 "Last-Translator: Zygmunt Krynicki <[e-mail]>\n"
 "Language-Team: polski <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2015-09-15 05:10+0000\n"
-"X-Generator: Launchpad (build 17737)\n"
+"X-Launchpad-Export-Date: 2015-12-26 05:07+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
 "Language: Polish\n"
 
 #: .././checkbox_ng/certification.py:135
@@ -38,314 +38,248 @@
 msgstr ""
 
 #: .././checkbox_ng/certification.py:164 .././checkbox_ng/launchpad.py:183
-#, python-brace-format
 msgid "Request to {0} timed out: {1}"
 msgstr "Żądanie do {0} przekroczyło czas oczekiwania: {1}"
 
 #: .././checkbox_ng/certification.py:167 .././checkbox_ng/launchpad.py:186
-#, python-brace-format
 msgid "Invalid destination URL: {0}"
 msgstr "Niewłaściwy docelowy URL: {0}"
 
 #: .././checkbox_ng/certification.py:170 .././checkbox_ng/launchpad.py:189
-#, python-brace-format
 msgid "Unable to connect to {0}: {1}"
 msgstr "Nie można połączyć się z {0}: {1}"
 
-#: .././checkbox_ng/certification.py:188
+#: .././checkbox_ng/certification.py:189
 msgid "secure_id must be 15 or 18-character alphanumeric string"
 msgstr "secure_id musi mieć od 15 do 18 znaków alfanumerycznych"
 
-#: .././checkbox_ng/commands/cli.py:76
+#: .././checkbox_ng/commands/cli.py:70
 msgid "run check-config"
 msgstr ""
 
+#: .././checkbox_ng/commands/cli.py:71
+#: .././checkbox_ng/commands/launcher.py:108
+msgid "user interface options"
+msgstr ""
+
 #: .././checkbox_ng/commands/cli.py:77
-msgid "user interface options"
-msgstr ""
-
-#: .././checkbox_ng/commands/cli.py:83
+#: .././checkbox_ng/commands/launcher.py:111
 msgid "skip tests that require interactivity"
 msgstr "pomiń testy wymagające interaktywności"
 
-#: .././checkbox_ng/commands/cli.py:86
+#: .././checkbox_ng/commands/cli.py:80
 msgid "don't suppress the output of certain job plugin types"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:121
-#: .././checkbox_ng/commands/newcli.py:132
+#: .././checkbox_ng/commands/launcher.py:64
+#, python-format
+msgid "Unable to load launcher definition: %s"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:69
+msgid "Unable to start launcher because of errors:"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:102
+msgid "LAUNCHER"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:103
+msgid "launcher definition file to use"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:119
+#: .././checkbox_ng/commands/newcli.py:130
 #, python-format
 msgid "Incorrect pattern %r: %s"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:149
+#: .././checkbox_ng/commands/newcli.py:147
 #, python-format
 msgid "There is no test plan: %s"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:235
+#: .././checkbox_ng/commands/newcli.py:236
 #, python-format
 msgid "Selected testplans: %r"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:258
+#: .././checkbox_ng/commands/newcli.py:259
 msgid "Suite selection"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:261
+#: .././checkbox_ng/commands/newcli.py:262
 msgid "No testplan selected, aborting"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:299
+#: .././checkbox_ng/commands/newcli.py:291
 msgid "Selecting Job Generators"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:318
+#: .././checkbox_ng/commands/newcli.py:310
 msgid "Selecting Jobs For Execution"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:325
+#: .././checkbox_ng/commands/newcli.py:317
 msgid "Choose tests to run on your system:"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:337
+#: .././checkbox_ng/commands/newcli.py:329
 msgid "Results"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:379
-msgid "Saving submission file to {}"
-msgstr "Zapisywanie pliku zgłoszenia do {}"
-
-#. FIXME: replacing extension is ugly
-#: .././checkbox_ng/commands/newcli.py:381
-#: .././checkbox_ng/commands/newcli.py:384
+#: .././checkbox_ng/commands/newcli.py:368
 msgid "View results"
 msgstr "Zobacz wyniki"
 
-#: .././checkbox_ng/commands/newcli.py:412
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:397
 msgid ""
 "\n"
 "Submit results to {0}?"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:415
+#: .././checkbox_ng/commands/newcli.py:400
 msgid "Secure ID: "
 msgstr "Bezpieczny identyfikator: "
 
-#: .././checkbox_ng/commands/newcli.py:418
+#: .././checkbox_ng/commands/newcli.py:403
 msgid "ERROR: Secure ID must be 15 or 18-character alphanumeric string"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:436
+#: .././checkbox_ng/commands/newcli.py:421
 msgid ""
 "\n"
 "Submit results to launchpad.net/+hwdb?"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:438
+#: .././checkbox_ng/commands/newcli.py:423
 msgid "Email address: "
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format markers.
-#: .././checkbox_ng/commands/newcli.py:454
-#, python-brace-format
-msgid "Submitting results to {0} for email_address {1})"
+#: .././checkbox_ng/commands/newcli.py:439
+msgid "Submitting results to {0} for email_address {1}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:465
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:450
 msgid "Submission uploaded to: {0}"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:471
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:456
 msgid "Bad response from {0} transport"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format markers.
-#: .././checkbox_ng/commands/newcli.py:479
-#, python-brace-format
-msgid "Submitting results to {0} for secure_id {1})"
+#: .././checkbox_ng/commands/newcli.py:464
+msgid "Submitting results to {0} for secure_id {1}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:500
-#: .././checkbox_ng/commands/sru.py:142
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:485
+#: .././checkbox_ng/commands/submit.py:64
 msgid "Successfully sent, submission status at {0}"
 msgstr ""
 
 #. TRANSLATORS: Do not translate the {} format marker.
-#: .././checkbox_ng/commands/newcli.py:504
-#: .././checkbox_ng/commands/sru.py:145
-#, python-brace-format
+#: .././checkbox_ng/commands/newcli.py:489
+#: .././checkbox_ng/commands/submit.py:68
 msgid "Successfully sent, server response: {0}"
 msgstr ""
 
-#: .././checkbox_ng/commands/newcli.py:525
+#: .././checkbox_ng/commands/newcli.py:514
 msgid "Select jobs to re-run"
 msgstr ""
 
-#: .././checkbox_ng/commands/service.py:79
-msgid "Setting up DBus objects..."
-msgstr ""
-
-#. TODO: load sessions
-#: .././checkbox_ng/commands/service.py:81
-msgid "Constructing Service object"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:83
-msgid "Constructing ServiceWrapper"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:85
-msgid "Publishing all objects on DBus"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:88
-msgid "Publishing all managed objects (events should fire there)"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:90
-#, python-format
-msgid "Attempting to claim bus name: %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:93
-#, python-format
-msgid "PlainBox DBus service ready, claimed name: %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:99
-msgid ""
-"Main loop interrupted! It is recommended to call the Exit() method on the "
-"exported service object instead"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:103
-#, python-format
-msgid "Releasing %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:108
-#, python-format
-msgid "Closing %s"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:110
-msgid "Main loop terminated, exiting..."
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:122
-msgid "spawn dbus service"
-msgstr ""
-
-#: .././checkbox_ng/commands/service.py:129
-msgid "use the specified DBus bus name"
-msgstr ""
-
-#. Handle possible DependencyDuplicateError that can happen if
-#. someone is using plainbox for job development.
+#: .././checkbox_ng/commands/sru.py:58 .././checkbox_ng/commands/submit.py:121
+msgid "SECURE-ID"
+msgstr "BEZPIECZNE-ID"
+
+#: .././checkbox_ng/commands/sru.py:61
+msgid "Canonical hardware identifier"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:65
+msgid "TEST-PLAN-ID"
+msgstr ""
+
+#. TRANSLATORS: this is in imperative form
+#: .././checkbox_ng/commands/sru.py:68
+msgid "load the specified test plan"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:71 .././checkbox_ng/config.py:88
+msgid "Send the data to non-production test server"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:75
+msgid "run check-config before starting"
+msgstr ""
+
 #: .././checkbox_ng/commands/sru.py:88
-msgid "The job database you are currently using is broken"
-msgstr ""
-"Baza danych zawierająca zadania testowe której teraz używasz jest popsuta"
-
-#: .././checkbox_ng/commands/sru.py:89
-#, python-brace-format
-msgid "At least two jobs contend for the name {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:91
-#, python-brace-format
-msgid "Second job defined in: {0}"
-msgstr "Drugie zadanie zdefiniowano w: {0}"
-
-#: .././checkbox_ng/commands/sru.py:112
-msgid "There were some problems with the selected jobs"
-msgstr "Wystąpiły problemy z wybranymi zadaniami"
-
-#: .././checkbox_ng/commands/sru.py:115
-msgid "Problematic jobs will not be considered"
-msgstr "Problematyczne zadania nie zostaną wzięte pod uwagę"
+msgid "Configuration problems prevent running SRU tests"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:113
+msgid "Results saved to {0}"
+msgstr ""
 
 #: .././checkbox_ng/commands/sru.py:118
-#, python-brace-format
-msgid "Saving results to {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:125
-#, python-brace-format
-msgid "Submitting results to {0} for secure_id {1}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:150
-#, python-brace-format
-msgid "Problem reading a file: {0}"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:180
-#, python-brace-format
-msgid "comments: {0}"
-msgstr "komentarze: {0}"
-
-#: .././checkbox_ng/commands/sru.py:182
-msgid "inhibitors:"
-msgstr "ograniczniki:"
-
-#: .././checkbox_ng/commands/sru.py:220
-msgid "Configuration problems prevent running SRU tests"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:236
+msgid "Sending hardware report to Canonical Certification"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:119
+msgid "Server URL is: {0}"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:131
+msgid "SRU Session"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:172
 msgid "run automated stable release update tests"
 msgstr "uruchom automatyczne testy aktualizacji wydania stabilnego"
 
-#: .././checkbox_ng/commands/sru.py:241
-msgid "run check-config before starting"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:249
-msgid "SECURE-ID"
-msgstr "BEZPIECZNE-ID"
-
-#. TRANSLATORS: Do not translate %(default)
-#: .././checkbox_ng/commands/sru.py:254
-#, python-format
+#. TRANSLATORS: please leave various options (both long and short forms),
+#. environment variables and paths in their original form. Also keep the
+#. special @EPILOG@ string. The first line of the translation is special and
+#. is used as the help message. Please keep the pseudo-statement form and
+#. don't finish the sentence with a dot. Pay extra attention to whitespace.
+#. It must be correctly preserved or the result won't work. In particular
+#. the leading whitespace *must* be preserved and *must* have the same
+#. length on each line.
+#: .././checkbox_ng/commands/submit.py:81
 msgid ""
-"associate submission with a machine using this SECURE-ID (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:257
-msgid "FILE"
-msgstr "PLIK"
-
-#. TRANSLATORS: Do not translate %(default)s
-#: .././checkbox_ng/commands/sru.py:262
-#, python-format
-msgid "if submission fails save the test report as FILE (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:265
+"\n"
+"    submit test results to the Canonical certification website\n"
+"\n"
+"    This command sends the XML results file to the Certification website.\n"
+"    "
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:98
+msgid "submit test results to the Canonical certification website"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:104
+msgid "The path to the results xml file"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:114
+msgid "must be 15 or 18-character alphanumeric string"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:124
+msgid "associate submission with a machine using this SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:152
 msgid "URL"
 msgstr "URL"
 
-#. TRANSLATORS: Do not translate %(default)s
-#: .././checkbox_ng/commands/sru.py:269
-#, python-format
-msgid "POST the test report XML to this URL (%(default)s)"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:277
-msgid "override --destination to use the staging certification website"
-msgstr ""
-
-#: .././checkbox_ng/commands/sru.py:284
-msgid "don't really run most jobs"
-msgstr "tak na prawdę nie uruchamiaj większości zadań"
+#: .././checkbox_ng/commands/submit.py:154
+msgid "destination to submit to"
+msgstr ""
 
 #: .././checkbox_ng/config.py:43
 msgid "Secure ID of the system"
@@ -379,13 +313,81 @@
 msgid "Optional whitelist with which to run SRU testing"
 msgstr ""
 
+#: .././checkbox_ng/config.py:82
+msgid "Optional test plan with which to run SRU testing"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:47
+msgid "Application Title"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:51
+msgid "Welcome Message"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:56
+msgid "Pattern that whitelists need to match to be displayed"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:61
+msgid "Pattern that whitelists need to match to be selected"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:67
+msgid "If enabled then suite selection screen is not displayed"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:73
+msgid "If enabled then test selection screen is not displayed"
+msgstr ""
+
+#. TODO: probably a choice validator
+#: .././checkbox_ng/launcher.py:78
+msgid "Type of the input field?"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:82
+msgid "Label on the 'send' button"
+msgstr ""
+
+#. TODO: default?
+#: .././checkbox_ng/launcher.py:88
+msgid "If enabled then test results will be also sent to HEXR"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:93
+msgid "Where to submit the test results to"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:98
+msgid ""
+"HTTP endpoint to submit data to, using the transport specified with "
+"submit_to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:104
+msgid "Secure ID to identify the system this submission belongs to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:109
+msgid "Name of custom configuration file"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:113
+msgid "Don't suppress the output of certain job plugin types."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:116
+msgid "Section with only exported unit ids as keys (no values)"
+msgstr ""
+
 #: .././checkbox_ng/launchpad.py:66
-#, python-brace-format
 msgid "Cannot get {0} resource job"
 msgstr "Nie można uzyskać zadania zasobu {0}"
 
 #: .././checkbox_ng/launchpad.py:70
-#, python-brace-format
 msgid "{0} has no attribute {1}"
 msgstr "{0} nie ma atrybutu {1}"
 
@@ -406,180 +408,22 @@
 msgid "The submission was uploaded to Launchpad successfully"
 msgstr ""
 
-#: .././checkbox_ng/service.py:37
-msgid "DBus parts require 'funcsigs' from pypi."
-msgstr ""
-
-#: .././checkbox_ng/service.py:86
-#, python-format
-msgid "Created DBus wrapper %s for: %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:90
-#, python-format
-msgid "DBus wrapper %s died"
-msgstr ""
-
-#: .././checkbox_ng/service.py:122
-#, python-format
-msgid "Published DBus wrapper for %r as %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:169 .././checkbox_ng/service.py:180
-#, python-brace-format
-msgid "object path {0} does not designate an existing object"
-msgstr ""
-
-#: .././checkbox_ng/service.py:188
-#, python-format
-msgid ""
-"Application error: %r should have returned native object but returned "
-"wrapper instead"
-msgstr ""
-
-#: .././checkbox_ng/service.py:195 .././checkbox_ng/service.py:206
-#: .././checkbox_ng/service.py:217
-#, python-brace-format
-msgid "({0}) internal error, unable to lookup object wrapper"
-msgstr ""
-
-#: .././checkbox_ng/service.py:224
-#, python-format
-msgid "wrapped %s called with %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:240 .././checkbox_ng/service.py:256
-msgid "unsupported translation {!r}"
-msgstr ""
-
-#: .././checkbox_ng/service.py:243
-#, python-format
-msgid "unwrapped %s called with %s"
-msgstr ""
-
-#: .././checkbox_ng/service.py:245
-#, python-format
-msgid "unwrapped %s returned %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:258
-#, python-format
-msgid "wrapped %s returned  %r"
-msgstr ""
-
-#: .././checkbox_ng/service.py:769
-#, python-format
-msgid "Adding result %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:788
-#, python-format
-msgid "Removing result %r from DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:811
-#, python-format
-msgid "Adding job %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:843
-#, python-format
-msgid "Adding job state %r to DBus"
-msgstr ""
-
-#: .././checkbox_ng/service.py:875
-#, python-brace-format
-msgid "Unable to wrap object of type {0}"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1000
-msgid "Remove() completed"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1075
-#, python-format
-msgid "AskForOutcome(%r) suggested outcome is (%s)"
-msgstr ""
-
-#. NOTE: this should:
-#. 1) attempt to cancel the future in the extremely rare case where it
-#. is not started yet
-#. 2) kill the job otherwise
-#: .././checkbox_ng/service.py:1391
-msgid "Kill() is not implemented"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1411
-msgid "RunCommand() should not be called for automated jobs"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1413
-msgid "RunCommand() is starting to run the job"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1417
-msgid "RunCommand() ignored, waiting for command to finish"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1435
-msgid "SetOutcome() called while the command is still running!"
-msgstr ""
-
-#: .././checkbox_ng/service.py:1442
-msgid "SetOutcome() called before RunCommand()"
-msgstr "funkcja SetOutcome() wywołana przed RunCommand()"
-
-#. TRANSLATORS: don't translate 'manual' translate it as
-#. 'of type manual' and leave the 'manual' string
-#. intact.
-#: .././checkbox_ng/service.py:1447
-#, python-format
-msgid "But the job is not manual, it is %s"
-msgstr "Lecz zadanie nie jest typu manual, jest typu %s"
-
-#: .././checkbox_ng/service.py:1480
-msgid "outcome_from_command() called too early!"
-msgstr "funkcja outcome_from_command() została wywołana zbyt wcześnie"
-
-#: .././checkbox_ng/service.py:1481
-msgid "There is nothing to return yet"
-msgstr "Nie ma jeszcze nic do zwrócenia"
-
-#: .././checkbox_ng/service.py:1522
-msgid "Sending ShowInteractiveUI() and not starting the job..."
-msgstr "Wysyłanie ShowInteractiveUI() i nie uruchamianie zadania..."
-
-#: .././checkbox_ng/service.py:1526
-#, python-format
-msgid "Running %r right away"
-msgstr "Uruchamianie %r od razu"
-
-#: .././checkbox_ng/service.py:1563
-#, python-format
-msgid "calling JobResultAvailable(%r, %r)"
-msgstr "wywoływanie JobResourceAvailalbe(%r, %r)"
-
-#: .././checkbox_ng/service.py:1570
-msgid ""
-"sending AskForOutcome() after job finished running with OUTCOME_UNDECIDED"
-msgstr ""
-
 #: .././checkbox_ng/ui.py:73
 msgid "< Continue >"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:191 .././checkbox_ng/ui.py:318
+#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
 msgid "Enter"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
+#: .././checkbox_ng/ui.py:197 .././checkbox_ng/ui.py:324
 msgid ": Expand/Collapse"
 msgstr ""
 
-#: .././checkbox_ng/ui.py:210
+#: .././checkbox_ng/ui.py:213
 msgid "Start "
 msgstr ""
 
-#: .././checkbox_ng/ui.py:342
+#: .././checkbox_ng/ui.py:345
 msgid "inish"
 msgstr ""
 
=== added file 'checkbox-ng/po/zh_TW.po'
--- checkbox-ng/po/zh_TW.po	1970-01-01 00:00:00 +0000
+++ checkbox-ng/po/zh_TW.po	2016-01-05 21:24:37 +0000
@@ -0,0 +1,433 @@
+# Chinese (Traditional) translation for checkbox
+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
+# This file is distributed under the same license as the checkbox package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: checkbox\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-12-23 18:53+0800\n"
+"PO-Revision-Date: 2015-12-23 03:46+0000\n"
+"Last-Translator: Po-Hsu Lin <[e-mail]>\n"
+"Language-Team: Chinese (Traditional) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2015-12-26 05:07+0000\n"
+"X-Generator: Launchpad (build 17865)\n"
+"Language: \n"
+
+#: .././checkbox_ng/certification.py:135
+msgid "Secure ID not specified"
+msgstr ""
+
+#: .././checkbox_ng/certification.py:138
+#, python-format
+msgid "Sending to %s, hardware id is %s"
+msgstr ""
+
+#: .././checkbox_ng/certification.py:144
+#, python-format
+msgid "submit_to_hexr set to %s by config"
+msgstr ""
+
+#: .././checkbox_ng/certification.py:148
+#, python-format
+msgid "submit_to_hexr set to %s by UI"
+msgstr ""
+
+#: .././checkbox_ng/certification.py:164 .././checkbox_ng/launchpad.py:183
+msgid "Request to {0} timed out: {1}"
+msgstr "至 {0} 的要求逾時：{1}"
+
+#: .././checkbox_ng/certification.py:167 .././checkbox_ng/launchpad.py:186
+msgid "Invalid destination URL: {0}"
+msgstr "無效的目標網址：{0}"
+
+#: .././checkbox_ng/certification.py:170 .././checkbox_ng/launchpad.py:189
+msgid "Unable to connect to {0}: {1}"
+msgstr "無法連線至 {0}: {1}"
+
+#: .././checkbox_ng/certification.py:189
+msgid "secure_id must be 15 or 18-character alphanumeric string"
+msgstr ""
+
+#: .././checkbox_ng/commands/cli.py:70
+msgid "run check-config"
+msgstr "執行 check-config"
+
+#: .././checkbox_ng/commands/cli.py:71
+#: .././checkbox_ng/commands/launcher.py:108
+msgid "user interface options"
+msgstr "使用者介面選項"
+
+#: .././checkbox_ng/commands/cli.py:77
+#: .././checkbox_ng/commands/launcher.py:111
+msgid "skip tests that require interactivity"
+msgstr ""
+
+#: .././checkbox_ng/commands/cli.py:80
+msgid "don't suppress the output of certain job plugin types"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:64
+#, python-format
+msgid "Unable to load launcher definition: %s"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:69
+msgid "Unable to start launcher because of errors:"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:102
+msgid "LAUNCHER"
+msgstr ""
+
+#: .././checkbox_ng/commands/launcher.py:103
+msgid "launcher definition file to use"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:119
+#: .././checkbox_ng/commands/newcli.py:130
+#, python-format
+msgid "Incorrect pattern %r: %s"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:147
+#, python-format
+msgid "There is no test plan: %s"
+msgstr "無此測試計畫：%s"
+
+#: .././checkbox_ng/commands/newcli.py:236
+#, python-format
+msgid "Selected testplans: %r"
+msgstr "已選擇的測試計畫：%r"
+
+#: .././checkbox_ng/commands/newcli.py:259
+msgid "Suite selection"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:262
+msgid "No testplan selected, aborting"
+msgstr "沒有選擇任何測試計畫，程式中止"
+
+#: .././checkbox_ng/commands/newcli.py:291
+msgid "Selecting Job Generators"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:310
+msgid "Selecting Jobs For Execution"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:317
+msgid "Choose tests to run on your system:"
+msgstr "選擇要在您的系統上執行的測試項目："
+
+#: .././checkbox_ng/commands/newcli.py:329
+msgid "Results"
+msgstr "結果"
+
+#: .././checkbox_ng/commands/newcli.py:368
+msgid "View results"
+msgstr "查看結果"
+
+#: .././checkbox_ng/commands/newcli.py:397
+msgid ""
+"\n"
+"Submit results to {0}?"
+msgstr ""
+"\n"
+"傳送結果至 {0}？"
+
+#: .././checkbox_ng/commands/newcli.py:400
+msgid "Secure ID: "
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:403
+msgid "ERROR: Secure ID must be 15 or 18-character alphanumeric string"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:421
+msgid ""
+"\n"
+"Submit results to launchpad.net/+hwdb?"
+msgstr ""
+"\n"
+"傳送結果至 launchpad.net/+hwdb?"
+
+#: .././checkbox_ng/commands/newcli.py:423
+msgid "Email address: "
+msgstr "電子郵件地址： "
+
+#. TRANSLATORS: Do not translate the {} format markers.
+#: .././checkbox_ng/commands/newcli.py:439
+msgid "Submitting results to {0} for email_address {1}"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the {} format marker.
+#: .././checkbox_ng/commands/newcli.py:450
+msgid "Submission uploaded to: {0}"
+msgstr ""
+
+#: .././checkbox_ng/commands/newcli.py:456
+msgid "Bad response from {0} transport"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the {} format markers.
+#: .././checkbox_ng/commands/newcli.py:464
+msgid "Submitting results to {0} for secure_id {1}"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the {} format marker.
+#: .././checkbox_ng/commands/newcli.py:485
+#: .././checkbox_ng/commands/submit.py:64
+msgid "Successfully sent, submission status at {0}"
+msgstr ""
+
+#. TRANSLATORS: Do not translate the {} format marker.
+#: .././checkbox_ng/commands/newcli.py:489
+#: .././checkbox_ng/commands/submit.py:68
+msgid "Successfully sent, server response: {0}"
+msgstr "傳送成功，伺服器回應：{0}"
+
+#: .././checkbox_ng/commands/newcli.py:514
+msgid "Select jobs to re-run"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:58 .././checkbox_ng/commands/submit.py:121
+msgid "SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:61
+msgid "Canonical hardware identifier"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:65
+msgid "TEST-PLAN-ID"
+msgstr ""
+
+#. TRANSLATORS: this is in imperative form
+#: .././checkbox_ng/commands/sru.py:68
+msgid "load the specified test plan"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:71 .././checkbox_ng/config.py:88
+msgid "Send the data to non-production test server"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:75
+msgid "run check-config before starting"
+msgstr "開始前執行 check-config"
+
+#: .././checkbox_ng/commands/sru.py:88
+msgid "Configuration problems prevent running SRU tests"
+msgstr "設定問題導致無法進行 SRU 測試"
+
+#: .././checkbox_ng/commands/sru.py:113
+msgid "Results saved to {0}"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:118
+msgid "Sending hardware report to Canonical Certification"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:119
+msgid "Server URL is: {0}"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:131
+msgid "SRU Session"
+msgstr ""
+
+#: .././checkbox_ng/commands/sru.py:172
+msgid "run automated stable release update tests"
+msgstr "執行自動化穩定發行版更新測試"
+
+#. TRANSLATORS: please leave various options (both long and short forms),
+#. environment variables and paths in their original form. Also keep the
+#. special @EPILOG@ string. The first line of the translation is special and
+#. is used as the help message. Please keep the pseudo-statement form and
+#. don't finish the sentence with a dot. Pay extra attention to whitespace.
+#. It must be correctly preserved or the result won't work. In particular
+#. the leading whitespace *must* be preserved and *must* have the same
+#. length on each line.
+#: .././checkbox_ng/commands/submit.py:81
+msgid ""
+"\n"
+"    submit test results to the Canonical certification website\n"
+"\n"
+"    This command sends the XML results file to the Certification website.\n"
+"    "
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:98
+msgid "submit test results to the Canonical certification website"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:104
+msgid "The path to the results xml file"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:114
+msgid "must be 15 or 18-character alphanumeric string"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:124
+msgid "associate submission with a machine using this SECURE-ID"
+msgstr ""
+
+#: .././checkbox_ng/commands/submit.py:152
+msgid "URL"
+msgstr "網址"
+
+#: .././checkbox_ng/commands/submit.py:154
+msgid "destination to submit to"
+msgstr ""
+
+#: .././checkbox_ng/config.py:43
+msgid "Secure ID of the system"
+msgstr ""
+
+#: .././checkbox_ng/config.py:48
+msgid "Whether to send the submission data to c3"
+msgstr "是否要將結果傳送至 C3"
+
+#: .././checkbox_ng/config.py:52
+msgid "Whether to also send the submission data to HEXR"
+msgstr "是否也要將結果傳送至 HEXR"
+
+#: .././checkbox_ng/config.py:58
+msgid "Email address to log into the Launchpad HWDB"
+msgstr "登入 Launchpad 硬體資料庫用的電子郵件地址"
+
+#: .././checkbox_ng/config.py:63
+msgid "URL of the certification website"
+msgstr ""
+
+#: .././checkbox_ng/config.py:69
+msgid "URL of the launchpad hardware database"
+msgstr "launchpad 硬體資料庫網址"
+
+#: .././checkbox_ng/config.py:74
+msgid "Location of the fallback file"
+msgstr ""
+
+#: .././checkbox_ng/config.py:78
+msgid "Optional whitelist with which to run SRU testing"
+msgstr ""
+
+#: .././checkbox_ng/config.py:82
+msgid "Optional test plan with which to run SRU testing"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:47
+msgid "Application Title"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:51
+msgid "Welcome Message"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:56
+msgid "Pattern that whitelists need to match to be displayed"
+msgstr ""
+
+#. TODO: valid regexp text validator
+#: .././checkbox_ng/launcher.py:61
+msgid "Pattern that whitelists need to match to be selected"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:67
+msgid "If enabled then suite selection screen is not displayed"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:73
+msgid "If enabled then test selection screen is not displayed"
+msgstr ""
+
+#. TODO: probably a choice validator
+#: .././checkbox_ng/launcher.py:78
+msgid "Type of the input field?"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:82
+msgid "Label on the 'send' button"
+msgstr ""
+
+#. TODO: default?
+#: .././checkbox_ng/launcher.py:88
+msgid "If enabled then test results will be also sent to HEXR"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:93
+msgid "Where to submit the test results to"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:98
+msgid ""
+"HTTP endpoint to submit data to, using the transport specified with "
+"submit_to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:104
+msgid "Secure ID to identify the system this submission belongs to."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:109
+msgid "Name of custom configuration file"
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:113
+msgid "Don't suppress the output of certain job plugin types."
+msgstr ""
+
+#: .././checkbox_ng/launcher.py:116
+msgid "Section with only exported unit ids as keys (no values)"
+msgstr ""
+
+#: .././checkbox_ng/launchpad.py:66
+msgid "Cannot get {0} resource job"
+msgstr ""
+
+#: .././checkbox_ng/launchpad.py:70
+msgid "{0} has no attribute {1}"
+msgstr "{0} 沒有 {1} 屬性"
+
+#: .././checkbox_ng/launchpad.py:97
+msgid "DMI resources not found"
+msgstr "找不到 DMI 資源"
+
+#: .././checkbox_ng/launchpad.py:110
+msgid "System ID not found"
+msgstr ""
+
+#: .././checkbox_ng/launchpad.py:196
+#, python-format
+msgid "Success! Server said %s"
+msgstr "成功！伺服器回應 %s"
+
+#: .././checkbox_ng/launchpad.py:197
+msgid "The submission was uploaded to Launchpad successfully"
+msgstr "測試報告已成功上傳至 Launchpad"
+
+#: .././checkbox_ng/ui.py:73
+msgid "< Continue >"
+msgstr "< 繼續 >"
+
+#: .././checkbox_ng/ui.py:194 .././checkbox_ng/ui.py:321
+msgid "Enter"
+msgstr "Enter 鍵"
+
+#: .././checkbox_ng/ui.py:197 .././checkbox_ng/ui.py:324
+msgid ": Expand/Collapse"
+msgstr "：展開 / 收起"
+
+#: .././checkbox_ng/ui.py:213
+msgid "Start "
+msgstr "開始 "
+
+#: .././checkbox_ng/ui.py:345
+msgid "inish"
+msgstr ""
 
=== modified file 'checkbox-ng/setup.py'
--- checkbox-ng/setup.py	2015-09-17 13:32:38 +0000
+++ checkbox-ng/setup.py	2016-01-05 21:24:37 +0000
@@ -55,7 +55,7 @@
 
 setup(
     name="checkbox-ng",
-    version="0.21.dev0",
+    version="0.24.dev0",
     url="https://launchpad.net/checkbox-ng/",
     packages=find_packages(),
     author="Zygmunt Krynicki",
@@ -65,7 +65,7 @@
     description="Checkbox - Command Line Test Runner",
     long_description=long_description,
     install_requires=install_requires,
-    scripts = ['launchers/checkbox-cli'],
+    scripts = ['launchers/checkbox-cli', 'launchers/checkbox-cli2'],
     entry_points={
         'console_scripts': [
             'checkbox=checkbox_ng.main:main',
 
=== modified file 'checkbox-support/checkbox_support/parsers/submission.py'
--- checkbox-support/checkbox_support/parsers/submission.py	2015-07-13 13:02:37 +0000
+++ checkbox-support/checkbox_support/parsers/submission.py	2016-01-05 21:24:37 +0000
@@ -304,6 +304,18 @@
         logger.debug(package_version)
         message["packages"].append(package_version)
 
+    def addSnapPackageVersion(self, **snap_package_version):
+        if not self.messages or (self.messages[-1]["type"]
+                                != "set-snap-packages"):
+            self.messages.append({
+                "type": "set-snap-packages",
+                "snap-packages": []})
+
+        message = self.messages[-1]
+        logger.debug("ADDING Snap Package Version:")
+        logger.debug(snap_package_version)
+        message["snap-packages"].append(snap_package_version)
+
     def addTestResult(self, **test_result):
         if not self.messages or self.messages[-1]["type"] != "add-results":
             self.messages.append({
@@ -633,6 +645,8 @@
         register(("test_run", "raw_dmi_device",), self.addRawDmiDeviceState)
         register(("test_run", "distribution",), self.setDistribution)
         register(("test_run", "package_version",), self.addPackageVersion)
+        register(("test_run", "snap_package_version",),
+                 self.addSnapPackageVersion)
         register(("test_run", "test_result",), self.addTestResult)
         register(("test_run", "modprobe",), self.addModprobeInfo)
         register(("test_run", "dkms_info",), self.addDkmsInfo)
@@ -840,6 +854,19 @@
     def addPackageVersion(self, test_run, package_version):
         test_run.addPackageVersion(**package_version)
 
+    def addSnapPackage(self, snap_package):
+        snap_package_version = {
+            "name": snap_package["name"],
+            "date": snap_package["properties"]["date"],
+            "version": snap_package["properties"]["version"],
+            "developer": snap_package["properties"]["developer"],
+            }
+        self.dispatcher.publishEvent(
+            "snap_package_version", snap_package_version)
+
+    def addSnapPackageVersion(self, test_run, snap_package_version):
+        test_run.addSnapPackageVersion(**snap_package_version)
+
     def addQuestion(self, question):
         answer_to_status = {
             "fail": FAIL,
@@ -1084,6 +1111,18 @@
                 }
             result.addPackage(package)
 
+    def parseSnapPackages(self, result, node):
+        """Parse the <snap_packages> part of a submission."""
+        for child in node.getchildren():
+            assert child.tag == "snap_package", \
+                "Unexpected tag <%s>, expected <snap_package>" % child.tag
+
+            snap_package = {
+                "name": child.get("name"),
+                "properties": self._getProperties(child),
+                }
+            result.addSnapPackage(snap_package)
+
     def parseProcessors(self, result, node):
         """Parse the <processors> part of a submission."""
         processors = []
@@ -1179,6 +1218,7 @@
         parsers = {
             "lsbrelease": self.parseLSBRelease,
             "packages": self.parsePackages,
+            "snap_packages": self.parseSnapPackages,
             }
 
         for child in node.getchildren():
 
=== added file 'checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages.xml'
--- checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages.xml	1970-01-01 00:00:00 +0000
+++ checkbox-support/checkbox_support/parsers/tests/fixtures/submission_snap_packages.xml	2016-01-05 21:24:37 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<system version="1.0">
+<software>
+<snap_packages>
+<snap_package id="0" name="ubuntu-core">
+<property name="date" type="str">2015-10-13</property>
+<property name="version" type="str">14</property>
+<property name="developer" type="str">ubuntu</property>
+</snap_package>
+</snap_packages>
+</software>
+</system>
 
=== modified file 'checkbox-support/checkbox_support/parsers/tests/test_submission.py'
--- checkbox-support/checkbox_support/parsers/tests/test_submission.py	2015-06-10 14:29:19 +0000
+++ checkbox-support/checkbox_support/parsers/tests/test_submission.py	2016-01-05 21:24:37 +0000
@@ -94,6 +94,10 @@
         self.result.setdefault("package_versions", [])
         self.result["package_versions"].append(package_version)
 
+    def addSnapPackageVersion(self, **snap_package_version):
+        self.result.setdefault("snap_package_versions", [])
+        self.result["snap_package_versions"].append(snap_package_version)
+
     def addTestResult(self, **test_result):
         self.result.setdefault("test_results", [])
         self.result["test_results"].append(test_result)
@@ -330,6 +334,18 @@
         self.assertEqual(package_version["name"], "accountsservice")
         self.assertEqual(package_version["version"], "0.6.21-6ubuntu2")
 
+    def test_snap_package_versions(self):
+        """Snap Package versions are in the snap_packages element."""
+        result = self.getResult("submission_snap_packages.xml")
+        self.assertTrue("snap_package_versions" in result)
+        self.assertEqual(len(result["snap_package_versions"]), 1)
+
+        package_version = result["snap_package_versions"][0]
+        self.assertEqual(package_version["name"], "ubuntu-core")
+        self.assertEqual(package_version["version"], "14")
+        self.assertEqual(package_version["date"], "2015-10-13")
+        self.assertEqual(package_version["developer"], "ubuntu")
+
     def test_package_modaliases(self):
         """
         Modaliases information is in the packages element if a package
 
=== modified file 'checkbox-support/checkbox_support/parsers/udevadm.py'
--- checkbox-support/checkbox_support/parsers/udevadm.py	2015-08-11 11:01:48 +0000
+++ checkbox-support/checkbox_support/parsers/udevadm.py	2016-01-05 21:24:37 +0000
@@ -635,9 +635,11 @@
     def interface(self):
         if self._interface is not None:
             return self._interface
-        if (self.category in ("NETWORK", "WIRELESS") and
-                "INTERFACE" in self._environment):
-            return self._environment["INTERFACE"]
+        if self.category in ("NETWORK", "WIRELESS"):
+            if "INTERFACE" in self._environment:
+                return self._environment["INTERFACE"]
+            else:
+                return 'UNKNOWN'
         return None
 
     @interface.setter
 
=== modified file 'checkbox-support/setup.py'
--- checkbox-support/setup.py	2015-07-13 12:32:59 +0000
+++ checkbox-support/setup.py	2016-01-05 21:24:37 +0000
@@ -38,7 +38,7 @@
 
 setup(
     name="checkbox-support",
-    version="0.21.dev",
+    version="0.24.dev0",
     url="https://launchpad.net/checkbox/",
     packages=find_packages(),
     test_suite='checkbox_support.tests.test_suite',
 
=== modified file 'checkbox-touch/Makefile'
--- checkbox-touch/Makefile	2015-09-18 16:40:09 +0000
+++ checkbox-touch/Makefile	2016-01-05 21:24:37 +0000
@@ -8,6 +8,14 @@
 # sudo apt-get install python-autopilot autopilot-qt
 #############################################################
 
+TRANSLATION_ROOT=.
+
+APP_ID=com.ubuntu.checkbox
+
+MO_FILES=$(foreach infile,$(basename $(notdir $(wildcard ./po/*.po))),$(TRANSLATION_ROOT)/share/locale/$(infile)/LC_MESSAGES/$(APP_ID).mo)
+QMLJS_FILES:=$(shell find . -name "*.qml" -o -name "*.js" | grep -v ./tests)
+PY_FILES=$(wildcard ./py/*.py) build-me get-libs
+
 all:
 
 autopilot:
@@ -21,3 +29,17 @@
 run:
 	/usr/bin/qmlscene $@ checkbox-touch.qml
 
+build-translations: $(MO_FILES)
+	echo $(MO_FILES)
+
+po:
+	mkdir -p $(CURDIR)/po
+
+po/checkbox-touch.pot: $(QMLJS_FILES) $(PY_FILES) | po
+	xgettext -o po/checkbox-touch.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8
+	xgettext -o po/checkbox-touch.pot --join-existing --language=python --add-comments=TRANSLATORS --keyword=_ --keyword=N_ $(PY_FILES)
+
+
+$(TRANSLATION_ROOT)/share/locale/%/LC_MESSAGES/$(APP_ID).mo: po/%.po
+	mkdir -p $(TRANSLATION_ROOT)/share/locale/$*/LC_MESSAGES && msgfmt -o $@ $^
+
 
=== modified file 'checkbox-touch/build-me'
--- checkbox-touch/build-me	2015-07-29 08:13:09 +0000
+++ checkbox-touch/build-me	2016-01-05 21:24:37 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import argparse
+from contextlib import contextmanager
 from distutils.dir_util import copy_tree
 from datetime import datetime
 import json
@@ -9,6 +10,9 @@
 import sys
 import textwrap
 
+from confinement.generate import generate_confinement
+from py.embedded_providers import EmbeddedProvider1PlugInCollection
+
 # DEFAULT_PROVIDERS is a list of providers directory names as listed in
 # ../providers. NOTE: those are directory names, not provider names as reported
 # by manage.py info
@@ -19,6 +23,24 @@
 ]
 
 
+@contextmanager
+def chdir(path):
+    previous_path = os.getcwd()
+    os.chdir(path)
+    yield
+    os.chdir(previous_path)
+
+
+def get_confined_jobs(path):
+    collection = EmbeddedProvider1PlugInCollection(path)
+    # this should be run within provider's directory, so there should be
+    # only one provider loaded
+    provider = collection.get_all_plugin_objects()[0]
+    for job in provider.job_list:
+        if job.plugin == 'qml' and 'confined' in job.get_flag_set():
+            yield job
+
+
 def check_libs_present():
     """
     Check if paths listed in NECESSARY_PATHS are present.
@@ -51,8 +73,7 @@
     try:
         revno = subprocess.check_output(
             ["git", "-C", path, "show", "-s", "--format=%h", "HEAD"],
-            stderr=subprocess.STDOUT).decode(
-                sys.stdout.encoding).strip()
+            stderr=subprocess.STDOUT).decode(sys.stdout.encoding).strip()
         return "git {}".format(revno)
     except subprocess.CalledProcessError:
         # problem encountered when run git revision - falling through
@@ -91,7 +112,13 @@
         "revision": get_revision_string(),
         "clickBuildDate": str(datetime.now().date()),
         "testplan": args.testplan,
-        "providersDir": "providers"
+        "providersDir": "providers",
+        "submission": {
+            "inputForm": "sso-login.qml",
+            "name": "Community Practitest",
+            "type": "oauth",
+            "url": "https://ubuntu-community-testing.staging.ubuntu.com/v1/upload"
+        },
     }
     settings_file = open('settings.json', 'w')
     settings_file.write(json.dumps(settings, sort_keys=True, indent=4))
@@ -118,6 +145,18 @@
     if not validate_providers():
         sys.exit('Provider validation failed.')
 
+    current_manifest = json.loads(open('manifest.json', 'rt').read())
+    hooks = {
+        'checkbox-touch': current_manifest['hooks']['checkbox-touch']
+    }
+    for hook in build_confinement(current_manifest['version']):
+        hooks.update(hook)
+    new_manifest = current_manifest.copy()
+    new_manifest['hooks'] = hooks
+    with open('manifest.json', 'wt') as f:
+        f.write(json.dumps(new_manifest, sort_keys=True, indent=4))
+    build_i18n()
+
     generate_desktop_file()
 
     if not os.path.exists('../build-cbt'):
@@ -152,20 +191,48 @@
                     return False
             else:
                 print(("Problem encountered when validating '{}'."
-                       " Output:\n{}").format(provider_dir, e.output.decode(
-                           sys.stdout.encoding)))
+                       " Output:\n{}").format(
+                    provider_dir, e.output.decode(sys.stdout.encoding)))
                 providers_valid = False
     return providers_valid
 
 
+def build_confinement(checkbox_version):
+    print("Generating confinement")
+    checkbox_name = "com.ubuntu.checkbox_checkbox-touch_" + checkbox_version
+    new_hooks = []
+    for provider_dir in os.listdir('providers'):
+        with chdir(os.path.join('providers', provider_dir)):
+            for job in get_confined_jobs('.'):
+                print(" job: {}".format(job.id))
+                qml_file = os.path.relpath(
+                    job.qml_file, 'data')
+                new_hooks.append(generate_confinement(
+                    provider_dir, job.partial_id, checkbox_name, qml_file))
+    return new_hooks
+
+
+def build_i18n():
+    print("Building i18n")
+    for provider_dir in os.listdir('providers'):
+        try:
+            subprocess.check_output(
+                [os.path.join('providers', provider_dir, 'manage.py'),
+                 'i18n'], stderr=subprocess.STDOUT)
+        except (OSError, subprocess.CalledProcessError) as e:
+            print("Problem encountered while building translations for ",
+                  "provider '{}'.".format(provider_dir))
+            raise e
+
+
 def generate_desktop_file():
     template = textwrap.dedent("""
     # This file has been generated by build-me script
     [Desktop Entry]
-    Name=Checkbox
-    Comment=System testing utility for Ubuntu
+    Name=Pilot
+    Comment=Community testing utility for Ubuntu
     Exec=qmlscene --settings=settings.json {import_options} $@ checkbox-touch.qml
-    Icon=checkbox-touch.svg
+    Icon=pilot_256.png
     Terminal=false
     Type=Application
     X-Ubuntu-Touch=true
@@ -176,7 +243,7 @@
         provider_data_dir = os.path.join('providers', provider, 'data')
         if os.path.exists(provider_data_dir):
             import_opts.append("-I " + provider_data_dir)
-    with open('checkbox-touch.desktop', 'wt', encoding='utf-8') as f:
+    with open('pilot.desktop', 'wt', encoding='utf-8') as f:
         f.write(template.format(import_options=" ".join(import_opts)))
 
 
 
=== modified file 'checkbox-touch/checkbox-touch.qml'
--- checkbox-touch/checkbox-touch.qml	2015-09-30 06:12:53 +0000
+++ checkbox-touch/checkbox-touch.qml	2016-01-05 21:24:37 +0000
@@ -84,6 +84,7 @@
     }
 
     Component.onCompleted: {
+        i18n.domain = "com.ubuntu.checkbox";
         if (args.values["autopilot"]) {
             // autopilot-testing mode
             appSettings["testplan"] = "2015.com.canonical.certification::checkbox-touch-autopilot";
@@ -164,8 +165,7 @@
         Component.onCompleted: {
             // register to py.initiated signal
             py.onInitiated.connect(function() {
-                construct("checkbox_touch.create_app_object", [
-                    appSettings["providersDir"]]);
+                construct("checkbox_touch.create_app_object", []);
             });
         }
     }
@@ -191,12 +191,16 @@
 
     WelcomePage {
         id: welcomePage
+        // TRANSLATORS: %1 means program version, %2 repository revision and %3
+        // date when the package was built
+        // TRANSLATORS: keep the '\n' characters at the end of each line
         welcomeText: i18n.tr("Welcome to Checkbox Touch\nVersion: %1\n(%2 %3)")
             .arg(app.applicationVersion).arg(appSettings.revision).arg(appSettings.clickBuildDate)
         onStartTestingTriggered: {
             if (appSettings.testplan != "") {
                 app.rememberTestplan(appSettings.testplan, function() {
                     categorySelectionPage.setup();
+                    enableButton();
                 });
             } else {
                 app.getTestplans(function(response) {
@@ -209,9 +213,9 @@
                     else {
                         testplanSelectionPage.setup(tp_list)
                     }
+                    enableButton();
                 });
             }
-            enableButton();
         }
         onAboutClicked: pageStack.push(aboutPage)
     }
@@ -271,8 +275,8 @@
         id: resumeSessionPage
         onRerunLast: app.resumeSession(true, processNextTest)
         onContinueSession: app.resumeSession(false, processNextTest)
-        resumeText: i18n.tr("Checkbox did not finish completely.\nDo you want \
- to rerun last test, continue to the next test, or restart from the beginning?")
+        resumeText: i18n.tr("Checkbox session got suspended.\nDo you want \
+ to rerun last test, continue to the next test, or start a new session?")
         onRestartSession: {
             pageStack.clear();
             pageStack.push(welcomePage);
@@ -314,14 +318,20 @@
 
         function setup(continuation) {
             app.getCategories(function(response) {
-                var category_info_list = response.category_info_list;
-                model.clear();
-                for (var i=0; i<category_info_list.length; i++) {
-                    var category_info = category_info_list[i]; 
-                    model.append(category_info);
+                var uncategorised_id = "2013.com.canonical.plainbox::uncategorised"
+                if (response.category_info_list.length === 1 &&
+                    response.category_info_list[0].mod_id == uncategorised_id) {
+                    selectionDone(uncategorised_id);
+                } else {
+                    var category_info_list = response.category_info_list;
+                    model.clear();
+                    for (var i=0; i<category_info_list.length; i++) {
+                        var category_info = category_info_list[i];
+                        model.append(category_info);
+                    }
+                    modelUpdated();
+                    pageStack.push(categorySelectionPage);
                 }
-                modelUpdated();
-                pageStack.push(categorySelectionPage);
                 // if called from welcome page, no continuation is given
                 if (continuation) continuation();
             });
@@ -339,7 +349,7 @@
         id: testSelectionPage
         objectName: "testSelectionPage"
         title: i18n.tr("Select tests")
-        continueText: i18n.tr("Start Testing")
+        continueText: i18n.tr("Start testing")
         largeBuffer: args.values["autopilot"]
 
         function setup(continuation) {
@@ -381,6 +391,11 @@
             pageStack.push(rerunSelectionPage)
         }
         onSelectionDone: {
+            if (!selected_id_list.length) {
+                showResultsScreen();
+                unlatchContinue();
+                return;
+            }
             app.rememberTestSelection(selected_id_list, function() {
                 processNextTest();
                 unlatchContinue();
@@ -443,23 +458,27 @@
         app.getNextTest(function(test) {
             pageStack.clear();
             if (test.plugin === undefined) { 
-                return maybeShowRerunScreen();
+                return showResultsScreen();
             }
             if (test.user) {
                 // running this test will require to be run as a different
                 // user (therefore requiring user to enter sudo password)
                 if (!appSettings.sudoPasswordProvided) {
                     // ask user for password
-                    passwordDialog.passwordEntered.connect(function(pass) {
+                    var rememberContinuation = function(pass) {
+                        passwordDialog.passwordEntered.disconnect(rememberContinuation);
                         app.rememberPassword(pass, function(){
                             appSettings.sudoPasswordProvided = true;
                             performTest(test);
                         });
-                    });
-                    passwordDialog.dialogCancelled.connect(function() {
+                    }
+                    var cancelContinuation = function() {
+                        passwordDialog.dialogCancelled.disconnect(cancelContinuation);
                         test.outcome = "skip";
                         completeTest(test);
-                    });
+                    };
+                    passwordDialog.passwordEntered.connect(rememberContinuation);
+                    passwordDialog.dialogCancelled.connect(cancelContinuation);
                     PopupUtils.open(passwordDialog.dialogComponent);
                     return;
                 }
@@ -509,72 +528,74 @@
         app.runTestActivity(test, continuation);
 
     }
-    function maybeShowRerunScreen() {
-        app.getRerunCandidates(function(result) {
-            if (result == false) {
-                 showResultsScreen();
-                 return;
-            }
-            rerunSelectionPage.setup(result);
-        });
-    }
 
     function showResultsScreen() {
-        pageStack.clear();
-        app.getResults(function(results) {
-            var resultsPage = createPage("components/ResultsPage.qml");
-            resultsPage.results = results;
-            if (appSettings["submission"]) {
-                resultsPage.submissionName = appSettings["submission"].name;
-            }
-            resultsPage.endTesting.connect(function() {
-                pageStack.clear();
-                app.clearSession(function() {
-                    app.startSession();
-                    pageStack.push(welcomePage);
-                });
-            });
-            resultsPage.saveReportClicked.connect(function() {
-                app.exportResults('2013.com.canonical.plainbox::html', [], function(uri) {
-                    console.log(uri)
-                    var htmlReportUrl = uri;
-                    app.exportResults('2013.com.canonical.plainbox::xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) {
-                        console.log(uri)
-                        CbtDialogLogic.showDialog(resultsPage, i18n.tr("Reports have been saved to your Documents folder"),
-                                                  [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}, {"text": i18n.tr("View Report"), "color": UbuntuColors.green, "onClicked": function(uri) {
-                                                      var webviewer = Qt.createComponent(Qt.resolvedUrl("components/WebViewer.qml")).createObject();
-                                                      webviewer.uri = htmlReportUrl;
-                                                      pageStack.push(webviewer);
-                                                  }}]);
-                    });
-                });
-            });
-            resultsPage.submitReportClicked.connect(function() {
-                getSubmissionInput(function() {
-                    app.submitResults(appSettings["submission"], function(reply) {
-                        // pretty-stringify reply
-                        var s = ""
-                        for (var i in reply) {
-                            s += i + ': ' + reply[i] + '\n';
-                        }
-                        CbtDialogLogic.showDialog(
-                            resultsPage,
-                            i18n.tr("Report has been submitted.\n" + s),
-                            [{"text": i18n.tr("OK"), "color": UbuntuColors.green}]);
-                    },
-                    function(error) {
-                        ErrorLogic.showError(mainView,
-                                             i18n.tr("Could not submit results. Reason:\n" + error),
-                                             function(){},
-                                             i18n.tr("OK"));
-                        resultsPage.unlatchSubmission();
-                    })
+        var endTesting = function() {
+            pageStack.clear();
+            app.clearSession(function() {
+                app.startSession();
+                pageStack.push(welcomePage);
+            });
+        };
+        var saveReport = function() {
+            app.exportResults('2013.com.canonical.plainbox::html', [], function(uri) {
+                var htmlReportUrl = uri;
+                app.exportResults('2013.com.canonical.plainbox::xlsx', ["with-sys-info", "with-summary", "with-job-description", "with-text-attachments", "with-unit-categories"], function(uri) {
+                    CbtDialogLogic.showDialog(mainView, i18n.tr("Reports have been saved to your Documents folder"),
+                                              [{ "text": i18n.tr("OK"), "color": UbuntuColors.green}, {"text": i18n.tr("View Report"), "color": UbuntuColors.green, "onClicked": function(uri) {
+                                                  var webviewer = Qt.createComponent(Qt.resolvedUrl("components/WebViewer.qml")).createObject();
+                                                  webviewer.uri = htmlReportUrl;
+                                                  pageStack.push(webviewer);
+                                              }}]);
+                });
+            });
+        };
+        var submitReport = function(resultsPage) {
+            // resultsPage param is for having control over unlatching
+            getSubmissionInput(function() {
+                app.submitResults(appSettings["submission"], function(reply) {
+                    // pretty-stringify reply
+                    var s = ""
+                    for (var i in reply) {
+                        s += i + ': ' + reply[i] + '\n';
+                    }
+                    CbtDialogLogic.showDialog(
+                        resultsPage,
+                        i18n.tr("Report has been submited.\n" + s),
+                        [{"text": i18n.tr("OK"), "color": UbuntuColors.green}]);
                 },
-                function() {
+                function(error) {
+                    ErrorLogic.showError(mainView,
+                                         i18n.tr("Could not submit results. Reason:\n" + error),
+                                         function(){},
+                                         i18n.tr("OK"));
                     resultsPage.unlatchSubmission();
-                });
-            });
-            pageStack.push(resultsPage);
+                })
+            },
+            function() {
+                resultsPage.unlatchSubmission();
+            });
+        };
+
+        pageStack.clear();
+        app.getRerunCandidates(function(rerunCandidates) {
+            app.getResults(function(results) {
+                var resultsPage = createPage("components/ResultsPage.qml");
+                resultsPage.results = results;
+                if (appSettings["submission"]) {
+                    resultsPage.submissionName = appSettings["submission"].name;
+                }
+                resultsPage.endTesting.connect(endTesting);
+                resultsPage.saveReportClicked.connect(saveReport);
+                resultsPage.submitReportClicked.connect(function() {submitReport(resultsPage);});
+                if (rerunCandidates.length>0) {
+                    resultsPage.rerunEnabled = true;
+                    resultsPage.rerunTests.connect(function() {
+                        rerunSelectionPage.setup(rerunCandidates);
+                    });
+                }
+                pageStack.push(resultsPage);
+            });
         });
     }
 
@@ -637,7 +658,7 @@
     }
     function performConfinedQmlTest(test) {
         runTestActivity(test, function(test) {
-            var qmlNativePage = createPage("components/QmlConfinedPage.qm;");
+            var qmlNativePage = createPage("components/QmlConfinedPage.qml", test);
             qmlNativePage.applicationVersion = app.applicationVersion;
             qmlNativePage.testDone.connect(completeTest);
             pageStack.push(qmlNativePage);
@@ -646,29 +667,23 @@
 
     function showVerificationScreen(test) {
         var verificationPage = createPage("components/TestVerificationPage.qml", test);
-        verificationPage.testDone.connect(completeTest);
+        var maybeCommentVerification = function(test) {
+            if (test.outcome == 'fail' &&
+                test.flags.indexOf('explicit-fail') > -1) {
+                commentsDialog.commentDefaultText = test["comments"] || "";
+                commentsDialog.commentAdded.connect(function(comment) {
+                    test["comments"] = comment;
+                    completeTest(test);
+                });
+                PopupUtils.open(commentsDialog.dialogComponent);
+            } else {
+                completeTest(test);
+            }
+        }
+        verificationPage.testDone.connect(maybeCommentVerification);
         pageStack.push(verificationPage);
     }
     function getSubmissionInput(continuation, cancelContinuation) {
-        if (appSettings.submission.inputForm) {
-            var dlg_cmp = Qt.createComponent(Qt.resolvedUrl(appSettings.submission.inputForm));
-            var dlg = dlg_cmp.createObject(mainView);
-
-            dlg.cancelClicked.connect(function() {
-                cancelContinuation();
-                return;
-            });
-
-            dlg.submissionDetailsFilled.connect(function(submissionDetails) {
-                for (var attr in submissionDetails) {
-                    appSettings.submission[attr] = submissionDetails[attr];
-                }
-                continuation();
-            });
-            PopupUtils.open(dlg.dialogComponent);
-            return; // inputForm gets precedence over input
-        }
-
         if (!appSettings.submission.input) {
             // no input to process
             continuation();
 
=== modified file 'checkbox-touch/components/CheckboxTouchApplication.qml'
--- checkbox-touch/components/CheckboxTouchApplication.qml	2015-09-30 06:12:53 +0000
+++ checkbox-touch/components/CheckboxTouchApplication.qml	2016-01-05 21:24:37 +0000
@@ -62,13 +62,14 @@
             if (!result["session_id"]) {
                 pageStack.pop();
                 ErrorLogic.showError(mainView,
-                                     i18n.tr("Could not resume session "),
+                                     i18n.tr("Could not resume session"),
                                      function() {
                                          startSession();
                                          return;
                                      },
                                      i18n.tr("Start new session"));
             } else {
+                sessionDir = result['session_dir'];
                 sessionReady();
                 continuation();
             }
@@ -95,7 +96,11 @@
         });
     }
     function rememberTestplan(testplan, continuation) {
-        request("remember_testplan", [testplan], continuation, function(error) {
+        var handleResult = function(result) {
+            sessionDir = result['session_dir'];
+            continuation();
+        }
+        request("remember_testplan", [testplan], handleResult, function(error) {
             console.error("Unable to save testplan selection");
         });
     }
@@ -174,6 +179,12 @@
             }
         });
     }
+    function dropPermissions(appId, services, continuation, continuation_error) {
+        request("drop_permissions", [appId, services], continuation, function(error) {
+            console.error("Unable to remove permissions");
+            if (continuation_error) continuation_error(error);
+        });
+    }
 
     function rememberPassword(password, continuation) {
         // using low-level py.call() to 'silently' pass password string through pyotherside
@@ -202,12 +213,18 @@
     // Internal handler that triggers a call to python to query for runtime and
     // application versions.
     onObjectReady: {
-        request("get_version_pair", [], function(result) {
-            app.applicationVersion = result.application_version;
-            app.plainboxVersion = result.plainbox_version;
-            appReady();
+        request("load_providers", [appSettings["providersDir"]], function(result) {
+            request("get_version_pair", [], function(result) {
+                app.applicationVersion = result.application_version;
+                app.plainboxVersion = result.plainbox_version;
+                appReady();
+            }, function(error) {
+                console.error("Unable to query for version: " + error);
+            });
+
         }, function(error) {
-            console.error("Unable to query for version: " + error);
+                console.error("Unable to load providers: " + error);
+                ErrorLogic.showError(mainView, i18n.tr("No providers available!"), Qt.quit);
         });
     }
 }
 
=== modified file 'checkbox-touch/components/CommandOutputPage.qml'
--- checkbox-touch/components/CommandOutputPage.qml	2015-09-07 20:06:44 +0000
+++ checkbox-touch/components/CommandOutputPage.qml	2016-01-05 21:24:37 +0000
@@ -50,6 +50,7 @@
                 id: skipAction
                 objectName: "copyOutputAction"
                 iconName: "edit-copy"
+                // TRANSLATORS: a verb (call to action)
                 text: i18n.tr("Copy")
                 onTriggered: Clipboard.push(mimeData)
             }
@@ -93,6 +94,7 @@
 
         Button {
             Layout.fillWidth: true
+            // TRANSLATORS: This is a label on the button that goes back a page
             text: i18n.tr("Back")
             onClicked: pageStack.pop()
         }
 
=== modified file 'checkbox-touch/components/InteractIntroPage.qml'
--- checkbox-touch/components/InteractIntroPage.qml	2015-09-15 10:58:58 +0000
+++ checkbox-touch/components/InteractIntroPage.qml	2016-01-05 21:24:37 +0000
@@ -96,7 +96,7 @@
             objectName: "startTestButton"
             unlatchedColor: UbuntuColors.green
             Layout.fillWidth: true
-            text: i18n.tr("Test")
+            text: i18n.tr("Start the test")
             onLatchedClicked: {
                 userInteractVerifyIntroPage.state = "testing"
                 testStarted();
 
=== modified file 'checkbox-touch/components/PasswordDialog.qml'
--- checkbox-touch/components/PasswordDialog.qml	2015-03-10 12:19:22 +0000
+++ checkbox-touch/components/PasswordDialog.qml	2016-01-05 21:24:37 +0000
@@ -50,6 +50,7 @@
 
             TextField {
                 id: passwordBox
+                objectName: "passwordBox"
                 placeholderText: i18n.tr("password")
                 echoMode: TextInput.Password
                 onAccepted: okButton.clicked(text)
@@ -57,6 +58,7 @@
 
             Button {
                 id: okButton
+                objectName: "okButton"
                 text: i18n.tr("OK")
                 color: UbuntuColors.green
                 onClicked: {
@@ -69,6 +71,7 @@
             }
 
             Button {
+                objectName: "cancelButton"
                 text: i18n.tr("Cancel")
                 color: UbuntuColors.red
                 onClicked: {
 
=== added file 'checkbox-touch/components/PieChart.qml'
--- checkbox-touch/components/PieChart.qml	1970-01-01 00:00:00 +0000
+++ checkbox-touch/components/PieChart.qml	2016-01-05 21:24:37 +0000
@@ -0,0 +1,79 @@
+/*
+ * This file is part of Checkbox
+ *
+ * Copyright 2015 Canonical Ltd.
+ *
+ * Authors:
+ * - Sylvain Pineau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*! \Pie Chart component
+
+    Using the canvas element.
+*/
+
+import QtQuick 2.0
+
+Canvas {
+    id: canvas
+
+    property var chartData;
+    property var borderColor: "#ECECEC";
+    property int borderWidth: 1;
+    property real progress: 0;
+    property alias duration: animation.duration;
+
+    onPaint: {
+        var centreX = width / 2;
+        var centreY = height / 2;
+        var size = Math.min(width, height) / 2;
+        var total = 0;
+        for (var i = 0; i < chartData.length; i++) total += chartData[i].value;
+        var arcTotal = -Math.PI / 2;
+        var ctx = getContext("2d");
+        ctx.reset();
+        for (var i = 0; i < chartData.length; i++) {
+            var arc = progress * chartData[i].value / total * Math.PI / 50;
+            ctx.beginPath();
+            ctx.fillStyle = chartData[i].color;
+            ctx.moveTo(centreX, centreY);
+            ctx.arc(centreX, centreY, size, arcTotal, arc + arcTotal);
+            ctx.lineTo(centreX, centreY);
+            ctx.fill();
+            ctx.lineWidth = borderWidth;
+            ctx.strokeStyle = borderColor;
+            ctx.stroke();
+            arcTotal += arc;
+        }
+        animation.start();
+    }
+
+    onProgressChanged: {
+        requestPaint();
+    }
+
+    function repaint() {
+        progress = 0;
+        animation.start();
+    }
+
+    PropertyAnimation {
+        id: animation;
+        target: canvas;
+        property: "progress";
+        to: 100;
+        duration: 1000; // milliseconds
+    }
+}
 
=== modified file 'checkbox-touch/components/QmlConfinedPage.qml'
--- checkbox-touch/components/QmlConfinedPage.qml	2015-09-15 11:07:31 +0000
+++ checkbox-touch/components/QmlConfinedPage.qml	2016-01-05 21:24:37 +0000
@@ -46,6 +46,7 @@
         property string name: "Checkbox-touch qml confined shell"
         property alias pageStack: qmlNativePage.pageStack
         property string sessionDir: app.sessionDir
+        property var python: app.py
         function getTest() {
             return test;
         }
@@ -106,11 +107,35 @@
             Layout.fillWidth: true
             text: i18n.tr("Start the test")
             onClicked: {
-                busyIndicatorGroup.visible = true;
-                var appName = "com.ubuntu.checkbox_" + test["partial_id"] + "_" + applicationVersion + ".desktop";
-                console.log("Launching " + appName);
-                Qt.openUrlExternally("application:///" + appName);
+                var appName = "com.ubuntu.checkbox_" + test["partial_id"];
+                // load the test qml file to check which permissions should be cleared
+                var testItemComponent = Qt.createComponent(Qt.resolvedUrl(test['qml_file']));
+                if (testItemComponent.status == Component.Error) {
+                    console.error("Error creating testItemComponent. Possible cause: Problem with job's qml file. Error:", testItemComponent.errorString());
+                    test['outcome'] = 'fail';
+                    testDone(test);
+                    return;
+                }
+                var testItem = testItemComponent.createObject(dummyContainer, {"testingShell": testingShell});
+                var clearedPermissions = testItem.clearedPermissions;
+                testItem.destroy();
+                var runConfinedTestApp = function() {
+                    busyIndicatorGroup.visible = true;
+                    Qt.openUrlExternally("application:///" + appName + "_" + applicationVersion+ ".desktop");
+                }
+                if (clearedPermissions) {
+                    app.dropPermissions(appName, clearedPermissions, function() {
+                        runConfinedTestApp();
+                    });
+                } else {
+                    runConfinedTestApp();
+                }
+
             }
         }
+        Item {
+            id: dummyContainer
+            visible: false
+        }
     }
 }
 
=== modified file 'checkbox-touch/components/QmlNativePage.qml'
--- checkbox-touch/components/QmlNativePage.qml	2015-09-15 11:07:44 +0000
+++ checkbox-touch/components/QmlNativePage.qml	2016-01-05 21:24:37 +0000
@@ -42,6 +42,7 @@
         property string name: "Checkbox-touch qml shell"
         property alias pageStack: qmlNativePage.pageStack
         property string sessionDir: app.sessionDir
+        property var python: app.py
         function getTest() {
             return test;
         }
 
=== modified file 'checkbox-touch/components/ResultsPage.qml'
--- checkbox-touch/components/ResultsPage.qml	2015-09-04 13:15:26 +0000
+++ checkbox-touch/components/ResultsPage.qml	2016-01-05 21:24:37 +0000
@@ -28,7 +28,6 @@
 import QtQuick 2.0
 import Ubuntu.Components 1.1
 import QtQuick.Layouts 1.1
-import jbQuick.Charts 1.0
 
 Page {
     title: i18n.tr("Test Results")
@@ -37,9 +36,11 @@
     objectName: "resultsPage"
     property var results: {"totalPassed": 0, "totalFailed": 0, "totalSkipped": 0}
     property string submissionName: ""
+    property var rerunEnabled: false
     signal saveReportClicked()
     signal submitReportClicked()
     signal endTesting()
+    signal rerunTests()
 
     function unlatchSubmission() {
         submitResultsButton.unlatch();
@@ -48,7 +49,15 @@
     head {
         actions: [
             Action {
-                iconName: "window-close"
+                id: rerunAction
+                objectName: "rerunAction"
+                iconName: "view-refresh"
+                text: i18n.tr("Rerun")
+                onTriggered: rerunTests();
+                visible: rerunEnabled
+            },
+            Action {
+                iconName: "close"
                 text: i18n.tr("Close")
                 onTriggered: endTesting();
             }
@@ -84,7 +93,7 @@
 
         Label {
             fontSize: "x-large"
-            text: "Summary"
+            text: i18n.tr("Summary")
         }
 
         MouseArea {
@@ -92,14 +101,9 @@
             Layout.fillWidth: true
             property var easter: 0
 
-            Chart {
+            PieChart {
                 id: chart_pie;
                 anchors.fill: parent
-                chartAnimated: true;
-                chartAnimationEasing: Easing.Linear;
-                chartAnimationDuration: 1000;
-                chartType: Charts.ChartType.PIE;
-                chartOptions: {"segmentStrokeColor": "#ECECEC"};
             }
             Image {
                 id: img
@@ -128,7 +132,7 @@
                 }
                 Text {
                     objectName: "passedLabel"
-                    text: results.totalPassed + " tests passed"
+                    text: results.totalPassed + " " + i18n.tr("tests passed")
                 }
             }
             Row {
@@ -139,7 +143,7 @@
                 }
                 Text {
                     objectName: "failedLabel"
-                    text: results.totalFailed + " tests failed"
+                    text: results.totalFailed + " " + i18n.tr("tests failed")
                 }
             }
             Row {
@@ -150,7 +154,7 @@
                 }
                 Text {
                     objectName: "skippedLabel"
-                    text: results.totalSkipped + " tests skipped"
+                    text: results.totalSkipped + " " + i18n.tr("tests skipped")
                 }
             }
         }
@@ -160,15 +164,22 @@
             unlatchedColor: UbuntuColors.green
             Layout.fillWidth: true
             text: i18n.tr("Save detailed report")
-            onLatchedClicked: saveReportClicked();
+            onLatchedClicked: {
+                rerunAction.enabled = false;
+                saveReportClicked();
+            }
         }
         LatchButton {
             id: submitResultsButton
             unlatchedColor: UbuntuColors.green
             visible: submissionName
             Layout.fillWidth: true
+            // TRANSLATORS: follwing string will be followed by a service name, e.g. "certification website"
             text: i18n.tr("Submit results to " + submissionName)
-            onLatchedClicked: submitReportClicked();
+            onLatchedClicked: {
+                rerunAction.enabled = false;
+                submitReportClicked();
+            }
         }
     }
 }
 
=== modified file 'checkbox-touch/components/ResumeSessionPage.qml'
--- checkbox-touch/components/ResumeSessionPage.qml	2015-07-17 08:36:57 +0000
+++ checkbox-touch/components/ResumeSessionPage.qml	2016-01-05 21:24:37 +0000
@@ -114,7 +114,7 @@
                 Layout.fillHeight: true
                 Layout.fillWidth: true
                 color: "white"
-                text: i18n.tr("Restart")
+                text: i18n.tr("Start new session")
             }
             onLatchedClicked: {
                 restartSession();
 
=== modified file 'checkbox-touch/components/SelectionPage.qml'
--- checkbox-touch/components/SelectionPage.qml	2015-09-18 14:28:20 +0000
+++ checkbox-touch/components/SelectionPage.qml	2016-01-05 21:24:37 +0000
@@ -42,15 +42,22 @@
     visible: false
     flickable: null
     property var selectedCount : 0
-    state : selectedCount > 0 ? "nonempty selection" : "empty selection"
+    property var disabledSelectedCount: 0
+    state : selectedCount > 0 ? "nonempty selection" :
+        (disabledSelectedCount > 0 ? "disabled only selection" : "empty selection")
 
     // A function that needs to be called after changes are done to the model
     // to re-count number of selected items on the list
     function modelUpdated() {
         selectedCount = 0;
+        disabledSelectedCount = 0;
         for (var i=0; i < selectionModel.count; i++) {
             if (selectionModel.get(i).mod_selected) {
-                selectedCount++;
+                if (selectionModel.get(i).mod_disabled) {
+                    disabledSelectedCount++;
+                } else {
+                    selectedCount++;
+                }
             }
         }
     }
@@ -68,16 +75,31 @@
         continueButton.unlatch();
     }
     function deselectAll() {
+        selectedCount = 0;
+        disabledSelectedCount = 0;
         for (var i=0; i<selectionModel.count; i++) {
-            selectionModel.setProperty(i, "mod_selected", false);
+            if (!selectionModel.get(i)["mod_disabled"]) {
+                selectionModel.setProperty(i, "mod_selected", false);
+            } else {
+                if (selectionModel.get(i).mod_selected) {
+                    disabledSelectedCount++;
+                }
+            }
         }
-        selectedCount = 0;
     }
     function selectAll() {
+        selectedCount = 0;
+        disabledSelectedCount = 0;
         for (var i=0; i<selectionModel.count; i++) {
-            selectionModel.setProperty(i, "mod_selected", true);
+            if (!selectionModel.get(i)["mod_disabled"]) {
+                selectionModel.setProperty(i, "mod_selected", true);
+                selectedCount++;
+            } else {
+                if (selectionModel.get(i).mod_selected) {
+                    disabledSelectedCount++;
+                }
+            }
         }
-        selectedCount = selectionModel.count;
     }
 
     head {
@@ -89,7 +111,7 @@
                 text: i18n.tr("Toggle selection")
                 visible: !onlyOneAllowed
                 onTriggered: {
-                    if (state === "empty selection") {
+                    if (state === "empty selection" || state == "disabled only selection") {
                         selectAll();
                     }
                     else if (state === "nonempty selection") {
@@ -110,6 +132,10 @@
          State {
             name: "nonempty selection"
             PropertyChanges { target: continueButton; enabled: true }
+         },
+         State {
+            name: "disabled only selection"
+            PropertyChanges { target: continueButton; enabled: true }
          }
     ]
 
@@ -166,6 +192,7 @@
             delegate: ListItemWrappable {
                 objectName: "listItem"
                 text: mod_name
+                enabled: !mod_disabled
                 property var item_mod_id: mod_id
                 /* Create a checkbox-lookalike that doesn't have the internal onTrigger
                  * signal handler that overrides the binding to the model.mod_selected
 
=== modified file 'checkbox-touch/components/TestVerificationPage.qml'
--- checkbox-touch/components/TestVerificationPage.qml	2015-09-15 11:00:43 +0000
+++ checkbox-touch/components/TestVerificationPage.qml	2016-01-05 21:24:37 +0000
@@ -68,6 +68,7 @@
             objectName: "passButton"
             unlatchedColor: UbuntuColors.green
             Layout.fillWidth: true
+            // TRANSLATORS: this string is on a button that marks the given test as passed
             text: i18n.tr("Pass")
             onLatchedClicked: {
                 test["outcome"] = "pass";
@@ -81,6 +82,7 @@
             objectName: "failButton"
             unlatchedColor: UbuntuColors.red
             Layout.fillWidth: true
+            // TRANSLATORS: this string is on a button that marks the given test as failed
             text: i18n.tr("Fail")
             onLatchedClicked: {
                 test["outcome"] = "fail";
 
=== modified file 'checkbox-touch/components/UserInteractSummaryPage.qml'
--- checkbox-touch/components/UserInteractSummaryPage.qml	2015-09-15 11:02:02 +0000
+++ checkbox-touch/components/UserInteractSummaryPage.qml	2016-01-05 21:24:37 +0000
@@ -56,6 +56,7 @@
             Label {
                 fontSize: "large"
                 Layout.fillHeight: true
+                // TRANSLATORS: this string will be followed by either "PASSED" or "FAILED"
                 text : i18n.tr("This test ")
                 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
             }
@@ -84,7 +85,7 @@
             Layout.fillHeight: true
             Layout.fillWidth: true
             wrapMode: Text.WrapAtWordBoundaryOrAnywhere
-            text : i18n.tr("You can go back to rerun it or continue to the next test.")
+            text : i18n.tr("You can go back to rerun the test or continue to the next test.")
         }
 
         Button {
 
=== modified file 'checkbox-touch/components/WelcomePage.qml'
--- checkbox-touch/components/WelcomePage.qml	2015-07-17 08:36:57 +0000
+++ checkbox-touch/components/WelcomePage.qml	2016-01-05 21:24:37 +0000
@@ -32,7 +32,7 @@
     signal aboutClicked();
     property alias welcomeText: welcomeText.text
 
-    title: i18n.tr("System Testing")
+    title: i18n.tr("Community Testing")
     visible: false
 
     function enableButton() {
@@ -60,7 +60,7 @@
             bottom: startTestButton.top
         }
 
-        text: i18n.tr("Welcome text")
+        text: ""
         fontSize: "large"
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
@@ -70,13 +70,13 @@
     states: [
         State {
             name: "loading"
-            PropertyChanges { target: startTestButton; enabled: false; color: UbuntuColors.warmGrey; text: i18n.tr("Checkbox is loading...") }
+            PropertyChanges { target: startTestButton; enabled: false; color: UbuntuColors.warmGrey; text: i18n.tr("Pilot is loading...") }
             PropertyChanges { target: loadingSpinner; running: true}
 
         },
         State {
             name: "loaded"
-            PropertyChanges { target: startTestButton; enabled: true; color: UbuntuColors.green; text: i18n.tr("Start Testing")}
+            PropertyChanges { target: startTestButton; enabled: true; color: UbuntuColors.green; text: i18n.tr("Start testing")}
             PropertyChanges { target: loadingSpinner; running: false}
         }
     ]
@@ -114,7 +114,7 @@
         }
 
         unlatchedColor: UbuntuColors.green
-        text: i18n.tr("Start Testing")
+        text: i18n.tr("Start testing")
         onLatchedClicked: startTestingTriggered();
     }
 }
 
=== renamed file 'checkbox-touch/confinement/generate-confinement.py' => 'checkbox-touch/confinement/generate.py'
--- checkbox-touch/confinement/generate-confinement.py	2015-07-23 10:54:18 +0000
+++ checkbox-touch/confinement/generate.py	2016-01-05 21:24:37 +0000
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 import argparse
+import json
 import os
 import string
 import sys
@@ -49,15 +50,9 @@
 X-Ubuntu-Touch=true
 """
 
-HOOK = """
-"${partial_id}": {
-      "apparmor": "providers/${provider_name}/data/confined/${partial_id}.apparmor",
-      "desktop": "providers/${provider_name}/data/confined/${partial_id}.desktop",
-      "content-hub": "providers/${provider_name}/data/confined/${partial_id}-ch.json"
-}
-"""
 
-def generate_confinement(provider_name, partial_id, full_checkbox_name, qml_file):
+def generate_confinement(provider_name, partial_id, full_checkbox_name,
+                         qml_file):
     # generate content-hub file
     target_dir = os.path.join('data', 'confined')
     if not os.path.exists(target_dir):
@@ -72,17 +67,24 @@
     with open(apparmor_path, "wt") as f:
         f.write(APPARMOR)
 
- 
     # generate desktop file
     desktop_path = os.path.join(target_dir, partial_id + '.desktop')
     template = string.Template(DESKTOP)
     with open(desktop_path, "wt") as f:
-        f.write(template.substitute(partial_id=partial_id, provider_name=provider_name, full_checkbox_name=full_checkbox_name, qml_file=qml_file))
+        f.write(template.substitute(
+            partial_id=partial_id, provider_name=provider_name,
+            full_checkbox_name=full_checkbox_name, qml_file=qml_file))
 
-def generate_hook(provider_name, partial_id):
-    return string.Template(HOOK).substitute(
+    base = 'providers/{provider_name}/data/confined/{partial_id}'.format(
         provider_name=provider_name, partial_id=partial_id)
-
+    hook = {
+        partial_id: {
+            'apparmor': base + '.apparmor',
+            'desktop': base + '.desktop',
+            'content-hub': base + '-ch.json',
+        }
+    }
+    return hook
 
 
 def main():
@@ -91,7 +93,8 @@
     parser.add_argument('--checkbox_version', action='store', type=str)
     parser.add_argument('job_ids', nargs='+')
     args = parser.parse_args()
-    checkbox_name = "com.ubuntu.checkbox_checkbox-touch_" + args.checkbox_version
+    checkbox_name = ("com.ubuntu.checkbox_checkbox-touch_" +
+                     args.checkbox_version)
 
     # check if current dir looks like a provider - very dumb heuristic
     if not os.path.exists('manage.py'):
@@ -100,8 +103,9 @@
 
     hooks = ''
     for job in args.job_ids:
-        generate_confinement(provider_name, job, checkbox_name, job + '.qml')
-        hooks += generate_hook(provider_name, job)
+        hook = generate_confinement(
+            provider_name, job, checkbox_name, job + '.qml')
+        hooks += json.dumps(hook, sort_keys=True, indent=4)[1:-1]
 
     print("Add following hooks to your checkbox-touch.manifest:")
     print(hooks)
 
=== modified file 'checkbox-touch/confinement/plainbox-confined-shell.qml'
--- checkbox-touch/confinement/plainbox-confined-shell.qml	2015-07-23 10:48:33 +0000
+++ checkbox-touch/confinement/plainbox-confined-shell.qml	2016-01-05 21:24:37 +0000
@@ -33,7 +33,8 @@
     // information and functionality passed to qml job component
     property var testingShell: {
         "name": "Checkbox-touch qml confined shell",
-        "pageStack": pageStack
+        "pageStack": pageStack,
+        "python": py
     }
     property var activeTransfer;
 
@@ -94,7 +95,7 @@
         anchors.fill: parent
         Label {
             anchors.fill: parent
-            text: i18n.tr("sending results - you should not see this page :-)")
+            text: i18n.tr("Sending report - you should not see this page :-)")
         }
     }
     ContentPeer {
 
=== modified file 'checkbox-touch/get-libs'
--- checkbox-touch/get-libs	2015-09-01 18:06:45 +0000
+++ checkbox-touch/get-libs	2016-01-05 21:24:37 +0000
@@ -72,8 +72,7 @@
                 'python3-extras', 'python3-evdev']
     packages = ['libpython3.4', 'pyotherside', 'python3-xlsxwriter',
                 'python3-jinja2', 'python3-markupsafe', 'python3-padme',
-                'qml-module-qtquick-qchartjs', 'python3-requests',
-                'python3-urllib3']
+                'python3-requests', 'python3-urllib3', 'python3-guacamole']
     if get_autopilot:
         packages += ap_packages
     # uris will serve as a database of uris from which to download packages
@@ -221,7 +220,7 @@
     # ./usr/lib/python3/dist-packages are copied to ./lib/py.
     python3_libs = ['python3-xlsxwriter', 'python3-jinja2',
                     'python3-markupsafe', 'python3-padme', 'python3-requests',
-                    'python3-urllib3']
+                    'python3-urllib3', 'python3-guacamole']
 
     # additional libs needed to support autopilot tests.  these were obtained by
     # running apt-cache depends on python3-autopilot
@@ -246,7 +245,6 @@
     # ./usr/lib/{architecture}/qt5/qmlare copied to ./lib/{architecture}.
     # {architecture} may be one of multiarch_list
     qml_plugins_urls = [uris['pyotherside', arch] for arch in arch_list]
-    qml_plugins_urls += [uris['qml-module-qtquick-qchartjs', arch] for arch in arch_list]
     for qml_plugin in qml_plugins_urls:
         with tempfile.TemporaryDirectory() as tmp:
             get_package_from_url_and_extract(qml_plugin, tmp)
 
=== modified file 'checkbox-touch/manifest.json'
--- checkbox-touch/manifest.json	2015-07-31 13:07:18 +0000
+++ checkbox-touch/manifest.json	2016-01-05 21:24:37 +0000
@@ -1,19 +1,19 @@
 {
     "architecture": ["armhf", "i386", "amd64"],
-    "description": "System testing utility for Ubuntu",
+    "description": "Community testing utility for Ubuntu",
     "framework": "ubuntu-sdk-14.10",
     "hooks": {
-        "checkbox-touch": {
+        "pilot": {
             "apparmor": "checkbox-touch.json",
-            "desktop": "checkbox-touch.desktop"
+            "desktop": "pilot.desktop"
         }
     },
-    "maintainer": "Zygmunt Krynicki <[e-mail]>",
-    "name": "com.ubuntu.checkbox",
-    "title": "Checkbox",
-    "version": "1.2.1",
+    "maintainer": "Ubuntu App Cats <[e-mail]>",
+    "name": "com.ubuntu.pilot",
+    "title": "Pilot",
+    "version": "1.3",
     "x-source": {
         "vcs-bzr": "lp:checkbox",
-        "vcs-bzr-revno": "checkbox-touch-v1.2.1"
+        "vcs-bzr-revno": "checkbox-touch-v1.3.dev0"
     }
 }
 
=== added file 'checkbox-touch/pilot_256.png'
 Binary files checkbox-touch/pilot_256.png	1970-01-01 00:00:00 +0000 and checkbox-touch/pilot_256.png	2016-01-05 21:24:37 +0000 differ
=== added file 'checkbox-touch/pilot_512.png'
 Binary files checkbox-touch/pilot_512.png	1970-01-01 00:00:00 +0000 and checkbox-touch/pilot_512.png	2016-01-05 21:24:37 +0000 differ
=== modified file 'checkbox-touch/po/checkbox-touch.pot'
--- checkbox-touch/po/checkbox-touch.pot	2014-08-11 14:17:45 +0000
+++ checkbox-touch/po/checkbox-touch.pot	2016-01-05 21:24:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-11 15:18+0200\n"
+"POT-Creation-Date: 2015-10-15 12:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,18 +17,308 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: main.qml:26
-msgid "Simple"
-msgstr ""
-
-#: main.qml:39
-msgid "Hello.."
-msgstr ""
-
-#: main.qml:46
-msgid "Tap me!"