Merge lp:~roadmr/ubuntu/quantal/checkbox/0.14.2 into lp:ubuntu/quantal/checkbox

[Daniel Manrique]

Update of checkbox to 0.14.2. Note that this version includes a relocation of binaries and scripts to /usr/lib, to better comply with policy which disliked arch-specific binaries under /usr/share.

[lp:~roadmr/ubuntu/quantal/checkbox/0.14.2]

47. By Daniel Manrique on 2012-07-17

Fixed minor mishap in the changelog

[Luke Yelavich (themuso)]

Uploaded, thanks.

review: Approve

=== modified file 'checkbox/job.py'
--- checkbox/job.py	2012-06-26 16:07:04 +0000
+++ checkbox/job.py	2012-07-17 20:59:19 +0000
@@ -81,7 +81,7 @@
                     data = process.errdata
             elif exit_status == 127:
                 status = UNRESOLVED
-                data = _("Command not found.")
+                data = _("Command not found.").encode("utf-8")
             else:
                 status = FAIL
                 data = (process.errdata
@@ -89,9 +89,9 @@
         elif os.WIFSIGNALED(process_status):
             status = UNRESOLVED
             term_signal = os.WTERMSIG(process_status)
-            data = _("Command received signal %s: %s") % \
+            data = (_("Command received signal %s: %s") % \
                 (signal_to_name(term_signal),
-                 signal_to_description(term_signal))
+                 signal_to_description(term_signal))).encode("utf-8")
         else:
             raise Exception("Command not terminated: %s" \
                 % self.command)
@@ -104,4 +104,18 @@
 class JobStore(MessageStore):
     """A job store which stores its jobs in a file system hierarchy."""
 
-    pass
+    def add(self, job):
+        # Return if the same job is already in the store
+        if list(self._find_matching_messages(name=job["name"])):
+            return
+
+        return super(JobStore, self).add(job)
+
+    def _find_matching_messages(self, **kwargs):
+        for filename in self._walk_messages():
+            message = self._read_message(filename,cache=True)
+            for key, value in kwargs.items():
+                if message.get(key) != value:
+                    break
+            else:
+                yield filename

=== modified file 'checkbox/lib/dmi.py'
--- checkbox/lib/dmi.py	2011-11-18 12:46:21 +0000
+++ checkbox/lib/dmi.py	2012-07-17 20:59:19 +0000
@@ -18,6 +18,7 @@
 #
 import os
 
+from checkbox.lib.conversion import string_to_type
 
 # See also 3.3.4.1 of the "System Management BIOS Reference Specification,
 # Version 2.6.1" (Preliminary Standard) document, available from
@@ -223,3 +224,18 @@
             return version
 
         return None
+
+    @property
+    def size(self):
+        attribute = "%s_size" % self.category.lower()
+        size = self._attributes.get(attribute)
+
+        if size:
+            size = string_to_type(size)
+
+        return size
+
+    @property
+    def form(self):
+        attribute = "%s_form" % self.category.lower()
+        return self._attributes.get(attribute)

=== modified file 'checkbox/lib/resolver.py'
--- checkbox/lib/resolver.py	2012-06-26 16:07:04 +0000
+++ checkbox/lib/resolver.py	2012-07-17 20:59:19 +0000
@@ -53,12 +53,14 @@
             self.rdepends[dependency].append(key)
 
         # Circular dependencies check
-        def circular_dependencies(key):
+        def circular_dependencies(node):
             seen = circular_dependencies.seen
-            for dependency in self.depends.get(key, []):
+            for dependency in self.depends.get(node, []):
+                if key == dependency:
+                    raise Exception("circular dependency involving "
+                                    "%s and %s" % (key, node))
                 if dependency in seen:
-                    raise Exception("circular dependency involving "
-                                    "%s and %s" % (key, dependency))
+                    continue
                 seen.add(dependency)
                 circular_dependencies(dependency)
         circular_dependencies.seen = set((key,))

=== modified file 'checkbox/lib/tests/resolver.py'
--- checkbox/lib/tests/resolver.py	2012-06-26 16:07:04 +0000
+++ checkbox/lib/tests/resolver.py	2012-07-17 20:59:19 +0000
@@ -48,7 +48,9 @@
 
     def test_dependencies_multiple(self):
         self.resolver.add('a')
-        self.resolver.add('b')
+        # A appears as a dependency multiple times
+        # in b and c, but isn't a circular dependency
+        self.resolver.add('b', 'a')
         self.resolver.add('c', 'a', 'b')
 
         results = self.resolver.get_dependencies('c')

=== modified file 'checkbox/parsers/dmidecode.py'
--- checkbox/parsers/dmidecode.py	2012-06-22 17:04:14 +0000
+++ checkbox/parsers/dmidecode.py	2012-07-17 20:59:19 +0000
@@ -50,6 +50,8 @@
         "Type": "type",
         "Vendor": "vendor",
         "Version": "version",
+        "Size": "size",
+        "Form Factor": "form",
         }
 
     def __init__(self, stream):
@@ -97,11 +99,12 @@
             category = Dmi.type_names[type_index]
             category = category.upper().split(" ")[-1]
             if category not in (
-                "BOARD", "BIOS", "CHASSIS", "PROCESSOR", "SYSTEM"):
+                "BOARD", "BIOS", "CHASSIS", "DEVICE", "PROCESSOR", "SYSTEM"):
                 continue
 
             # Parse attributes
             attributes = {}
+
             for line in lines:
                 # Skip lines with an unsupported key/value pair
                 match = KEY_VALUE_RE.match(line)

=== added file 'checkbox/parsers/efi.py'
--- checkbox/parsers/efi.py	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/efi.py	2012-07-17 20:59:19 +0000
@@ -0,0 +1,52 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2011 Canonical Ltd.
+#
+# Checkbox 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+import re
+
+
+class EfiDevice:
+
+    path = "/sys/class/dmi/id/bios_version"
+    category = "EFI"
+
+    def __init__(self, product, vendor=None):
+        self.product = product
+        self.vendor = vendor
+
+
+class EfiParser:
+    """Parser for EFI information."""
+
+    def __init__(self, stream):
+        self.stream = stream
+
+    def run(self, result):
+        vendor_product_pattern = re.compile(
+            r"^(?P<vendor>.*)\s+by\s+(?P<product>.*)$")
+
+        for line in self.stream.readlines():
+            line = line.strip()
+            match = vendor_product_pattern.match(line)
+            if match:
+                product = match.group("product")
+                vendor = match.group("vendor")
+                device = EfiDevice(product, vendor)
+            else:
+                device = EfiDevice(line)
+
+            result.setEfiDevice(device)

=== modified file 'checkbox/parsers/submission.py'
--- checkbox/parsers/submission.py	2012-06-22 17:04:14 +0000
+++ checkbox/parsers/submission.py	2012-07-17 20:59:19 +0000
@@ -33,6 +33,7 @@
 from checkbox.parsers.cputable import CputableParser
 from checkbox.parsers.deferred import DeferredParser
 from checkbox.parsers.dmidecode import DmidecodeParser
+from checkbox.parsers.efi import EfiParser
 from checkbox.parsers.meminfo import MeminfoParser
 from checkbox.parsers.udevadm import UdevadmParser
 from checkbox.job import (FAIL, PASS, UNINITIATED, UNRESOLVED,
@@ -52,6 +53,7 @@
         register(("identifier",), self.addIdentifier)
         register(("test_run", "attachment",), self.addAttachment)
         register(("test_run", "device",), self.addDeviceState)
+        register(("test_run", "dmi_device",), self.addDmiDeviceState)
         register(("test_run", "distribution",), self.setDistribution)
         register(("test_run", "package_version",), self.addPackageVersion)
         register(("test_run", "test_result",), self.addTestResult)
@@ -93,21 +95,22 @@
             return
 
         self.dispatcher.publishEvent(
-            "attachment", {"name": command, "content": text })
+            "attachment", {"name": command, "content": text})
 
-        parsers = {
-            "cat /proc/cpuinfo": self.parseCpuinfo,
-            "cat /proc/meminfo": self.parseMeminfo,
+        context_parsers = {
+            "/proc/cpuinfo": self.parseCpuinfo,
+            "/proc/meminfo": self.parseMeminfo,
             "dmidecode": DmidecodeParser,
-            "udevadm info --export-db": self.parseUdevadm,
+            "udevadm": self.parseUdevadm,
+            "efi": EfiParser,
             }
-        parser = parsers.get(command)
-        if parser:
-            if not isinstance(text, str):
-                text = text.decode("utf-8")
-            stream = StringIO(text)
-            p = parser(stream)
-            p.run(self)
+        for context, parser in context_parsers.items():
+            if context in command:
+                if not isinstance(text, str):
+                    text = text.decode("utf-8")
+                stream = StringIO(text)
+                p = parser(stream)
+                p.run(self)
 
     def addCpu(self, cpu):
         self.dispatcher.publishEvent("cpu", cpu)
@@ -140,6 +143,17 @@
             self.dispatcher.publishEvent("make", device.vendor)
             self.dispatcher.publishEvent("version", device.version)
 
+        if device.category != "DEVICE":
+            self.dispatcher.publishEvent("dmi_device", device)
+
+    def addDmiDeviceState(self, test_run, dmi_device):
+        test_run.addDeviceState(
+            bus_name="dmi", category_name=dmi_device.category,
+            product_name=dmi_device.product, vendor_name=dmi_device.vendor,
+            product_id=None, vendor_id=None,
+            subproduct_id=None, subvendor_id=None,
+            driver_name=None, path=dmi_device.path)
+
     def addIdentifier(self, identifier):
         try:
             self.identifiers.append(identifier)
@@ -214,6 +228,9 @@
         parser = CpuinfoParser(cpuinfo, machine)
         parser.run(cpuinfo_result)
 
+    def setEfiDevice(self, device):
+        self.dispatcher.publishEvent("dmi_device", device)
+
     def setMeminfo(self, meminfo, meminfo_result):
         parser = MeminfoParser(meminfo)
         parser.run(meminfo_result)

=== added file 'checkbox/parsers/tests/efi.py'
--- checkbox/parsers/tests/efi.py	1970-01-01 00:00:00 +0000
+++ checkbox/parsers/tests/efi.py	2012-07-17 20:59:19 +0000
@@ -0,0 +1,63 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+#
+# Checkbox 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+from io import StringIO
+
+from unittest import TestCase
+
+from checkbox.parsers.efi import EfiParser
+
+
+class EfiResult:
+
+    def __init__(self):
+        self.device = None
+
+    def setEfiDevice(self, device):
+        self.device = device
+
+
+class TestCputableParser(TestCase):
+
+    def getParser(self, string):
+        stream = StringIO(string)
+        return EfiParser(stream)
+
+    def getResult(self, string):
+        parser = self.getParser(string)
+        result = EfiResult()
+        parser.run(result)
+        return result
+
+    def test_empty(self):
+        result = self.getResult("")
+        self.assertEquals(result.device, None)
+
+    def test_product(self):
+        result = self.getResult("""
+Foo Bar
+""")
+        self.assertEquals(result.device.vendor, None)
+        self.assertEquals(result.device.product, "Foo Bar")
+
+    def test_vendor_product(self):
+        result = self.getResult("""
+Foo by Bar
+""")
+        self.assertEquals(result.device.vendor, "Foo")
+        self.assertEquals(result.device.product, "Bar")

=== added file 'checkbox/tests/job.py'
--- checkbox/tests/job.py	1970-01-01 00:00:00 +0000
+++ checkbox/tests/job.py	2012-07-17 20:59:19 +0000
@@ -0,0 +1,37 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+#
+# Checkbox 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+import os
+import unittest
+from checkbox.job import Job
+
+class JobTest(unittest.TestCase):
+
+    def test_command_not_found(self):
+        job = Job('xwonkt','',10)
+        status, data, duration = job.execute()
+        #data is expected to be bytes
+        self.assertTrue(isinstance(data, bytes))
+
+    def test_existing_command(self):
+        test_string = 'checkbox'
+        job = Job('echo -n "%s"' % test_string,'',10)
+        status, data, duration = job.execute()
+        #data is expected to be bytes
+        self.assertTrue(isinstance(data, bytes))
+        self.assertEquals(data, test_string.encode())

=== added file 'checkbox/tests/message_files.py'
--- checkbox/tests/message_files.py	1970-01-01 00:00:00 +0000
+++ checkbox/tests/message_files.py	2012-07-17 20:59:19 +0000
@@ -0,0 +1,57 @@
+#
+# This file is part of Checkbox.
+#
+# Copyright 2012 Canonical Ltd.
+#
+# Checkbox 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, either version 3 of the License, or
+# (at your option) any later version.
+#
+# 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/>.
+#
+import os
+import unittest
+from checkbox.lib.path import path_expand_recursive
+from checkbox.lib.template_i18n import TemplateI18n
+
+
+class MessageFileFormatTest(unittest.TestCase):
+
+    def read_jobs(self):
+        messages = []
+        if os.environ.get("CHECKBOX_PACKAGING", 0):
+            jobs_path = "./build/share/checkbox/jobs"
+        else:
+            jobs_path = "./jobs"
+
+        for filename in path_expand_recursive(jobs_path):
+            if not filename.endswith("~"):
+                file = open(filename, "r", encoding="utf-8")
+                template = TemplateI18n()
+                messages += template.load_file(file, filename)
+        return messages
+
+    def setUp(self):
+        self.messages = self.read_jobs()
+
+    def test_job_files_valid(self):
+        messages = self.messages
+        self.assertTrue(messages)
+        self.assertTrue(len(messages) > 0)
+
+    def test_all_messages_have_name(self):
+        messages = self.messages
+        for message in messages:
+            self.assertIn("name", message)
+
+    def test_all_messages_have_command_or_description(self):
+        messages = self.messages
+        for message in messages:
+            self.assertTrue("command" in message or "description" in message)

=== added file 'data/websites/html5_video.html'
--- data/websites/html5_video.html	1970-01-01 00:00:00 +0000
+++ data/websites/html5_video.html	2012-07-17 20:59:19 +0000
@@ -0,0 +1,14 @@
+<html>
+<head>
+<title>HTML5 Video Test</title>
+</head>
+<body>
+<div>This video will play in a loop and reload every 5 seconds</div>
+<div>
+<video width="320" height="240" controls autoplay loop>
+  <source src="../video/Ogg_Theora_Video.ogv" type="video/ogg" />
+  Your browser does not support the video tag.
+</video>
+</div>
+</body>
+<html>

=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2012-06-22 17:04:14 +0000
+++ data/whitelists/default.whitelist	2012-07-17 20:59:19 +0000
@@ -3,6 +3,7 @@
 device
 dmi
 dpkg
+efi
 gconf
 lsb
 meminfo
@@ -51,6 +52,7 @@
 dmesg_attachment
 dmi_attachment
 dmidecode_attachment
+efi_attachment
 lsmod_attachment
 lspci_attachment
 gcov_attachment

=== modified file 'data/whitelists/smoke.whitelist'
--- data/whitelists/smoke.whitelist	2012-06-22 17:04:14 +0000
+++ data/whitelists/smoke.whitelist	2012-07-17 20:59:19 +0000
@@ -7,6 +7,7 @@
 cdimage
 dmi
 dpkg
+efi
 gconf
 lsb
 meminfo

=== modified file 'data/whitelists/sniff.whitelist'
--- data/whitelists/sniff.whitelist	2012-06-22 17:04:14 +0000
+++ data/whitelists/sniff.whitelist	2012-07-17 20:59:19 +0000
@@ -7,6 +7,7 @@
 cdimage
 dmi
 dpkg
+efi
 gconf
 lsb
 meminfo

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-26 16:07:04 +0000
+++ debian/changelog	2012-07-17 20:59:19 +0000
@@ -1,3 +1,117 @@
+checkbox (0.14.2) quantal; urgency=low
+
+  * New upstream release (LP: #1025869)
+
+  [Jeff Marcom]
+  * scripts/gpu_test - Fixed potential thread exiting issue.
+
+  [Javier Collado]
+  * Fixed detection of circular references in resolver.
+
+  [Jeff Lane]
+  * New version 0.14.2 for Quantal Quetzal development.
+  * jobs/cpu.txt.in: added cpu_scaling_test log attachment job
+  * jobs/disk.txt.in: modified block_device requirements so they'll work right
+    jobs/info.txt.in: added block_device resource requirements to hdparm job so
+    it won't run on removable stuff where it's not necessary.
+  * jobs/info.txt.in: removed extraneous fwts_log job
+    jobs/miscellanea.txt.in: modified fwts_results.log job
+  * scripts/optical_detect: minor tweak to send error output to stderr
+    scripts/optical_read_test: added root user check because this needs to be
+    run with root privileges. Added some additional output for stderr for
+    failures so we will know WHY a test or the script failed. Replaced 
+    sys.stdout.write() and flush() calls with simple print statements.
+  * scripts/ipmi_test: output tweaks so error messages now go to stderr. No BMC
+    message is a little more clear. Module failed to load now generates an
+    error rather than a simple exit.
+  * scripts/network_device_info: minor change so that the fail message now
+    specifies that it was an error and outputs to stderr properly.
+  * scripts/disk_smart: Improvements to the logging and output during testing.
+  * scripts/cpu_scaling_test: lots of output changes using logging module.
+    renamed script to frequency_governors_test to be more descriptive and less
+    confusing. Added a --log option to write logs to an actual file
+    jobs/cpu.txt.in: added an attachment job to attach the freq_governors log.
+    Modified cpu/frequency_governors to write to log file
+  * scripts/cpu_offlining: added an extra bit of output in case of failures. 
+  * scripts/fwts_test: improved console output so that the info displayed in
+    submission.xml is more useful.
+    jobs/power-management.txt.in: added job to attach fwts_wakealarm.log to
+    results.
+  * scripts/network_ntp_test: Tweaked output to use log levels more
+    appropriately. Added some decoding so that bytes output show up as strings
+    properly in output. Converted from optparse to argparse. Added a root
+    check because this needs to be root to properly run.
+  * scripts/disk_read_performance_test: Added extra targeted output so that
+    users can understand what's going on. Moved the exit bits so the test will
+    actuall run on multiple drives as originally intended and not exit on the
+    first failure.
+  * scripts/removable_storage_test: vastly improved the output from that script
+    and also introduced some new error handling to cover a couple conditions
+    that generated unhelpful tracebacks.
+  * scripts/memory_compare: changed the output a little so failures now dump
+    data to stderr and success to stdout. Also added a try/except block to
+    catch possible ZeroDivisionError cases if dmi or meminfo return 0 (found on
+    my local system due to a library issue)
+  * jobs/power-management.txt.in: improved rtc and tickless idle tests to
+    provide more useful output, even though they are very simple tests.
+  * jobs/networking.txt.in: added some output to networking/multi_nic so a 
+    failure due to unconfigured ifaces generates something beyond a blank line
+  * scripts/cpu_topology: Changed it so there is less output on success and
+    more useful output on failure. Fixed a bug in the test for Failure that
+    caused the False condition to never be met.
+  * scripts/network_bandwidth_test: fleshed out the output to make it a little
+    more useful in both debug and info levels. Was going to set the
+    networking/bandwidth job to debug, but the info output should now be
+    sufficient to begin diagnosing test failures.
+  * jobs/usb.txt.in: Added output to usb/detect in case no USB controllers are
+    found. Added dependencies on the udisks package which may not be installed
+    by default.
+    debian/control: Added udisks as a suggests for checkbox as it's required
+    for the USB tests to function.
+  * scripts/memory_test: converted from optparse to argparse. Added some extra
+    stderr output that may be useful if this test fails. redirected some
+    existing error messages to stderr also
+  * scripts/disk_stats_test: some minor changes to output. Also, error output
+    now goes to stderr on test failure.
+
+  [Marc Tardif]
+  * Fixed duplicate jobs appearing in the store when rerunning jobs.
+  * Fixed packaging to install scripts under /usr/lib.
+
+  [Daniel Manrique]
+  * Added a message file format test that does some simplistic checks
+    on jobs/* files to ensure they are sane.
+  * Fixed two typos in jobs/suspend.txt.in.
+  * Merging of translations into job files prior to running message 
+    file format test, to further ensure that translated strings
+    and field descriptions are parsed correctly.
+  * Explicit encoding of error strings in Job.execute, so that data returned
+    is consistent and invokers of this method don't choke on it. (LP:
+    #1024541)
+
+  [Brendan Donegan]
+  * Make a call to rfkill unblock in the create_connection script, incase
+    those nasty Broadcom drivers have left a soft-block on the wireless after
+    loading. Also do a bit of refactoring to use check_output and check_call
+    instead of Popen (LP: #1019162)
+  * Move the call to unblock to before the connection is created
+  * Reimplemented memory_compare in python3 and restructured it to put
+    things into dictionaries for easy access. Also fixed bug with detecting
+    non-RAM devices as RAM. (LP: #960087)
+  * Wait longer to get the window handle in gpu_test, so that we don't fall foul
+    of timing issues. (LP: #1018563)
+  * Catch exception raised in memory_compare by DMI RAM entries with No Module
+    Installed in the Size field (LP: #1023220)
+  * Also unblock wireless before wireless_scanning test, as I neglected to do
+    this before. (LP: #1023619)
+  * Replace Flash video playback with HTML5 video playback. This has better
+    support in Ubuntu and is more relevant (LP: #1024078)
+
+  [Sylvain Pineau]
+  * Add the firmware version (BIOS or UEFI) to the XML report.
+
+ -- Daniel Manrique <[e-mail]>  Tue, 17 Jul 2012 16:27:55 -0400
+
 checkbox (0.14.1) quantal-proposed; urgency=low
 
   * New upstream release (LP: #1018571)

=== modified file 'debian/checkbox-qt.install'
--- debian/checkbox-qt.install	2012-02-15 00:11:21 +0000
+++ debian/checkbox-qt.install	2012-07-17 20:59:19 +0000
@@ -1,6 +1,6 @@
 usr/bin/checkbox-qt
 usr/share/applications/checkbox-qt.desktop
-usr/share/checkbox/qt/*
 usr/share/checkbox/examples/checkbox-qt.ini
 usr/share/dbus-1/services/*
+usr/lib/checkbox/qt/*
 usr/lib/python*/*-packages/checkbox_qt/*

=== modified file 'debian/checkbox.config'
--- debian/checkbox.config	2011-05-17 09:48:07 +0000
+++ debian/checkbox.config	2012-07-17 20:59:19 +0000
@@ -8,8 +8,6 @@
         db_input medium checkbox/plugins/jobs_info/whitelist || true
         db_input medium checkbox/plugins/launchpad_exchange/transport_url || true
         db_input medium checkbox/plugins/launchpad_prompt/email || true
-        db_input medium checkbox/plugins/apport_prompt/default_enabled || true
-        db_input medium checkbox/plugins/apport_prompt/default_package || true
         db_input medium checkbox/plugins/proxy_info/http_proxy || true
         db_input medium checkbox/plugins/proxy_info/https_proxy || true
         db_go

=== modified file 'debian/checkbox.install'
--- debian/checkbox.install	2010-03-09 16:58:36 +0000
+++ debian/checkbox.install	2012-07-17 20:59:19 +0000
@@ -9,8 +9,8 @@
 usr/share/checkbox/patches/*
 usr/share/checkbox/plugins/*
 usr/share/checkbox/report/*
-usr/share/checkbox/scripts/*
 usr/share/checkbox/examples/checkbox.ini
 usr/lib/python*/*-packages/checkbox/*
+usr/lib/checkbox/bin/*
 usr/share/apport/package-hooks/source_checkbox.py
 usr/share/apport/general-hooks/checkbox.py

=== modified file 'debian/checkbox.links'
--- debian/checkbox.links	2009-10-14 11:22:06 +0000
+++ debian/checkbox.links	2012-07-17 20:59:19 +0000
@@ -1,1 +1,2 @@
 etc/checkbox.d usr/share/checkbox/configs
+usr/lib/checkbox/bin usr/share/checkbox/scripts

=== modified file 'debian/checkbox.templates'
--- debian/checkbox.templates	2011-05-17 09:48:07 +0000
+++ debian/checkbox.templates	2012-07-17 20:59:19 +0000
@@ -1,15 +1,3 @@
-Template: checkbox/plugins/apport_prompt/default_enabled
-Type: boolean
-_Description: Enable bug reporting by default? 
- If this option is set to Yes, then checkbox will ask if the user wants
- to file a bug for failing tests, even if apport is not enabled.
-
-Template: checkbox/plugins/apport_prompt/default_package
-Type: string
-_Description: Default package to report bugs against:
- When filing a new bug through checkbox, if it does not guess the 
- package, the default package that the bug will be file against.
-
 Template: checkbox/plugins/jobs_info/blacklist
 Type: string
 _Description: Test suite blacklist:

=== modified file 'debian/control'
--- debian/control	2012-06-26 16:07:04 +0000
+++ debian/control	2012-07-17 20:59:19 +0000
@@ -2,28 +2,30 @@
 Section: utils
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python3-Version: >= 3.2
 Build-Depends: debhelper (>= 9.2),
                dh-translations,
                libqt4-dev,
                po-debconf,
-               python3 (>= 3.2),
+               python,
+               python-distutils-extra,
+               python3,
                python3-distutils-extra,
+               python3-lxml,
                qt4-qmake
 Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
 
 Package: checkbox
 Section: python
 Architecture: any
-Depends: debconf, python3-lxml, udev, ${misc:Depends}, ${python3:Depends}
+Depends: debconf, python3-lxml, udev, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
 Recommends: dpkg (>= 1.13),
             gir1.2-gst-plugins-base-0.10 | gir1.2-gst-plugins-base-1.0,
             gstreamer0.10-gconf | gstreamer1.0-plugins-good,
             lsb-release,
             perl,
             pm-utils,
-            python-apport,
             python3-apt,
             python3-dbus,
             python3-gi
@@ -45,6 +47,7 @@
           sox,
           stress,
           sysstat,
+          udisks,
           wmctrl,
           wodim
 Description: System testing application
@@ -91,7 +94,8 @@
          libqt4-dbus,
          libqtgui4,
          python3-dbus,
-         ${misc:Depends}
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: QT4 interface for checkbox
  This project provides an extensible interface for system testing. The
  results can then be sent to Launchpad.

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2012-06-22 17:04:14 +0000
+++ debian/po/ast.po	2012-07-17 20:59:19 +0000
@@ -6,116 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-03-21 15:41+0000\n"
 "Last-Translator: Xandru <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
-"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "¿Activar informes de fallos de mou predetermináu? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Si esta opción s'afita a Sí, Checkbox va entrugar al usuariu si desea "
-"informar de fallos por cada prueba fallida, inclusive si apport ta activáu."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Paquete predetermináu escontra'l qu'informar de fallos:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr "Llista de xeres a executar mientres se faen pruebes con checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Corréu de Launchpad:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "Direición de corréu usada p'aniciar sesión en Launchpad."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "Proxy HTTP:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "Proxy HTTP a usar en llugar del especificáu nel entornu."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "Proxy HTTPS:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "Proxy HTTPS a usar en llugar del especificáu nel entornu."

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2012-06-22 17:04:14 +0000
+++ debian/po/cs.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-03-05 19:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <[e-mail]>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2012-06-22 17:04:14 +0000
+++ debian/po/de.po	2012-07-17 20:59:19 +0000
@@ -6,61 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-09-27 06:16+0000\n"
 "Last-Translator: Hendrik Knackstedt <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Fehlerberichterstattung standardmäßig aktivieren? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Wenn diese Option auf Ja gesetzt ist, wird Checkbox den Nutzer fragen, ob "
-"ein Fehlerbericht für fehlgeschlagene Tests erstellt werden soll, auch wenn "
-"apport nicht aktiviert ist."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Paket, für das standardmäßig Fehlerberichte erstellt werden:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"Wenn ein neuer Fehlerbericht mithilfe von Checkbox erstellt und das "
-"betroffene Paket nicht erkannt wird, wird der Fehlerbericht für das "
-"angegebene standardmäßige Paket erstellt."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Sperrliste der Testsammlung:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 "Liste der Aufträge, die während des Testens mit Checkbox niemals ausgeführt "
@@ -68,50 +33,50 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Positivliste der Testsammlung:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 "Liste der Aufträge, die während des Testens mit Checkbox ausgeführt werden."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "Transport-URL:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL, an welche die Ergebnisse gesendet werden."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Launchpad-E-Mail:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "E-Mail-Adresse, die zum Anmelden bei Launchpad verwendet wird."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "HTTP-Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 "HTTP-Proxy, der anstelle des in den Umgebungseinstellungen festgelegten "
@@ -119,13 +84,13 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "HTTPS-Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""
 "HTTPS-Proxy, der anstelle des in den Umgebungseinstellungen festgelegten "

=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2012-06-22 17:04:14 +0000
+++ debian/po/en_AU.po	2012-07-17 20:59:19 +0000
@@ -6,118 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-21 02:39+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Enable bug reporting by default? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Default package to report bugs against:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Test suite blacklist:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr "List of job files to never run when testing with checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Test suite whitelist:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr "List of jobs to run when testing with checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "Transport URL:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL where to send submissions."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Launchpad E-mail:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "E-mail address used to sign in to Launchpad."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "HTTP Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "HTTP proxy to use instead of the one specified in environment."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "HTTPS Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "HTTPS proxy to use instead of the one specified in environment."

=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2012-06-22 17:04:14 +0000
+++ debian/po/en_GB.po	2012-07-17 20:59:19 +0000
@@ -6,118 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-08-09 23:13+0000\n"
 "Last-Translator: Alfredo Hernández <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Enable bug reporting by default? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Default package to report bugs against:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Test suite blacklist:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr "List of job files to never run when testing with checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Test suite whitelist:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr "List of jobs to run when testing with checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "Transport URL:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL where to send submissions."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Launchpad E-mail:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "E-mail address used to sign in to Launchpad."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "HTTP Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "HTTP proxy to use instead of the one specified in environment."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "HTTPS Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "HTTPS proxy to use instead of the one specified in environment."

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2012-06-22 17:04:14 +0000
+++ debian/po/es.po	2012-07-17 20:59:19 +0000
@@ -6,60 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-04-06 14:01+0000\n"
 "Last-Translator: Daniel Manrique <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "¿Activar informes de error de manera predeterminada? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Si esta opción se establece a Sí, Checkbox preguntará al usuario si desea "
-"informar de errores por cada prueba fallida, aún si apport está desactivado."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Paquete predeterminado sobre el cual informar errores:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"Cuando se reporta un error a través de Comprobación del Sistema, si no se "
-"logra determinar automáticamente el paquete, éste es el paquete contra el "
-"cual se reportará el error."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Lista negra del conjunto de pruebas:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 "Lista de archivos de trabajo a no ejecutar cuando se prueba con Comprobación "
@@ -67,61 +33,62 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Lista blanca del conjunto de pruebas:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
-msgstr "Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
+msgstr ""
+"Lista de tareas a ejecutar mientras se realizan pruebas con checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "URL de transporte:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL de destino de los envíos."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Correo electrónico de Launchpad:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 "Dirección de correo electrónico usada para iniciar sesión en Launchpad."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "Proxy HTTP:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "Proxy HTTP que se usará en lugar del especificado en el entorno."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "Proxy HTTPS:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "Proxy HTTPS que se usará en lugar del especificado en el entorno."

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2012-06-22 17:04:14 +0000
+++ debian/po/fr.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-19 10:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2012-06-22 17:04:14 +0000
+++ debian/po/he.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-26 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2012-06-22 17:04:14 +0000
+++ debian/po/hu.po	2012-07-17 20:59:19 +0000
@@ -6,116 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-18 12:57+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Legyen a hibajelentés engedélyezve alapértelmezetten? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Ha ez a funkció engedélyezve van, a Checkbox sikertelen teszt esetén "
-"felkínálja a hibajelentést, akkor is, ha az apport nincs engedélyezve."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2012-06-22 17:04:14 +0000
+++ debian/po/it.po	2012-07-17 20:59:19 +0000
@@ -6,59 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-09-22 14:07+0000\n"
 "Last-Translator: Sergio Zanchetta <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Abilitare in modo predefinito la segnalazione di bug? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Se questa opzione è impostata a Sì, checkbox chiederà all'utente se vuole "
-"segnalare un bug per i test falliti, anche se apport non è abilitato."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Pacchetto predefinito rispetto al quale segnalare i bug:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"Pacchetto predefinito rispetto al quale segnalare i bug, se non ne viene "
-"ipotizzato alcuno, quando un nuovo bug viene segnalato attraverso checkbox."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Blacklist dei set di test:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 "Elenco dei file di lavori che non devono essere mai eseguiti durante i test "
@@ -66,49 +33,49 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Whitelist dei set di test:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr "Elenco dei lavori da eseguire durante i test con checkbox."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "URL di trasporto:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL al quale effettuare gli invii."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Email Launchpad:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "Indirizzo email usato per accedere a Launchpad."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "Proxy HTTP:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 "Proxy HTTP da usare al posto di quello specificato nella variabile "
@@ -116,13 +83,13 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "Proxy HTTPS:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""
 "Proxy HTTPS da usare al posto di quello specificato nella variabile "

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2012-06-22 17:04:14 +0000
+++ debian/po/ja.po	2012-07-17 20:59:19 +0000
@@ -6,119 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-25 17:03+0000\n"
 "Last-Translator: Fumihito YOSHIDA <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "デフォルトでバグ報告を有効にしますか？ "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどう"
-"か、checkboxが確認するようになります。これはapportが有効になっていなくても機"
-"能します。"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "デフォルトでバグ報告の対象とするパッケージ:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
-"フォルトのパッケージ名を用いて報告します。"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "テストスイートのブラックリスト:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr "checkboxによるテスト時に、実行しないジョブのリスト。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "テストスイートのホワイトリスト:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr "checkboxによるテスト時に、実行するジョブのリスト。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "送信先URL:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "Launchpadへのサインインに用いるメールアドレス。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "HTTP Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "環境設定で指定されているProxyとは別の、登録時に利用するHTTP Proxy。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "HTTPS Proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "環境設定で指定されているProxyとは別の、登録時に利用するHTTPS Proxy。"

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2012-06-22 17:04:14 +0000
+++ debian/po/nl.po	2012-07-17 20:59:19 +0000
@@ -6,61 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-08-17 12:02+0000\n"
 "Last-Translator: Rachid <Unknown>\n"
 "Language-Team: Dutch <[e-mail]>\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Bugs rapporteren standaard inschakelen? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Wanneer deze optie is ingeschakeld zal checkbox vragen of de gebruiker een "
-"bug wilt rapporteren voor mislukte tests, zelfs wanneer apport is "
-"uitgeschakeld."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Standaard pakket om bugs voor te rapporteren:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"Wanneer een nieuwe bug wordt gerapporteerd via checkbox, en het het pakket "
-"kan niet geraden worden, dan zal de bug worden gerapporteerd voor het "
-"standaardpakket."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Testsuite zwarte lijst:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 "Lijst van taken die nooit uitgevoerd moeten worden wanneer er getest wordt "
@@ -68,13 +33,13 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Testsuite witte lijst:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 "Lijst van taken die uitgevoerd moeten worden wanneer er getest wordt met "
@@ -82,37 +47,37 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "Transport-URL:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL waar de inzendingen naartoe worden gestuurd."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Launchpad e-mail:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "E-mailadres om bij Launchpad aan te melden."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "HTTP-proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 "HTTP-proxy om te gebruiken in plaats van degene die in de omgeving is "
@@ -120,13 +85,13 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "HTTPS-proxy:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""
 "HTTPS-proxy om te gebruiken in plaats van degene die in de omgeving is "

=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2012-06-22 17:04:14 +0000
+++ debian/po/oc.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-02-24 07:45+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <[e-mail]>\n"
 "Language-Team: Occitan (post 1500) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "Mandatari HTTP :"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2012-06-22 17:04:14 +0000
+++ debian/po/pl.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-18 21:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <[e-mail]>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2012-06-22 17:04:14 +0000
+++ debian/po/pt_BR.po	2012-07-17 20:59:19 +0000
@@ -6,60 +6,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-05-12 03:33+0000\n"
 "Last-Translator: eniomarconcini <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "Habilitar o relatório de erro por padrão? "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"Se esta opção for definida como Sim, então o Checkbox irá perguntar se o "
-"usuário quer relatar o erro dos testes que falharam, mesmo que o Apport não "
-"esteja habilitado."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "Pacote padrão para relatar erros:"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-"Quando estiver registrando um novo erro através do Checkbox, se ele não "
-"adivinhar o pacote, o pacote padrão do qual o erro será relatado."
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "Lista negra da suíte de testes:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 "Lista de arquivos de trabalho para nunca serem executados quando estiver "
@@ -67,13 +33,13 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "Lista branca da suíte de testes:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 "Lista de arquivos de trabalho para executar enquanto estiver testando com "
@@ -81,48 +47,48 @@
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "Transportar URL:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "URL para enviar relatórios."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "E-mail do Launchpad:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "Endereço de e-mail usado para entrar no Launchpad."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "Proxy HTTP:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "Proxy HTTP para usar em vez do especificado pelo ambiente."
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "Proxy HTTPS:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "Proxy HTTPS para usar em vez do especificado pelo ambiente."

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2012-06-22 17:04:14 +0000
+++ debian/po/ro.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-10-27 20:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <[e-mail]>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2012-06-22 17:04:14 +0000
+++ debian/po/ru.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-18 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <[e-mail]>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2011-05-17 09:48:07 +0000
+++ debian/po/templates.pot	2012-07-17 20:59:19 +0000
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\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,102 +17,74 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2012-06-22 17:04:14 +0000
+++ debian/po/tr.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-05-18 12:51+0000\n"
 "Last-Translator: Hasan Yılmaz <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Launchpad E-posta:"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2012-06-22 17:04:14 +0000
+++ debian/po/uk.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-01-21 07:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2012-06-22 17:04:14 +0000
+++ debian/po/zh_CN.po	2012-07-17 20:59:19 +0000
@@ -6,114 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2012-05-09 02:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Simplified) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr ""

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2012-06-22 17:04:14 +0000
+++ debian/po/zh_TW.po	2012-07-17 20:59:19 +0000
@@ -6,116 +6,85 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-03-29 15:19+0200\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-07-12 15:37-0400\n"
 "PO-Revision-Date: 2011-07-26 15:03+0000\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-30 05:17+0000\n"
-"X-Generator: Launchpad (build 15316)\n"
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid "Enable bug reporting by default? "
-msgstr "預設啟用臭蟲回報？ "
-
-#. Type: boolean
-#. Description
-#: ../checkbox.templates:1001
-msgid ""
-"If this option is set to Yes, then checkbox will ask if the user wants to "
-"file a bug for failing tests, even if apport is not enabled."
-msgstr ""
-"若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提"
-"交失敗測試的臭蟲回報。"
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid "Default package to report bugs against:"
-msgstr "回報臭蟲的預設套件："
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:2001
-msgid ""
-"When filing a new bug through checkbox, if it does not guess the  package, "
-"the default package that the bug will be file against."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../checkbox.templates:3001
+"X-Launchpad-Export-Date: 2012-07-14 05:13+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
+
+#. Type: string
+#. Description
+#: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
 msgstr "測試套組黑名單："
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:3001
+#: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
 msgstr "checkbox 測試時永不執行的工作清單。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
 msgstr "測試套組白名單："
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:4001
+#: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
 msgstr "checkbox 測試時要執行的工作清單。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "Transport URL:"
 msgstr "傳輸網址："
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:5001
+#: ../checkbox.templates:3001
 msgid "URL where to send submissions."
 msgstr "傳送報告提交的所在網址。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
 msgstr "Launchpad 電子郵件："
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:6001
+#: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
 msgstr "用來登入 Launchpad 的電子郵件位址。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
 msgstr "HTTP 代理："
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:7001
+#: ../checkbox.templates:5001
 msgid "HTTP proxy to use instead of the one specified in environment."
 msgstr "要使用的 HTTP 代理，而不是使用環境內所指定的。"
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS Proxy:"
 msgstr "HTTPS 代理："
 
 #. Type: string
 #. Description
-#: ../checkbox.templates:8001
+#: ../checkbox.templates:6001
 msgid "HTTPS proxy to use instead of the one specified in environment."
 msgstr "要使用的 HTTPS 代理，而不是使用環境內所指定的。"

=== removed file 'debian/pycompat'
--- debian/pycompat	2009-01-20 16:46:15 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/rules'
--- debian/rules	2012-06-22 17:04:14 +0000
+++ debian/rules	2012-07-17 20:59:19 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with translations,python3
+	dh "$@" --with python2,python3,translations
 
 override_dh_auto_build:
 	(cd qt/frontend; qmake-qt4; make)
@@ -13,6 +13,15 @@
 	set -ex; for python in $(shell py3versions -r); do \
 		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done;
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/checkbox
+	mv  $(CURDIR)/debian/tmp/usr/share/checkbox/scripts  $(CURDIR)/debian/tmp/usr/lib/checkbox/bin
+
+override_dh_auto_test:
+ifeq (, $(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	# drop LD_PRELOAD to avoid running under fakeroot; drop TMPDIR to work
+	# around LP#972324 (set by autopkgtest)
+	env -u LD_PRELOAD -u TMPDIR CHECKBOX_PACKAGING=1 ./test
+endif	
 
 override_dh_installdeb:
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm

=== removed file 'debian/watch'
--- debian/watch	2009-01-20 16:46:15 +0000
+++ debian/watch	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-version=3
-https://launchpad.net/checkbox/+download
-https://launchpad.net/checkbox/.*/checkbox_(.+).tar.gz

=== modified file 'install/postinst'
--- install/postinst	2012-06-22 17:04:14 +0000
+++ install/postinst	2012-07-17 20:59:19 +0000
@@ -32,7 +32,7 @@
         # Apply the patch file if it is less than the given version
         patch_version=`basename $patch_file`
         if dpkg --compare-versions $version lt $patch_version; then
-            $patch_file $patch_package
+            $patch_file $package
         fi
 
         previous_version=`basename $patch_file`

=== modified file 'jobs/cpu.txt.in'
--- jobs/cpu.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/cpu.txt.in	2012-07-17 20:59:19 +0000
@@ -4,10 +4,16 @@
  package.name == 'linux'
  package.name == 'fwts'
 user: root
-command: fwts_test -c -l $CHECKBOX_DATA/cpu_scaling_test.log
+command: fwts_test -c -l ${CHECKBOX_DATA}/scaling_test.log
 _description:
  Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).
 
+plugin: attachment
+name: cpu/scaling_test-log-attach
+command: [[ -e ${CHECKBOX_DATA}/scaling_test.log ]] && cat ${CHECKBOX_DATA}/scaling_test.log
+_description:
+ Attaches the log generated by cpu/scaling_test to the results
+
 plugin: shell
 name: cpu/clocktest
 requires: package.name == 'linux'
@@ -34,6 +40,6 @@
 name: cpu/frequency_governors
 requires: package.name == 'linux'
 user: root
-command: nice -n -20 cpu_scaling_test 
+command: nice -n -20 frequency_governors_test --debug 
 _description:
  This test checks that CPU frequency governors are obeyed when set.

=== modified file 'jobs/disk.txt.in'
--- jobs/disk.txt.in	2012-06-26 16:07:04 +0000
+++ jobs/disk.txt.in	2012-07-17 20:59:19 +0000
@@ -13,7 +13,7 @@
  name: disk/stats_`ls /sys$path/block`
  requires: 
   device.path == "$path"
-  block_device.name == `ls /sys$path/block` and block_device.state != 'removable'
+  block_device.name == "`ls /sys$path/block`" and block_device.state != 'removable'
   package.name == 'linux'
  user: root
  command: disk_stats_test `ls /sys$path/block | sed 's|!|/|'`
@@ -33,7 +33,7 @@
  name: disk/smart_`ls /sys$path/block`
  requires: 
   device.path == "$path"
-  block_device.name == `ls /sys$path/block` and block_device.state != 'removable'
+  block_device.name == "`ls /sys$path/block`" and block_device.state != 'removable'
  description:
   This tests the SMART capabilities for $product (Note that this test will not work against hardware RAID)
  user: root
@@ -51,7 +51,7 @@
  name: disk/max_diskspace_used_`ls /sys$path/block`
  requires: 
   device.path == "$path"
-  block_device.name == `ls /sys$path/block` and block_device.state != 'removable'
+  block_device.name == "`ls /sys$path/block`" and block_device.state != 'removable'
  description: Maximum disk space test for $product
  user: root
  command: max_diskspace_used `ls /sys$path/block | sed 's|!|/|'`
@@ -68,7 +68,7 @@
  name: disk/read_performance_`ls /sys$path/block`
  requires:
   device.path == "$path"
-  block_device.name == `ls /sys$path/block` and block_device.state != 'removable'
+  block_device.name == "`ls /sys$path/block`" and block_device.state != 'removable'
   package.name == 'linux'
  description: Disk performance test for $product
  user: root
@@ -87,7 +87,7 @@
  user: root
  requires:
   device.path == "$path"
-  block_device.name == `ls /sys$path/block` and block_device.state != 'removable'
+  block_device.name == "`ls /sys$path/block`" and block_device.state != 'removable'
   package.name == 'linux'
  description: Disk I/O stress test for $product
  command: storage_test `ls /sys$path/block | sed 's|!|/|'`

=== modified file 'jobs/firewire.txt.in'
--- jobs/firewire.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/firewire.txt.in	2012-07-17 20:59:19 +0000
@@ -1,5 +1,7 @@
 plugin: manual
 name: firewire/insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert firewire
 _description:
  PURPOSE:
@@ -15,6 +17,8 @@
 plugin: shell
 name: firewire/storage-test
 depends: firewire/insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_test firewire
 _description:
  This is an automated test which performs read/write operations on an attached
@@ -23,6 +27,8 @@
 plugin: manual
 name: firewire/remove
 depends: firewire/storage-test
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove firewire
 _description:
  PURPOSE:

=== modified file 'jobs/info.txt.in'
--- jobs/info.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/info.txt.in	2012-07-17 20:59:19 +0000
@@ -25,6 +25,12 @@
 command: dmidecode | iconv -t 'utf-8' -c
 _description: Attaches dmidecode output
 
+name: efi_attachment
+plugin: attachment
+user: root
+command: [ -d /sys/firmware/efi ] && grep -o --color=never 'EFI v.*' /var/log/kern.log || cat /sys/class/dmi/id/bios_version
+_description: Attaches the firmware version
+
 name: lspci_attachment
 plugin: attachment
 command: lspci -vvnn | iconv -t 'utf-8' -c
@@ -89,13 +95,6 @@
 _description: Attaches a list of the currently running kernel modules.
 
 plugin: attachment
-name: fwts_log
-depends: miscellanea/fwts_test
-_description: Gather log from the Firmware Test Suite run.
-command:
- cat $CHECKBOX_DATA/fwts_results.log
-
-plugin: attachment
 name: acpi_sleep_attachment
 command: [ -e /proc/acpi/sleep ] && cat /proc/acpi/sleep
 _description: Attaches the contents of /proc/acpi/sleep if it exists.
@@ -119,7 +118,9 @@
  cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"'
  plugin: attachment
  name: info/hdparm_`ls /sys$path/block`.txt
- requires: device.path == "$path"
+ requires: 
+  device.path == "$path"
+  block_device.name == "`ls /sys$path/block`" and block_device.state != 'removable'
  user: root
  command: hdparm -I /dev/`ls /sys$path/block`
  EOF

=== modified file 'jobs/install.txt.in'
--- jobs/install.txt.in	2011-11-18 12:46:21 +0000
+++ jobs/install.txt.in	2012-07-17 20:59:19 +0000
@@ -2,6 +2,8 @@
 name: install/apt-get-gets-updates
 requires: package.name == 'apt'
 user: root
-command: apt-get -d -y --force-yes dist-upgrade && true || false
+command: apt-get -d -y --force-yes dist-upgrade
 _description: 
- Tests to see that apt can access repositories and get updates (does not install updates). This is done to confirm that you could recover from an incomplete or broken update.
+ Tests to see that apt can access repositories and get updates (does
+ not install updates). This is done to confirm that you could recover
+ from an incomplete or broken update.

=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/mediacard.txt.in	2012-07-17 20:59:19 +0000
@@ -1,5 +1,7 @@
 plugin: manual
 name: mediacard/mmc-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -16,6 +18,8 @@
 plugin: shell
 name: mediacard/mmc-storage
 depends: mediacard/mmc-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/mmc-insert
@@ -24,6 +28,8 @@
 plugin: manual
 name: mediacard/mmc-remove
 depends: mediacard/mmc-storage
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -39,6 +45,8 @@
 plugin: manual
 name: mediacard/mmc-insert-after-suspend
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -55,6 +63,8 @@
 plugin: shell
 name: mediacard/mmc-storage-after-suspend
 depends: mediacard/mmc-insert-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/mmc-insert-after-suspend test
@@ -63,6 +73,8 @@
 plugin: manual
 name: mediacard/mmc-remove-after-suspend
 depends: mediacard/mmc-storage-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -77,6 +89,8 @@
 
 plugin: manual
 name: mediacard/sd-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -93,6 +107,8 @@
 plugin: shell
 name: mediacard/sd-storage
 depends: mediacard/sd-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sd-insert
@@ -101,6 +117,8 @@
 plugin: manual
 name: mediacard/sd-remove
 depends: mediacard/sd-storage
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -116,6 +134,8 @@
 plugin: manual
 name: mediacard/sd-insert-after-suspend
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -132,6 +152,8 @@
 plugin: shell
 name: mediacard/sd-storage-after-suspend
 depends: mediacard/sd-insert-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sd-insert-after-suspend test
@@ -140,6 +162,8 @@
 plugin: manual
 name: mediacard/sd-remove-after-suspend
 depends: mediacard/sd-storage-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -154,6 +178,8 @@
 
 plugin: manual
 name: mediacard/sdhc-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -170,6 +196,8 @@
 plugin: shell
 name: mediacard/sdhc-storage
 depends: mediacard/sdhc-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sdhc-insert
@@ -178,6 +206,8 @@
 plugin: manual
 name: mediacard/sdhc-remove
 depends: mediacard/sdhc-storage
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -193,6 +223,8 @@
 plugin: manual
 name: mediacard/sdhc-insert-after-suspend
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -209,6 +241,8 @@
 plugin: shell
 name: mediacard/sdhc-storage-after-suspend
 depends: mediacard/sdhc-insert-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/sdhc-insert-after-suspend test
@@ -217,6 +251,8 @@
 plugin: manual
 name: mediacard/sdhc-remove-after-suspend
 depends: mediacard/sdhc-storage-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -231,6 +267,8 @@
 
 plugin: manual
 name: mediacard/cf-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -247,6 +285,8 @@
 plugin: shell
 name: mediacard/cf-storage
 depends: mediacard/cf-insert
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/cf-insert
@@ -255,6 +295,8 @@
 plugin: manual
 name: mediacard/cf-remove
 depends: mediacard/cf-storage
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -270,6 +312,8 @@
 plugin: manual
 name: mediacard/cf-insert-after-suspend
 depends: suspend/suspend_advanced
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -286,6 +330,8 @@
 plugin: shell
 name: mediacard/cf-storage-after-suspend
 depends: mediacard/cf-insert-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_test sdio usb scsi
 _description:
  This test is automated and executes after the mediacard/cf-insert-after-suspend test
@@ -294,6 +340,8 @@
 plugin: manual
 name: mediacard/cf-remove-after-suspend
 depends: mediacard/cf-storage-after-suspend
+requires:
+ package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:

=== modified file 'jobs/miscellanea.txt.in'
--- jobs/miscellanea.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/miscellanea.txt.in	2012-07-17 20:59:19 +0000
@@ -40,8 +40,9 @@
  fwts_test -l $CHECKBOX_DATA/fwts_results.log
 
 plugin: attachment
-name: fwts_results.log
-command: cat ${CHECKBOX_DATA}/fwts_results.log
+name: miscellanea/fwts_results.log
+command: 
+ [[ -e ${CHECKBOX_DATA}/fwts_results.log ]] && cat ${CHECKBOX_DATA}/fwts_results.log
 _description: Attaches the FWTS results log to the submission
 
 plugin: shell

=== modified file 'jobs/networking.txt.in'
--- jobs/networking.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/networking.txt.in	2012-07-17 20:59:19 +0000
@@ -115,7 +115,7 @@
   package.name == 'ethtool' and package.name == 'nmap'
   device.path == "$1"
  user: root
- command: ethtool $2 | tail -1 | grep "detected: yes" && network_bandwidth_test --interface=$2 --scan=3 --log-level=debug
+ command: ethtool $2 | tail -1 | grep "detected: yes" && network_bandwidth_test --interface=$2 --scan=3 --log-level=debug || ( echo "ERROR: $2 is either not configured or not connected." >&2 && exit 1 )
  description:
   Testing for NIC $2
  EOF

=== modified file 'jobs/power-management.txt.in'
--- jobs/power-management.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/power-management.txt.in	2012-07-17 20:59:19 +0000
@@ -19,6 +19,15 @@
  package.name == 'fwts'
 command: fwts_test -w -l $CHECKBOX_DATA/fwts-wakealarm.log
 
+plugin: attachment
+name: power-management/fwts_wakealarm-log-attach
+depends: power-management/fwts_wakealarm
+_description: Attach log from fwts wakealarm test
+requires:
+ package.name == 'linux'
+ package.name == 'fwts'
+command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log
+
 plugin: manual
 name: power-management/poweroff
 depends: power-management/fwts_wakealarm
@@ -121,7 +130,7 @@
 name: power-management/rtc
 requires: package.name == 'linux'
 command:
- test -e /dev/rtc
+ test -e /dev/rtc || ( echo "ERROR: Real Time Clock not found" >&2 && exit 1 )
 _description:
  Make sure that the RTC (Real-Time Clock) device exists.
 
@@ -130,4 +139,4 @@
 requires: package.name == 'linux'
 _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check)
 command:
- zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1
+ zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1 || ( echo "WARNING: Tickless Idle is NOT set" >&2 && exit 1 )

=== modified file 'jobs/resource.txt.in'
--- jobs/resource.txt.in	2012-06-26 16:07:04 +0000
+++ jobs/resource.txt.in	2012-07-17 20:59:19 +0000
@@ -49,6 +49,11 @@
 user: root
 command: dmi_resource
 
+name: efi
+plugin: resource
+user: root
+command: efi_resource
+
 name: uname
 plugin: resource
 command: uname_resource

=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/usb.txt.in	2012-07-17 20:59:19 +0000
@@ -1,13 +1,15 @@
-plugin: shell 
+plugin: shell
 name: usb/detect
 requires: package.name == 'linux'
-command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4
+command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2
 _description: Detects and shows USB devices attached to this system.
 
 plugin: manual
 name: usb/disk_detect
 depends: usb/detect
-requires: package.name == 'linux'
+requires:
+ package.name == 'linux'
+ package.name == 'udisks'
 command: removable_storage_test -l usb
 _description:
  PURPOSE:
@@ -50,7 +52,9 @@
 plugin: manual
 name: usb/insert
 depends: usb/detect
-requires: package.name == 'linux'
+requires:
+ package.name == 'linux'
+ package.name == 'udisks'
 command: removable_storage_watcher insert usb
 _description:
  PURPOSE:
@@ -67,7 +71,9 @@
 plugin: manual
 name: usb/remove
 depends: usb/storage-automated
-requires: package.name == 'linux'
+requires:
+ package.name == 'linux'
+ package.name == 'udisks'
 command: removable_storage_watcher remove usb
 _description:
  PURPOSE:
@@ -82,7 +88,9 @@
 
 plugin: manual
 name: usb/storage-transfer
-requires: package.name == 'linux'
+requires:
+ package.name == 'linux'
+ package.name == 'udisks'
 depends: usb/insert
 command: removable_storage_test usb
 _description:
@@ -98,7 +106,9 @@
 
 plugin: shell
 name: usb/storage-automated
-requires: package.name == 'linux'
+requires:
+ package.name == 'linux'
+ package.name == 'udisks'
 depends: usb/insert
 command: removable_storage_test usb
 _description:
@@ -107,11 +117,13 @@
 plugin: shell
 name: usb/storage-preinserted
 user: root
-requires: package.name == 'linux'
+requires:
+ package.name == 'linux'
+ package.name == 'udisks'
 command: removable_storage_test -l usb && removable_storage_test usb
 _description:
- This is an automated version of usb/storage-automated and assumes that the 
- server has usb storage devices plugged in prior to checkbox execution. It 
+ This is an automated version of usb/storage-automated and assumes that the
+ server has usb storage devices plugged in prior to checkbox execution. It
  is intended for servers and SRU automated testing.
 
 plugin: manual

=== modified file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	2012-06-22 17:04:14 +0000
+++ jobs/wireless.txt.in	2012-07-17 20:59:19 +0000
@@ -2,7 +2,7 @@
 name: wireless/wireless_scanning
 user: root
 requires: package.name == 'wireless-tools'
-command: network_wireless_test
+command: rfkill unblock wlan wifi; network_wireless_test
 _description: Wireless scanning test. It scans and reports on discovered APs.
 
 plugin: manual

=== added file 'patches/0.14.2'
--- patches/0.14.2	1970-01-01 00:00:00 +0000
+++ patches/0.14.2	2012-07-17 20:59:19 +0000
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+
+
+def main(args):
+    if args[0] == "checkbox":
+        share_dir = "/usr/share/checkbox/scripts"
+        lib_dir = "../../lib/checkbox/bin"
+        if os.path.isdir(share_dir) and not os.path.islink(share_dir):
+            os.rmdir(share_dir)
+            os.symlink(lib_dir, share_dir)
+
+
+if __name__ == "__main__":
+    main(sys.argv[1:])

=== modified file 'patches/0.4'
--- patches/0.4	2009-01-20 18:55:20 +0000
+++ patches/0.4	2012-07-17 20:59:19 +0000
@@ -1,15 +1,15 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import re
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 
 
 def Config(filename):
     globals = {}
     module = "/usr/share/checkbox/install/config"
-    exec open(module) in globals
+    exec(open(module), globals)
     config = globals["Config"]()
     config.read(filename)
 

=== modified file 'patches/0.5'
--- patches/0.5	2009-03-17 09:46:16 +0000
+++ patches/0.5	2012-07-17 20:59:19 +0000
@@ -1,14 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 
 
 def Config(filename):
     globals = {}
     module = "/usr/share/checkbox/install/config"
-    exec open(module) in globals
+    exec(open(module), globals)
     config = globals["Config"]()
     config.read(filename)
 

=== modified file 'patches/0.8'
--- patches/0.8	2010-03-09 16:58:36 +0000
+++ patches/0.8	2012-07-17 20:59:19 +0000
@@ -1,14 +1,14 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 
 
 def Config(filename):
     globals = {}
     module = "/usr/share/checkbox/install/config"
-    exec open(module) in globals
+    exec(open(module), globals)
     config = globals["Config"]()
     config.read(filename)
 

=== modified file 'patches/0.9'
--- patches/0.9	2010-03-09 16:58:36 +0000
+++ patches/0.9	2012-07-17 20:59:19 +0000
@@ -1,15 +1,15 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 import re
 import sys
 
-from StringIO import StringIO
+from io import StringIO
 
 
 def Config(filename):
     globals = {}
     module = "/usr/share/checkbox/install/config"
-    exec open(module) in globals
+    exec(open(module), globals)
     config = globals["Config"]()
     config.read(filename)
 

=== modified file 'plugins/message_info.py'
--- plugins/message_info.py	2012-06-26 16:07:04 +0000
+++ plugins/message_info.py	2012-07-17 20:59:19 +0000
@@ -103,8 +103,6 @@
                 data = data.decode("utf-8")
             except UnicodeDecodeError:
                 status, data, duration = (FAIL, "Decode error", 0,)
-            except AttributeError:
-                pass
 
             self._manager.reactor.fire(
                 "message-result", status, data, duration)

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-06-22 17:04:14 +0000
+++ po/POTFILES.in	2012-07-17 20:59:19 +0000
@@ -32,6 +32,8 @@
 [type: gettext/rfc822deb] jobs/power-management.txt.in
 [type: gettext/rfc822deb] jobs/resource.txt.in
 [type: gettext/rfc822deb] jobs/server-services.txt.in
+[type: gettext/rfc822deb] jobs/smoke.txt.in
+[type: gettext/rfc822deb] jobs/sniff.txt.in
 [type: gettext/rfc822deb] jobs/stress.txt.in
 [type: gettext/rfc822deb] jobs/suspend.txt.in
 [type: gettext/rfc822deb] jobs/touchpad.txt.in

=== modified file 'po/ace.po'
--- po/ace.po	2012-06-26 16:07:04 +0000
+++ po/ace.po	2012-07-17 20:59:19 +0000
@@ -7,19 +7,19 @@
 msgstr ""
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-06-21 12:15-0400\n"
+"POT-Creation-Date: 2012-07-12 16:08-0400\n"
 "PO-Revision-Date: 2011-07-19 16:37+0000\n"
 "Last-Translator: Benny Alfian <Unknown>\n"
 "Language-Team: Acehnese <[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: 2012-06-23 04:32+0000\n"
-"X-Generator: Launchpad (build 15461)\n"
+"X-Launchpad-Export-Date: 2012-07-14 05:09+0000\n"
+"X-Generator: Launchpad (build 15614)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
-#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:590
+#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:600
 msgid "System Testing"
 msgstr "Neu uji Sistem"
 
@@ -86,6 +86,22 @@
 #: ../jobs/audio.txt.in:35
 msgid ""
 "PURPOSE:\n"
+"   1. HDMI interface verification\n"
+"STEPS:\n"
+"   1. Plug an external HDMI device with sound\n"
+"   2. Open system sound preferences\n"
+"   3. Click on Output and Select HDMI and click 'Test Speakers' to check "
+"left and right channels\n"
+"   4. Click the Test button\n"
+"VERIFICATION:\n"
+"   1. Do you hear the sound coming out on the  corresponding channel?\n"
+"   2. Did you hear a sound?"
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:55
+msgid ""
+"PURPOSE:\n"
 "    This test will check that headphones connector works correctly\n"
 "STEPS:\n"
 "    1. Connect a pair of headphones to your audio device\n"
@@ -96,7 +112,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:51
+#: ../jobs/audio.txt.in:71
 msgid ""
 "PURPOSE:\n"
 "    This test will check that recording sound using the onboard microphone "
@@ -110,7 +126,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:68
+#: ../jobs/audio.txt.in:88
 msgid ""
 "PURPOSE:\n"
 "    This test will check that recording sound using an external microphone "
@@ -124,7 +140,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:84
+#: ../jobs/audio.txt.in:104
 msgid ""
 "PURPOSE:\n"
 "    This test will check that a USB audio device works correctly\n"
@@ -137,7 +153,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:101
+#: ../jobs/audio.txt.in:121
 msgid ""
 "Play back a sound on the default output and listen for it on the  default "
 "input.  This makes the most sense when the output and input  are directly "
@@ -145,7 +161,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:109
+#: ../jobs/audio.txt.in:129
 msgid ""
 "Collect audio-related system information. This data can be used to simulate "
 "this computer's audio subsystem and perform more detailed tests under a "
@@ -153,7 +169,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:118
+#: ../jobs/audio.txt.in:138
 msgid "Attaches the audio hardware data collection log to the results."
 msgstr ""
 
@@ -452,22 +468,27 @@
 msgstr ""
 
 #. description
-#: ../jobs/cpu.txt.in:15
+#: ../jobs/cpu.txt.in:14
+msgid "Attaches the log generated by cpu/scaling_test to the results"
+msgstr ""
+
+#. description
+#: ../jobs/cpu.txt.in:21
 msgid "Test for clock jitter."
 msgstr ""
 
 #. description
-#: ../jobs/cpu.txt.in:23
+#: ../jobs/cpu.txt.in:29
 msgid "Test offlining CPUs in a multicore system."
 msgstr ""
 
 #. description
-#: ../jobs/cpu.txt.in:30
+#: ../jobs/cpu.txt.in:36
 msgid "This test checks cpu topology for accuracy"
 msgstr ""
 
 #. description
-#: ../jobs/cpu.txt.in:38
+#: ../jobs/cpu.txt.in:44
 msgid "This test checks that CPU frequency governors are obeyed when set."
 msgstr ""
 
@@ -599,7 +620,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/firewire.txt.in:4
+#: ../jobs/firewire.txt.in:6
 msgid ""
 "PURPOSE:\n"
 "    This test will check the system can detect the insertion of a FireWire "
@@ -616,14 +637,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/firewire.txt.in:19
+#: ../jobs/firewire.txt.in:23
 msgid ""
 "This is an automated test which performs read/write operations on an "
 "attached FireWire HDD"
 msgstr ""
 
 #. description
-#: ../jobs/firewire.txt.in:27
+#: ../jobs/firewire.txt.in:33
 msgid ""
 "PURPOSE:\n"
 "    This test will check the system can detect the removal of a FireWire "
@@ -779,21 +800,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:161
-msgid ""
-"PURPOSE:\n"
-"    Do some challenging operations and check for lockup on the GPU\n"
-"STEPS:\n"
-"    1. Create 2 glxgears windows and move them quickly\n"
-"    2. Switch workspaces/viewports with wmctrl\n"
-"    3. Launch a Flash playback in firefox\n"
-"    4. Suspend/resume\n"
-"VERIFICATION:\n"
-"    1. Atfer a 60s workload, check kern.log for reported GPU errors"
-msgstr ""
-
-#. description
-#: ../jobs/graphics.txt.in:176
+#: ../jobs/graphics.txt.in:155
 msgid ""
 "PURPOSE:\n"
 "    Take a screengrab of the current screen (logged on Unity desktop)\n"
@@ -804,12 +811,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:188 ../jobs/suspend.txt.in:323
+#: ../jobs/graphics.txt.in:167 ../jobs/suspend.txt.in:335
 msgid "Attaches the screenshot captured in graphics/screenshot."
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:199
+#: ../jobs/graphics.txt.in:178
 msgid ""
 "PURPOSE:\n"
 "    Take a screengrab of the current screen during fullscreen video "
@@ -822,7 +829,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:212
+#: ../jobs/graphics.txt.in:191
 msgid ""
 "Attaches the screenshot captured in graphics/screenshot_fullscreen_video."
 msgstr ""
@@ -923,41 +930,36 @@
 
 #. description
 #: ../jobs/info.txt.in:94
-msgid "Gather log from the Firmware Test Suite run."
-msgstr ""
-
-#. description
-#: ../jobs/info.txt.in:101
 msgid "Attaches the contents of /proc/acpi/sleep if it exists."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:105
+#: ../jobs/info.txt.in:98
 msgid "Bootchart information."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:114
+#: ../jobs/info.txt.in:107
 msgid "SATA/IDE device information."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:131
+#: ../jobs/info.txt.in:126
 msgid "Attaches the bootchart png file for bootchart runs"
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:140
+#: ../jobs/info.txt.in:135
 msgid "Attaches the bootchart log for bootchart test runs."
 msgstr ""
 
 #. description
+#: ../jobs/info.txt.in:143
+msgid "installs the installer bootchart tarball if it exists."
+msgstr ""
+
+#. description
 #: ../jobs/info.txt.in:148
-msgid "installs the installer bootchart tarball if it exists."
-msgstr ""
-
-#. description
-#: ../jobs/info.txt.in:153
 msgid "Attaches the installer debug log if it exists."
 msgstr ""
 
@@ -1267,7 +1269,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:4
+#: ../jobs/mediacard.txt.in:6
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the systems media card reader can\n"
@@ -1282,14 +1284,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:20
+#: ../jobs/mediacard.txt.in:24
 msgid ""
 "This test is automated and executes after the mediacard/mmc-insert test is "
 "run. It tests reading and writing to the MMC card."
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:28
+#: ../jobs/mediacard.txt.in:34
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the system correctly detects\n"
@@ -1303,7 +1305,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:43
+#: ../jobs/mediacard.txt.in:51
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the systems media card reader can\n"
@@ -1318,7 +1320,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:59
+#: ../jobs/mediacard.txt.in:69
 msgid ""
 "This test is automated and executes after the mediacard/mmc-insert-after-"
 "suspend test is run. It tests reading and writing to the MMC card after the "
@@ -1326,7 +1328,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:67
+#: ../jobs/mediacard.txt.in:79
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the system correctly detects the removal\n"
@@ -1341,7 +1343,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:81
+#: ../jobs/mediacard.txt.in:95
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the systems media card reader can\n"
@@ -1356,14 +1358,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:97
+#: ../jobs/mediacard.txt.in:113
 msgid ""
 "This test is automated and executes after the mediacard/sd-insert test is "
 "run. It tests reading and writing to the SD card."
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:105
+#: ../jobs/mediacard.txt.in:123
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the system correctly detects\n"
@@ -1377,7 +1379,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:120
+#: ../jobs/mediacard.txt.in:140
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the systems media card reader can\n"
@@ -1392,7 +1394,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:136
+#: ../jobs/mediacard.txt.in:158
 msgid ""
 "This test is automated and executes after the mediacard/sd-insert-after-"
 "suspend test is run. It tests reading and writing to the SD card after the "
@@ -1400,7 +1402,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:144
+#: ../jobs/mediacard.txt.in:168
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the system correctly detects\n"
@@ -1415,7 +1417,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:158
+#: ../jobs/mediacard.txt.in:184
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the systems media card reader can\n"
@@ -1431,14 +1433,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:174