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

[Daniel Manrique]

Another batch of bugfixes for checkbox. Also note a series of translations that were automatically pulled into trunk by Launchpad.

Thanks!

[Micah Gersten (micahg)]

This looks fine except for the following looks like a new feature which probably needs an FFe:
 * scripts/graphics_driver: Added NVIDIA driver detection (LP: #1060211)

Also, you don't mention the running of wrap-and-sort on debian/control

review: Needs Fixing

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

54. By Daniel Manrique on 2012-10-05

Added mention of wrap-and-sort

[Ara Pulido (ara)]

The FFe has been granted by the release team. Can we get the upload now, please?

[Daniel Holbach (dholbach)]

Uploaded. Sitting in the review queue now.

review: Approve

=== modified file 'backend'
--- backend	2012-06-26 16:07:04 +0000
+++ backend	2012-10-05 14:06:24 +0000
@@ -35,10 +35,14 @@
     while True:
         try:
             message = reader.read_object()
+            #"unpack" the message
+            sequence, message = message
             if message == "stop":
                 break
             if message == "ping":
-                writer.write_object("pong")
+                #Build a tuple with the sequence number as
+                #received
+                writer.write_object((sequence, "pong",))
                 continue
             if isinstance(message, dict) and "command" in message:
                 job = Job(message["command"], message.get("environ"),
@@ -50,8 +54,8 @@
                     status, data, duration = (FAIL, "Decode error", 0,)
             else:
                 status, data, duration = (FAIL, "", 0,)
-
-            writer.write_object((status, data, duration,))
+            #Build a tuple with sequence number
+            writer.write_object((sequence, (status, data, duration,),))
         except IOError:
             break
 

=== modified file 'checkbox/parsers/udevadm.py'
--- checkbox/parsers/udevadm.py	2012-08-20 18:13:17 +0000
+++ checkbox/parsers/udevadm.py	2012-10-05 14:06:24 +0000
@@ -91,6 +91,9 @@
         if "IFINDEX" in self._environment:
             return "NETWORK"
 
+        if self.bus == "ieee80211":
+            return "WIRELESS"
+
         if "PCI_CLASS" in self._environment:
             pci_class_string = self._environment["PCI_CLASS"]
             pci_class = int(pci_class_string, 16)
@@ -156,7 +159,7 @@
                 return "BLUETOOTH"
 
             if class_id == Pci.BASE_CLASS_BRIDGE \
-               and (subclass_id == Pci.CLASS_BRIDGE_PCMCIA \
+               and (subclass_id == Pci.CLASS_BRIDGE_PCMCIA
                     or subclass_id == Pci.CLASS_BRIDGE_CARDBUS):
                 return "SOCKET"
 
@@ -396,6 +399,10 @@
         if not device.bus:
             return True
 
+        # Keep 80211 devices
+        if device.bus == "ieee80211":
+            return False
+
         # Ignore devices without product information
         if not device.product and device.product_id is None:
             return True

=== modified file 'data/whitelists/default.whitelist'
--- data/whitelists/default.whitelist	2012-08-20 18:13:17 +0000
+++ data/whitelists/default.whitelist	2012-10-05 14:06:24 +0000
@@ -114,6 +114,7 @@
 __optical__
 optical/detect
 optical/read
+optical/read_.*
 __pcmcia-pcix__
 pcmcia-pcix/detect
 __power-management__

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-26 16:10:55 +0000
+++ debian/changelog	2012-10-05 14:06:24 +0000
@@ -1,3 +1,59 @@
+checkbox (0.14.8) quantal; urgency=low
+
+  * New upstream release (LP: #1061359)
+
+  * Launchpad automated translation updates
+   
+  [Sylvain Pineau]
+  * setup.py, qt/checkbox-qt.ui: Removed the old UI design file (LP: #1049912) 
+  * scripts/display_resource, jobs/resource.txt.in: Added a new display 
+    resource script to properly handle connector names returned by proprietary
+    drivers (LP: #956139) (LP: #992727)
+  * jobs/optical.txt.in, scripts/optical_write_test: Filter ANSI escape char 
+    outputed by wodim and removed some stray whitespace (LP: #1052803)
+  * checkbox/parsers/udevadm.py: Improved wireless devices detection.
+    The wireless category is now set if the subsystem is equal to ieee80211 
+    (LP: #855382)
+  * debian/control, jobs/esata.txt.in, jobs/firewire.txt.in, jobs/usb.txt.in,
+    jobs/mediacard.txt.in: Remove udisks package references in all of the jobs
+    that use removable_storage scripts (LP: #1059620). Used wrap-and-sort in
+    debian/control for clarity (Depends).
+  * scripts/graphics_driver: Added NVIDIA driver detection (LP: #1060211)
+
+  [Brendan Donegan]
+  * jobs/cpu.txt.in - add environ field containing
+    CHECKBOX_DATA to allow that environment variable to be used in the command
+    (LP: #1049595)
+  * jobs/wireless.txt.in - replace use of network_wireless_test in wireless_scanning
+    with a simple Bash script using nmcli and delete network_wireless_test (LP: #900370)
+  * [UIFe] qt/frontend/qtfront.ui, qt/frontend/qtfront.cpp - set focus to Continue
+    button and make it the default so that it can be 'clicked' using Enter,
+    as well as renaming it to 'continueButton' (LP: #1052506)
+  * jobs/usb.txt.in - Fix dependencies of USB tests so that things work properly if
+    the usb/storage-automated test fails (LP: #987876)
+  * scripts/network_info - add exception handling to file reading so that
+    sensible values are given if the required file cannot be read (LP: #823606)
+
+  [Marc Tardif]
+  * qt/frontend/qtfront.ui: Fixed warnings when building with
+    qtcreator (LP: #1053126)
+  * plugins/suites_prompt.py: Fixed tree view in selection window (LP: #1056432)
+  * plugins/apport_prompt.py: Removed apport plugin that caused crashes
+    when trying to send bug report (LP: #1047857)
+  * jobs/optical.txt.in: Fixed missing category assignment in optical
+    dvd write tests (LP: #1057762)
+
+  [Jeff Marcom]
+  * jobs/optical.txt.in: Changed optical read/write job commands to use
+    a more reliable dev path (LP: #990560)
+
+  [Daniel Manrique]
+  * Added consecutive numbering to messages sent to the backend, so the
+    frontend knows to discard out-of-sequence messages. (LP: #886118)
+
+
+ -- Daniel Manrique <[e-mail]>  Wed, 03 Oct 2012 17:23:34 -0400
+
 checkbox (0.14.7) quantal; urgency=low
 
   * New upstream release (LP: #1057001)

=== modified file 'debian/control'
--- debian/control	2012-08-20 18:13:17 +0000
+++ debian/control	2012-10-05 14:06:24 +0000
@@ -19,7 +19,13 @@
 Package: checkbox
 Section: python
 Architecture: any
-Depends: debconf, python3-lxml, udev, ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Depends: debconf,
+         python3-lxml,
+         udev,
+         udisks2 | udisks,
+         ${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,
@@ -48,7 +54,6 @@
           sox,
           stress,
           sysstat,
-          udisks,
           wmctrl,
           wodim
 Description: System testing application

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2012-09-26 16:10:55 +0000
+++ debian/po/ast.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2012-09-26 16:10:55 +0000
+++ debian/po/cs.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2012-09-26 16:10:55 +0000
+++ debian/po/de.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2012-09-26 16:10:55 +0000
+++ debian/po/en_AU.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2012-09-26 16:10:55 +0000
+++ debian/po/en_GB.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2012-09-26 16:10:55 +0000
+++ debian/po/es.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description
@@ -42,7 +42,8 @@
 #. Description
 #: ../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

=== modified file 'debian/po/fr.po'
--- debian/po/fr.po	2012-09-26 16:10:55 +0000
+++ debian/po/fr.po	2012-10-05 14:06:24 +0000
@@ -8,69 +8,69 @@
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-07-12 15:37-0400\n"
-"PO-Revision-Date: 2012-08-16 12:53+0000\n"
-"Last-Translator: gisele perreault <Unknown>\n"
+"PO-Revision-Date: 2012-09-25 09:16+0000\n"
+"Last-Translator: Sylvie Gallet <Unknown>\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-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-26 04:32+0000\n"
+"X-Generator: Launchpad (build 16022)\n"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:1001
 msgid "Test suite blacklist:"
-msgstr ""
+msgstr "Liste noire de la suite de tests :"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:1001
 msgid "List of job files to never run when testing with checkbox."
-msgstr ""
+msgstr "Liste des tests à ne jamais lancer avec checkbox."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:2001
 msgid "Test suite whitelist:"
-msgstr ""
+msgstr "Liste blanche de la suite de tests :"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:2001
 msgid "List of jobs to run when testing with checkbox."
-msgstr ""
+msgstr "Liste des tests à lancer avec checkbox."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:3001
 msgid "Transport URL:"
-msgstr ""
+msgstr "URL de transport :"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:3001
 msgid "URL where to send submissions."
-msgstr ""
+msgstr "Adresse URL où envoyer les rapports."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:4001
 msgid "Launchpad E-mail:"
-msgstr ""
+msgstr "Adresse courriel de Launchpad :"
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:4001
 msgid "E-mail address used to sign in to Launchpad."
-msgstr ""
+msgstr "Adresse courriel utilisée pour se connecter à Launchpad."
 
 #. Type: string
 #. Description
 #: ../checkbox.templates:5001
 msgid "HTTP Proxy:"
-msgstr ""
+msgstr "Serveur mandataire HTTP :"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2012-09-26 16:10:55 +0000
+++ debian/po/he.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2012-09-26 16:10:55 +0000
+++ debian/po/hu.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/id.po'
--- debian/po/id.po	2012-09-26 16:10:55 +0000
+++ debian/po/id.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2012-09-26 16:10:55 +0000
+++ debian/po/it.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2012-09-26 16:10:55 +0000
+++ debian/po/ja.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2012-09-26 16:10:55 +0000
+++ debian/po/nl.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2012-09-26 16:10:55 +0000
+++ debian/po/oc.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2012-09-26 16:10:55 +0000
+++ debian/po/pl.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2012-09-26 16:10:55 +0000
+++ debian/po/pt_BR.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2012-09-26 16:10:55 +0000
+++ debian/po/ro.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2012-09-26 16:10:55 +0000
+++ debian/po/ru.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2012-09-26 16:10:55 +0000
+++ debian/po/tr.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2012-09-26 16:10:55 +0000
+++ debian/po/uk.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2012-09-26 16:10:55 +0000
+++ debian/po/zh_CN.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2012-09-26 16:10:55 +0000
+++ debian/po/zh_TW.po	2012-10-05 14:06:24 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-22 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Type: string
 #. Description

=== modified file 'jobs/cpu.txt.in'
--- jobs/cpu.txt.in	2012-08-20 18:13:17 +0000
+++ jobs/cpu.txt.in	2012-10-05 14:06:24 +0000
@@ -4,6 +4,7 @@
  package.name == 'linux'
  package.name == 'fwts'
 user: root
+environ: CHECKBOX_DATA
 command: fwts_test -c -l ${CHECKBOX_DATA}/scaling_test.log
 _description:
  Test the CPU scaling capabilities using Firmware Test Suite (fwts cpufreq).

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

=== modified file 'jobs/firewire.txt.in'
--- jobs/firewire.txt.in	2012-07-17 16:27:55 +0000
+++ jobs/firewire.txt.in	2012-10-05 14:06:24 +0000
@@ -1,7 +1,5 @@
 plugin: manual
 name: firewire/insert
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher insert firewire
 _description:
  PURPOSE:
@@ -17,8 +15,6 @@
 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
@@ -27,8 +23,6 @@
 plugin: manual
 name: firewire/remove
 depends: firewire/storage-test
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher remove firewire
 _description:
  PURPOSE:

=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in	2012-07-17 16:27:55 +0000
+++ jobs/mediacard.txt.in	2012-10-05 14:06:24 +0000
@@ -1,7 +1,5 @@
 plugin: manual
 name: mediacard/mmc-insert
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -18,8 +16,6 @@
 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
@@ -28,8 +24,6 @@
 plugin: manual
 name: mediacard/mmc-remove
 depends: mediacard/mmc-storage
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -45,8 +39,6 @@
 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:
@@ -63,8 +55,6 @@
 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
@@ -73,8 +63,6 @@
 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:
@@ -89,8 +77,6 @@
 
 plugin: manual
 name: mediacard/sd-insert
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -107,8 +93,6 @@
 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
@@ -117,8 +101,6 @@
 plugin: manual
 name: mediacard/sd-remove
 depends: mediacard/sd-storage
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -134,8 +116,6 @@
 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:
@@ -152,8 +132,6 @@
 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
@@ -162,8 +140,6 @@
 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:
@@ -178,8 +154,6 @@
 
 plugin: manual
 name: mediacard/sdhc-insert
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -196,8 +170,6 @@
 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
@@ -206,8 +178,6 @@
 plugin: manual
 name: mediacard/sdhc-remove
 depends: mediacard/sdhc-storage
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -223,8 +193,6 @@
 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:
@@ -241,8 +209,6 @@
 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
@@ -251,8 +217,6 @@
 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:
@@ -267,8 +231,6 @@
 
 plugin: manual
 name: mediacard/cf-insert
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher insert sdio usb scsi
 _description:
  PURPOSE:
@@ -285,8 +247,6 @@
 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
@@ -295,8 +255,6 @@
 plugin: manual
 name: mediacard/cf-remove
 depends: mediacard/cf-storage
-requires:
- package.name == 'udisks'
 command: removable_storage_watcher remove sdio usb scsi
 _description:
  PURPOSE:
@@ -312,8 +270,6 @@
 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:
@@ -330,8 +286,6 @@
 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
@@ -340,8 +294,6 @@
 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/optical.txt.in'
--- jobs/optical.txt.in	2012-08-20 18:13:17 +0000
+++ jobs/optical.txt.in	2012-10-05 14:06:24 +0000
@@ -1,63 +1,88 @@
 plugin: shell
 name: optical/detect
 requires: device.category == 'CDROM'
+_description: Test to detect the optical drives
 command:
  cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"' | sed '/^$/d'
  $vendor $product
  EOF
-_description: Test to detect the optical drives
 
-plugin: manual
+plugin: local
 name: optical/read
 requires:
  device.category == 'CDROM'
-user: root
-command: optical_read_test /dev/cdrom
-_description:
- PURPOSE:
-     This test will check your optical devices ability to read CD media
- STEPS:
-     1. Insert appropriate non-blank media into your optical drive(s). Movie and Audio Disks may not work. Self-created data disks have the greatest chance of working.
-     2. If a file browser window opens, you can safely close or ignore that window.
-     3. Click "Test" to begin the test.
- VERIFICATION:
-     This test should automatically select "Yes" if it passes, "No" if it fails.
+_description: Optical read test.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: manual
+ name: optical/read_`ls /sys$path/block`
+ requires: device.path == "$path"
+ user: root
+ command: optical_read_test /dev/`ls /sys$path/block`
+ description:
+  PURPOSE:
+      This test will check your $product device's ability to read CD media
+  STEPS:
+      1. Insert appropriate non-blank media into your optical drive(s). Movie and Audio Disks may not work. Self-created data disks have the greatest chance of working.
+      2. If a file browser window opens, you can safely close or ignore that window.
+      3. Click "Test" to begin the test.
+  VERIFICATION:
+      This test should automatically select "Yes" if it passes, "No" if it fails.
+ EOF
 
-plugin: shell
+plugin: local
 name: optical/read-automated
 requires:
  device.category == 'CDROM'
-user: root
-command: optical_read_test /dev/cdrom
-description:
- This is an automated version of optical/read. It assumes you have already inserted a data CD into your optical drive prior to running Checkbox.
+_description: Optical read test.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: shell
+ name: optical/read-automated_`ls /sys$path/block`
+ requires: device.path == "$path"
+ user: root
+ command: optical_read_test /dev/`ls /sys$path/block`
+ description:
+  This is an automated version of optical/read. It assumes you have already inserted a data CD into your optical drive prior to running Checkbox.
+ EOF
 
-plugin: manual
+plugin: local
 name: optical/cdrom-write
 requires:
  device.category == 'CDROM'
  optical_drive.cd == 'writable'
-user: root
-command: optical_write_test /dev/cdrom
-_description:
- PURPOSE:
-     This test will check your system's CD writing capabilities. This test requires a blank CD-R or CD+R. If you do not have a blank disk, skip this test.
- STEPS:
-     1. Insert a blank CD-R or CD+R into your drive
-     2. Click "Test" to begin.
-     3. When the CD tray ejects the media after burning, close it (DO NOT remove the disk, it is needed for the second portion of the test). Note, you must close the drive within 5 minutes or the test will time out.
- VERIFICATION:
-     This test should automatically select "Yes" if it passes, "No" if it fails.
+_description: Optical write test.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: manual
+ name: optical/cdrom-write_`ls /sys$path/block`
+ requires: device.path == "$path"
+ user: root
+ command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ description:
+  PURPOSE:
+      This test will check your system's $product CD writing capabilities. This test requires a blank CD-R or CD+R. If you do not have a blank disk, skip this test.
+  STEPS:
+      1. Insert a blank CD-R or CD+R into your drive
+      2. Click "Test" to begin.
+      3. When the CD tray ejects the media after burning, close it (DO NOT remove the disk, it is needed for the second portion of the test). Note, you must close the drive within 5 minutes or the test will time out.
+ EOF
 
-plugin: shell
+plugin: local
 name: optical/cdrom-write-automated
-user: root
 requires:
  device.category == 'CDROM'
  optical_drive.cd == 'writable'
-command: optical_write_test /dev/cdrom
-_description:
- This is an automated version of optical/cdrom-write. It assumes you inserted a blank CD-R or CD+R disk before starting testing. You must watch for the tray opening. The test will attempt to close the tray and continue testing, however this is not possible in all optical drives, thus you may need to push the tray or disk back in manually to continue the test.  This test has a 5 minute timeout to allow for the tester to catch this.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: shell
+ name: optical/cdrom-write-automated_`ls /sys$path/block`
+ requires: device.path == "$path"
+ user: root
+ command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ description:
+  This is an automated version of optical/cdrom-write. It assumes you have already inserted a data CD into your optical drive prior to running Checkbox.
+ EOF
 
 plugin: manual
 name: optical/cdrom-audio-playback
@@ -78,32 +103,45 @@
  VERIFICATION:
      Did all the steps work?
 
-plugin: manual
+plugin: local
 name: optical/dvd-write
-user: root
 requires:
  device.category == 'CDROM'
  optical_drive.dvd == 'writable'
-command: optical_write_test /dev/cdrom
-_description:
- PURPOSE:
-     This test will check your system's DVD writing capabilities. This test requires a blank DVD-R or DVD+R. If you do not have a blank DVD disk, skip this test.
- STEPS:
-     1. Enter a blank DVD-R or DVD+R into your drive
-     2. Click "Test" to begin.
-     3. When the CD tray ejects the media after burning, close it (DO NOT remove the disk, it is needed for the second portion of the test). Note, you must close the drive within 5 minutes or the test will time out.
- VERIFICATION:
-     This test should automatically select "Yes" if it passes, "No" if it fails.
+_description: Optical write test.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: manual
+ name: optical/dvd-write_`ls /sys$path/block`
+ requires: device.path == "$path"
+ user: root
+ command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ description:
+  PURPOSE:
+      This test will check your system's $product writing capabilities. This test requires a blank DVD-R or DVD+R. If you do not have a blank DVD disk, skip this test.
+  STEPS:
+      1. Enter a blank DVD-R or DVD+R into your drive
+      2. Click "Test" to begin.
+      3. When the CD tray ejects the media after burning, close it (DO NOT remove the disk, it is needed for the second portion of the test). Note, you must close the drive within 5 minutes or the test will time out.
+  VERIFICATION:
+      This test should automatically select "Yes" if it passes, "No" if it fails.
+ EOF
 
-plugin: shell
+plugin: local
 name: optical/dvd-write-automated
-user: root
 requires:
  device.category == 'CDROM'
  optical_drive.dvd == 'writable'
-command: optical_write_test /dev/cdrom
-_description:
- This is an automated version of optical/dvd-write. It assumes you inserted a blank DVD-R or DVD+R before starting testing. You must watch for the tray opening. The test will attempt to close the tray and continue testing, however this is not possible in all optical drives, thus you may need to push the tray or disk back in manually to continue the test.  This test has a 5 minute timeout to allow for the tester to catch this.
+command:
+ cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=CDROM"'
+ plugin: shell
+ name: optical/dvd-write-automated_`ls /sys$path/block`
+ requires: device.path == "$path"
+ user: root
+ command: optical_write_test /dev/`ls /sys$path/block` | ansi_parser
+ description:
+  This is an automated version of optical/dvd-write. It assumes you have already inserted a data CD into your optical drive prior to running Checkbox.
+ EOF
 
 plugin: manual
 name: optical/dvd_movie_playback

=== modified file 'jobs/resource.txt.in'
--- jobs/resource.txt.in	2012-07-17 16:27:55 +0000
+++ jobs/resource.txt.in	2012-10-05 14:06:24 +0000
@@ -76,4 +76,4 @@
 
 name: display
 plugin: resource
-command: for display in `xrandr | grep connected | awk '{print $1}' | grep -o ^[A-Z]* | sort | uniq`; do echo "$display: supported"; done
+command: display_resource 

=== modified file 'jobs/usb.txt.in'
--- jobs/usb.txt.in	2012-08-06 20:24:04 +0000
+++ jobs/usb.txt.in	2012-10-05 14:06:24 +0000
@@ -7,9 +7,7 @@
 plugin: manual
 name: usb/disk_detect
 depends: usb/detect
-requires:
- package.name == 'linux'
- package.name == 'udisks'
+requires: package.name == 'linux'
 command: removable_storage_test -l usb
 _description:
  PURPOSE:
@@ -52,9 +50,7 @@
 plugin: manual
 name: usb/insert
 depends: usb/detect
-requires:
- package.name == 'linux'
- package.name == 'udisks'
+requires: package.name == 'linux'
 command: removable_storage_watcher insert usb
 _description:
  PURPOSE:
@@ -70,10 +66,8 @@
 
 plugin: manual
 name: usb/remove
-depends: usb/storage-automated
-requires:
- package.name == 'linux'
- package.name == 'udisks'
+depends: usb/insert
+requires: package.name == 'linux'
 command: removable_storage_watcher remove usb
 _description:
  PURPOSE:
@@ -88,9 +82,7 @@
 
 plugin: manual
 name: usb/storage-transfer
-requires:
- package.name == 'linux'
- package.name == 'udisks'
+requires: package.name == 'linux'
 depends: usb/insert
 command: removable_storage_test usb
 _description:
@@ -106,10 +98,8 @@
 
 plugin: shell
 name: usb/storage-automated
-requires:
- package.name == 'linux'
- package.name == 'udisks'
 depends: usb/insert
+requires: package.name == 'linux'
 command: removable_storage_test usb
 _description:
  This test is automated and executes after the usb/insert test is run.
@@ -117,9 +107,7 @@
 plugin: shell
 name: usb/storage-preinserted
 user: root
-requires:
- package.name == 'linux'
- package.name == 'udisks'
+requires: package.name == 'linux'
 command: removable_storage_test -l usb && removable_storage_test usb
 _description:
  This is an automated version of usb/storage-automated and assumes that the

=== modified file 'jobs/wireless.txt.in'
--- jobs/wireless.txt.in	2012-07-17 16:27:55 +0000
+++ jobs/wireless.txt.in	2012-10-05 14:06:24 +0000
@@ -1,8 +1,22 @@
 plugin: shell
 name: wireless/wireless_scanning
-user: root
-requires: package.name == 'wireless-tools'
-command: rfkill unblock wlan wifi; network_wireless_test
+requires:
+  package.name == 'network-manager'
+  device.category == 'WIRELESS'
+command:
+ rfkill unblock wlan wifi
+ if rfkill list wlan wifi | grep -q 'Hard blocked: yes'; then
+   echo "Hard block is applied to WiFi device. Please remove and retest."
+   exit 1
+ fi
+ wireless_networks=`nmcli -f SSID dev wifi list`
+ if [ `echo "$wireless_networks" | wc -l` -gt 1 ]; then
+   echo "Wireless networks discovered: "
+   echo "$wireless_networks"
+   exit 0
+ fi
+ echo "No wireless networks discovered."
+ exit 1
 _description: Wireless scanning test. It scans and reports on discovered APs.
 
 plugin: manual

=== removed file 'plugins/apport_prompt.py'
--- plugins/apport_prompt.py	2012-08-06 20:24:04 +0000
+++ plugins/apport_prompt.py	1970-01-01 00:00:00 +0000
@@ -1,280 +0,0 @@
-#
-# This file is part of Checkbox.
-#
-# Copyright 2008 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 logging
-
-from subprocess import check_output
-
-from gettext import gettext as _
-
-from checkbox.job import FAIL
-from checkbox.plugin import Plugin
-from checkbox.properties import Bool, Path, String
-from checkbox.reactor import StopAllException
-
-
-class DummyUserInterface:
-    pass
-
-try:
-    from apport.ui import UserInterface
-    from apport.crashdb import get_crashdb
-except:
-    UserInterface = DummyUserInterface
-
-
-CATEGORY_TO_PACKAGE = {
-    "SOUND": "alsa-base"}
-
-CATEGORY_TO_SYMPTOM = {
-    "VIDEO": "display",
-    "DISK":  "storage"}
-
-
-class ApportOptions:
-
-    def __init__(self, test, device, package, symptom):
-        self.test = test
-        self.device = device
-        self.package = package
-        self.symptom = symptom
-        self.pid = None
-        self.save = False
-        self.tag = '' #Additional tags to add to reports filed
-                      #through this tool
-
-
-class ApportUserInterface(UserInterface):
-
-    def __init__(self, interface, options):
-        self.interface = interface
-        self.options = options
-        self.report = None
-        self.report_file = None
-        self.cur_package = None
-
-        # ImportError raised during package upgrade
-        self.crashdb = get_crashdb(None)
-
-    def ui_info_message(self, title, text):
-        self.interface.show_info(text, ["close"])
-
-    def ui_error_message(self, title, text):
-        self.interface.show_progress_stop()
-        self.interface.show_error(text)
-
-    def ui_start_info_collection_progress(self):
-        self.interface.show_progress_start(
-            _("Collecting information about this test.\n"
-              "This might take a few minutes."))
-
-    def ui_pulse_info_collection_progress(self):
-        self.interface.show_progress_pulse()
-
-    def ui_stop_info_collection_progress(self):
-        # tags
-        if "Tags" in self.report:
-            tags = self.report["Tags"].split(" ")
-        else:
-            tags = []
-
-        tags.append("checkbox-bug")
-        if self.options.device:
-            tags.append(self.options.device)
-
-        self.report["Tags"] = " ".join(tags)
-
-        # checkbox
-        test = self.options.test
-        self.report["CheckboxTest"] = test["name"]
-        if test.get("description"):
-            self.report["CheckboxDescription"] = test["description"]
-        if test.get("data"):
-            self.report["CheckboxData"] = test["data"]
-        if test.get("command"):
-            self.report["CheckboxCommand"] = test["command"]
-        if test.get("environ"):
-            self.report["CheckboxEnvironment"] = test["environ"]
-
-        self.interface.show_progress_stop()
-
-    def ui_start_upload_progress(self):
-        self.interface.show_progress_start(
-            _("Collected information is being sent for bug tracking.\n"
-            "This might take a few minutes."))
-
-    def ui_set_upload_progress(self, progress):
-        self.interface.show_progress_pulse()
-
-    def ui_stop_upload_progress(self):
-        self.interface.show_progress_stop()
-
-    def ui_present_report_details(self, *args):
-        return dict(report=1)
-
-    def ui_question_choice(self, text, options, multiple):
-        self.interface.show_progress_stop()
-
-        if multiple:
-            results = self.interface.show_check(text, options)
-        else:
-            results = [self.interface.show_radio(text, options)]
-
-        return [options.index(r) for r in results]
-
-    def ui_question_yesno(self, text):
-        self.interface.show_progress_stop()
-        result = self.interface.show_radio(text, ["Yes", "No"])
-        return result == "Yes"
-
-    def open_url(self, url):
-        self.interface.show_url(url)
-
-
-class ApportPrompt(Plugin):
-
-    # Default configuration filename
-    default_filename = Path(default="/etc/default/apport")
-
-    # Default enabled state
-    default_enabled = Bool(required=False)
-
-    # Default package if none is detected
-    default_package = String(required=False)
-
-    # Filename where Submission ID is cached
-    submission_filename = Path(default="%(checkbox_data)s/submission")
-
-    # Filename where System ID is cached
-    system_filename = Path(default="%(checkbox_data)s/system")
-
-    def register(self, manager):
-        super(ApportPrompt, self).register(manager)
-
-        self._submission_id = None
-        self._system_id = None
-
-        for (rt, rh) in [
-             ("exchange-success", self.exchange_success),
-             ("report-submission_id", self.report_submission_id),
-             ("report-system_id", self.report_system_id)]:
-            self._manager.reactor.call_on(rt, rh)
-
-        if not isinstance(ApportUserInterface, DummyUserInterface):
-            self._manager.reactor.call_on("gather", self.gather)
-            self._manager.reactor.call_on("prompt-test", self.prompt_test, 100)
-
-    def gather(self):
-        if self.default_enabled is None:
-            value = check_output("unset enabled && . %s && echo ${enabled}"
-                % self.default_filename, shell=True, universal_newlines=True)
-            self.default_enabled = value.strip() == "1"
-
-    def prompt_test(self, interface, test):
-        if not self.default_enabled:
-            return
-
-        if test["status"] != FAIL:
-            return
-
-        device = None
-        package = None
-        symptom = None
-
-        # Give lowest priority to required packages
-        for resource in test.get("resources", []):
-            if "version" in resource:
-                package = resource["name"]
-                break
-
-        # Give highest priority to required devices
-        for resource in test.get("resources", []):
-            if "bus" in resource:
-                category = resource["category"]
-                if category in CATEGORY_TO_PACKAGE:
-                    package = CATEGORY_TO_PACKAGE[category]
-                    break
-
-                if category in CATEGORY_TO_SYMPTOM:
-                    symptom = CATEGORY_TO_SYMPTOM[category]
-                    break
-
-        # Default to configuration
-        if not package:
-            package = self.default_package
-
-        # Do not report a bug if no package nor symptom is defined
-        if not package and not symptom:
-            return
-
-        if test.get("suite"):
-            failed_test_message = _("Test %(name)s failed.") % {
-                                   'name': test["name"]}
-        else:
-            failed_test_message = _("Test %s failed.") % test["name"]
-        failed_test_message += "\n" + _("Do you want to report a bug?")
-
-        response = interface.show_info(failed_test_message,
-            ["yes", "no"], "no")
-        if response == "no":
-            return
-
-        # Determine corresponding device
-        for resource in test.get("resources", []):
-            if "bus" in resource:
-                device = resource["category"].lower()
-                break
-
-        try:
-            options = ApportOptions(test, device, package, symptom)
-            apport_interface = ApportUserInterface(interface, options)
-        except ImportError as e:
-            interface.show_error(_("Is a package upgrade in process? Error: %s") % e)
-            return
-
-        try:
-            if symptom and hasattr(apport_interface, "run_symptom"):
-                apport_interface.run_symptom()
-            else:
-                apport_interface.run_report_bug()
-        except SystemExit as e:
-            # In case of error, show_error already have been called
-            raise StopAllException
-
-    def exchange_success(self, response):
-        for message, filename in [
-             (self._submission_id, self.submission_filename),
-             (self._system_id, self.system_filename)]:
-            try:
-                file = open(filename, "w")
-                try:
-                    file.write(message)
-                finally:
-                    file.close()
-            except IOError as e:
-                logging.info("Failed to write to file '%s': %d %s",
-                    filename, e.errno, e.strerror)
-
-    def report_submission_id(self, submission_id):
-        self._submission_id = submission_id
-
-    def report_system_id(self, system_id):
-        self._system_id = system_id
-
-
-factory = ApportPrompt

=== modified file 'plugins/backend_info.py'
--- plugins/backend_info.py	2012-06-26 16:07:04 +0000
+++ plugins/backend_info.py	2012-10-05 14:06:24 +0000
@@ -26,11 +26,12 @@
 from checkbox.lib.fifo import FifoReader, FifoWriter, create_fifo
 
 from checkbox.plugin import Plugin
-from checkbox.properties import Path, Float 
+from checkbox.properties import Path, Float
 from checkbox.job import FAIL
 
 from gettext import gettext as _
 
+
 class BackendInfo(Plugin):
 
     # how long to wait for I/O from/to the backend before the call returns.
@@ -39,6 +40,37 @@
 
     command = Path(default="%(checkbox_share)s/backend")
 
+    next_sequence = 0
+    expected_sequence = 0
+
+    def write_to_parent(self, object):
+        message = (self.next_sequence, object,)
+        logging.debug("Sending message with sequence number %s to backend" %
+                       self.next_sequence)
+        self.parent_writer.write_object(message)
+        self.expected_sequence = self.next_sequence
+        self.next_sequence += 1
+
+    def read_from_parent(self):
+        correct_sequence = False
+        while not correct_sequence:
+            ro = self.parent_reader.read_object()
+            if ro:
+                sequence, result = ro
+                logging.debug("Expecting sequence number %s from backend, "
+                              "got sequence number %s" %
+                       (self.expected_sequence, sequence))
+                if (self.expected_sequence == sequence):
+                    correct_sequence = True
+                else:
+                    logging.warning("Backend sent wrong sequence number, "
+                                    "Discarding message and re-reading")
+            else:
+                #If we timed out, just return nothing, the rest of
+                #the code knows how to handle this.
+                return ro
+        return result
+
     def register(self, manager):
         super(BackendInfo, self).register(manager)
 
@@ -57,7 +89,10 @@
 
     def get_root_command(self, *args):
         uid = os.getuid()
-        password_text = _("SYSTEM TESTING: Please enter your password. Some tests require root access to run properly. Your password will never be stored and will never be submitted with test results.")
+        password_text = _("SYSTEM TESTING: Please enter your password. "
+                          "Some tests require root access to run properly. "
+                          "Your password will never be stored and will never "
+                          "be submitted with test results.")
         password_prompt = _("PASSWORD: ")
         if uid == 0:
             prefix = []
@@ -88,31 +123,35 @@
     def ping_backend(self):
         if not self.parent_reader or not self.parent_writer:
             return False
-        self.parent_writer.write_object("ping")
-        result = self.parent_reader.read_object()
+        self.write_to_parent("ping")
+        result = self.read_from_parent()
         return result == "pong"
 
-
     def gather(self):
         self.directory = mkdtemp(prefix="checkbox")
-        child_input = create_fifo(os.path.join(self.directory, "input"), 0o600)
-        child_output = create_fifo(os.path.join(self.directory, "output"), 0o600)
+        child_input = create_fifo(os.path.join(self.directory, "input"),
+                                  0o600)
+        child_output = create_fifo(os.path.join(self.directory, "output"),
+                                   0o600)
 
         self.backend_is_alive = False
-        for attempt in range(1,4):
+        for attempt in range(1, 4):
             self.spawn_backend(child_input, child_output)
-            #Only returns if I'm still the parent, so I can do parent stuff here
+            #Only returns if I'm still the parent,
+            #so I can do parent stuff here
             self.parent_writer = FifoWriter(child_input, timeout=self.timeout)
-            self.parent_reader = FifoReader(child_output, timeout=self.timeout)
+            self.parent_reader = FifoReader(child_output,
+                                            timeout=self.timeout)
             if self.ping_backend():
                 logging.debug("Backend responded, continuing execution.")
                 self.backend_is_alive = True
                 break
             else:
-                logging.debug("Backend didn't respond, trying to create again.")
+                logging.debug("Backend didn't respond, "
+                              "trying to create again.")
 
-        if not self.backend_is_alive: 
-            logging.warning("Privileged backend not responding. " + 
+        if not self.backend_is_alive:
+            logging.warning("Privileged backend not responding. " +
                             "jobs specifying user will not be run")
 
     def message_exec(self, message):
@@ -120,20 +159,20 @@
             if "environ" in message:
                 #Prepare variables to be "exported" from my environment
                 #to the backend's.
-                backend_environ=["%s=%s" % (key, os.environ[key])
-                             for key in message["environ"] 
+                backend_environ = ["%s=%s" % (key, os.environ[key])
+                             for key in message["environ"]
                              if key in os.environ]
-                message=dict(message) #so as to not wreck the
-                                      #original message
-                message["environ"]=backend_environ
+                message = dict(message)  # so as to not wreck the
+                                         # original message
+                message["environ"] = backend_environ
 
             if (self.backend_is_alive and not self.ping_backend()):
                 self.backend_is_alive = False
 
             if self.backend_is_alive:
-                self.parent_writer.write_object(message)
+                self.write_to_parent(message)
                 while True:
-                    result = self.parent_reader.read_object()
+                    result = self.read_from_parent()
                     if result:
                         break
                     else:
@@ -145,7 +184,7 @@
                 self._manager.reactor.fire("message-result", *result)
 
     def stop(self):
-        self.parent_writer.write_object("stop")
+        self.write_to_parent("stop")
         self.parent_writer.close()
         self.parent_reader.close()
         shutil.rmtree(self.directory)

=== modified file 'plugins/suites_prompt.py'
--- plugins/suites_prompt.py	2012-08-20 18:13:17 +0000
+++ plugins/suites_prompt.py	2012-10-05 14:06:24 +0000
@@ -114,9 +114,16 @@
         self.store.add_pending_offset(offset)
         tests = dict([(m["name"], m) for m in messages
               if m.get("type") in ("test", "metric")])
+
+        def walk_dependencies(job, all_dependencies):
+            for dependency in resolver.get_dependencies(job)[:-1]:
+                walk_dependencies(dependency, all_dependencies)
+            all_dependencies.append(job)
+
         for job in resolver.get_dependents():
             suboptions = options
-            dependencies = resolver.get_dependencies(job)
+            dependencies = []
+            walk_dependencies(job, dependencies)
             for dependency in dependencies:
                 if dependency in tests:
                     value = tests[dependency]["status"]

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-07-17 16:27:55 +0000
+++ po/POTFILES.in	2012-10-05 14:06:24 +0000
@@ -47,7 +47,6 @@
 checkbox_urwid/urwid_interface.py
 checkbox_gtk/gtk_interface.py
 checkbox/user_interface.py
-plugins/apport_prompt.py
 plugins/final_prompt.py
 plugins/gather_prompt.py
 plugins/intro_prompt.py

=== modified file 'po/ar.po'
--- po/ar.po	2012-09-26 16:10:55 +0000
+++ po/ar.po	2012-10-05 14:06:24 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-07-12 16:08-0400\n"
-"PO-Revision-Date: 2012-08-23 12:49+0000\n"
+"PO-Revision-Date: 2012-09-19 00:27+0000\n"
 "Last-Translator: Ibrahim Saed <[e-mail]>\n"
 "Language-Team: Arabic <[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-09-11 04:32+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-20 04:32+0000\n"
+"X-Generator: Launchpad (build 15985)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -3348,7 +3348,7 @@
 
 #: ../checkbox_urwid/urwid_interface.py:127 ../qt/frontend/ui_qtfront.h:637
 msgid "Continue"
-msgstr ""
+msgstr "تابع"
 
 #: ../checkbox_urwid/urwid_interface.py:220
 #: ../checkbox_urwid/urwid_interface.py:296
@@ -3367,11 +3367,11 @@
 #. Show buttons
 #: ../checkbox_urwid/urwid_interface.py:445
 msgid "Select All"
-msgstr ""
+msgstr "حدّد الكل"
 
 #: ../checkbox_urwid/urwid_interface.py:446
 msgid "Deselect All"
-msgstr ""
+msgstr "أزل تحديد الكل"
 
 #. Show buttons
 #: ../checkbox_urwid/urwid_interface.py:567
@@ -3565,13 +3565,14 @@
 "you plan to participate in Ubuntu Friendly, please, select all tests. You "
 "can always skip individual tests if you don't have the needed equipment."
 msgstr ""
-"عدم اختيار اختبار ما سيلغي تسليمه إلى مجتمع أبونتو. إذا كان هدفك هو المشاركة "
-"في مجتمع أبونتو والمساعدة على تحسين النظام، من فضلك اختر جميع الاختبارات. "
-"يمكنك دائمًا تخطي اختبارات مفردة إذا لم تكن تمتلك المعدات اللازمة."
+"عدم تحديد أحد الاختبارات سيلغي تسليمه إلى مجتمع أبونتو. إذا كان هدفك هو "
+"المشاركة في مجتمع أبونتو والمساعدة على تحسين النظام، من فضلك حدّد جميع "
+"الاختبارات. يمكنك دائمًا تخطي اختبارات مفردة إذا لم تكن تمتلك التجهيزات "
+"اللازمة."
 
 #: ../plugins/suites_prompt.py:136 ../qt/frontend/ui_qtfront.h:641
 msgid "Choose tests to run on your system:"
-msgstr ""
+msgstr "حدّد اختبارات لتشغيلها على نظامك:"
 
 #: ../scripts/keyboard_test:22
 msgid "Enter text:\n"
@@ -3743,11 +3744,11 @@
 
 #: ../qt/frontend/ui_qtfront.h:644
 msgid "Select all"
-msgstr ""
+msgstr "حدّد الكل"
 
 #: ../qt/frontend/ui_qtfront.h:645
 msgid "Deselect all"
-msgstr ""
+msgstr "أزل تحديد الكل"
 
 #: ../qt/frontend/ui_qtfront.h:646
 msgid "Start testing"

=== modified file 'po/fi.po'
--- po/fi.po	2012-09-26 16:10:55 +0000
+++ po/fi.po	2012-10-05 14:06:24 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-07-12 16:08-0400\n"
-"PO-Revision-Date: 2011-07-19 17:55+0000\n"
-"Last-Translator: Heikki Mäntysaari <[e-mail]>\n"
+"PO-Revision-Date: 2012-09-26 08:04+0000\n"
+"Last-Translator: sampo555 <Unknown>\n"
 "Language-Team: Finnish <[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-09-11 04:33+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-27 04:32+0000\n"
+"X-Generator: Launchpad (build 16033)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -106,6 +106,17 @@
 "   1. Do you hear the sound coming out on the  corresponding channel?\n"
 "   2. Did you hear a sound?"
 msgstr ""
+"TARKOITUS:\n"
+"   1. HDMI-liitännän tarkistaminen\n"
+"SUORITUS:\n"
+"   1. Kiinnitä ulkoinen HDMI-äänilaite\n"
+"   2. Avaa ääniasetukset\n"
+"   3. Siirry Ulostulo-välilehdelle, valitse HDMI ja paina \"Kokeile ääntä\" "
+"testataksesi oikeaa ja vasenta kanavaa\n"
+"   4. Paina testaa\n"
+"VAHVISTUS:\n"
+"   1. Kuulitko ääntä oikeista kanavasta?\n"
+"   2. Kuulitko äänen?"
 
 #. description
 #: ../jobs/audio.txt.in:58
@@ -209,11 +220,14 @@
 "this computer's audio subsystem and perform more detailed tests under a "
 "controlled environment."
 msgstr ""
+"Kerää äänijärjestelmän tietoja. Tietoja voidaan käyttää tietokoneen "
+"äänijärjestelmän simulointiin ja tarkempien testien suorittamiseen "
+"hallitussa ympäristössä."
 
 #. description
 #: ../jobs/audio.txt.in:143
 msgid "Attaches the audio hardware data collection log to the results."
-msgstr ""
+msgstr "Liittää äänilaitteiston tietojen keräyslokin tuloksiin."
 
 #. description
 #: ../jobs/benchmarks.txt.in:18
@@ -223,22 +237,22 @@
 #. description
 #: ../jobs/benchmarks.txt.in:41
 msgid "Run Render-Bench XRender/Imlib2 benchmark"
-msgstr ""
+msgstr "Aja Render-Bench XRender/Imlib2 -mittaus"
 
 #. description
 #: ../jobs/benchmarks.txt.in:47
 msgid "Run Qgears2 XRender Extension gearsfancy benchmark"
-msgstr ""
+msgstr "Aja Qgears2 XRender Extension gearsfancy -mittaus"
 
 #. description
 #: ../jobs/benchmarks.txt.in:53
 msgid "Run Qgears2 XRender Extension image scaling benchmark"
-msgstr ""
+msgstr "Aja Qgears2 XRender Extension image scaling -mittaus"
 
 #. description
 #: ../jobs/benchmarks.txt.in:59
 msgid "Run Qgears2 OpenGL gearsfancy benchmark"
-msgstr ""
+msgstr "Aja Qgears2 OpenGL gearsfancy -mittaus"
 
 #. description
 #: ../jobs/benchmarks.txt.in:65
@@ -4329,7 +4343,7 @@
 "Once you are finished running the tests, you can view a summary report for "
 "your system."
 msgstr ""
-"Tervetuloa Järjestelmän testaukseen!\n"
+"Tervetuloa järjestelmän testaukseen!\n"
 "\n"
 "Checkbox tarjoaa testejä, joilla järjestelmän oikeanlainen toimivuus voidaan "
 "varmistaa. Testien suorittamisen jälkeen on mahdollista katsella "
@@ -4409,7 +4423,7 @@
 
 #: ../plugins/launchpad_prompt.py:84
 msgid "Email"
-msgstr ""
+msgstr "Sähköposti"
 
 #: ../plugins/launchpad_prompt.py:93
 msgid "Email address must be in a proper format."
@@ -4461,7 +4475,7 @@
 
 #: ../plugins/suites_prompt.py:136 ../qt/frontend/ui_qtfront.h:641
 msgid "Choose tests to run on your system:"
-msgstr ""
+msgstr "Valitse suoritettavat testit:"
 
 #: ../scripts/keyboard_test:22
 msgid "Enter text:\n"
@@ -4633,11 +4647,11 @@
 
 #: ../qt/frontend/ui_qtfront.h:644
 msgid "Select all"
-msgstr ""
+msgstr "Valitse kaikki"
 
 #: ../qt/frontend/ui_qtfront.h:645
 msgid "Deselect all"
-msgstr ""
+msgstr "Poista kaikki valinnat"
 
 #: ../qt/frontend/ui_qtfront.h:646
 msgid "Start testing"

=== modified file 'po/fr.po'
--- po/fr.po	2012-09-26 16:10:55 +0000
+++ po/fr.po	2012-10-05 14:06:24 +0000
@@ -7,14 +7,14 @@
 "Project-Id-Version: checkbox 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-07-12 16:08-0400\n"
-"PO-Revision-Date: 2011-08-29 10:42+0000\n"
-"Last-Translator: Pierre Slamich <[e-mail]>\n"
+"PO-Revision-Date: 2012-09-24 20:26+0000\n"
+"Last-Translator: Sylvie Gallet <Unknown>\n"
 "Language-Team: French <[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-09-11 04:33+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-25 04:32+0000\n"
+"X-Generator: Launchpad (build 16019)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
@@ -1396,7 +1396,7 @@
 "BUT :\n"
 "    Ce test va vérifier le bon fonctionnement de votre clavier\n"
 "ÉTAPES :\n"
-"    1. Cliquez sur « Test »\n"
+"    1. Cliquez sur « Tester »\n"
 "    2. Dans la zone de texte, utilisez votre clavier pour y taper quelque "
 "chose\n"
 "VÉRIFICATION :\n"
@@ -1750,7 +1750,7 @@
 #. description
 #: ../jobs/local.txt.in:269
 msgid "Sniff Sniffers"
-msgstr ""
+msgstr "Flairer les renifleurs"
 
 #. description
 #: ../jobs/mediacard.txt.in:6
@@ -1804,7 +1804,7 @@
 "    le retrait de la carte MMC du lecteur de carte du système.\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur « Tester » et retirez la carte MMC du lecteur.\n"
-"       (Note : ce test s'interrompra après 20 secondes.)\n"
+"       (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -1867,7 +1867,7 @@
 "été suspendu..\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur « Tester » et retirez la carte MMC du lecteur.\n"
-"       (Note : ce test s'interrompra après 20 secondes.)\n"
+"       (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -1891,7 +1891,7 @@
 "    détecter l'insertion d'une carte Secure Digital (SD).\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur « Tester » et insérez une carte SD dans le lecteur.\n"
-"       (Note : ce test s'interrompra après 20 secondes.)\n"
+"       (Note : ce test s'interrompra après 20 secondes.)\n"
 "    2. Ne débranchez pas l'appareil après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
@@ -1924,7 +1924,7 @@
 "    le retrait d'une carte SD du lecteur de carte du système.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et retirez la carte SD du le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -1949,7 +1949,7 @@
 "    l'insertion d'une carte SD card après que le système ait été suspendu.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et insérez une carte SD dans le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "    2. Ne débranchez pas l'appareil après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
@@ -1986,7 +1986,7 @@
 "ait été suspendu..\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et retirez la carte SD du le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -2011,7 +2011,7 @@
 "    détecter l'insertion d'une carte Secure Digital High-Capacity  (SDHC).\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et insérez une carte SDHC dans le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "    2. Ne débranchez pas l'appareil après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
@@ -2044,7 +2044,7 @@
 "    le retrait d'une carte SDHC du lecteur de carte du système.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et retirez la carte SDHC du le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -2070,7 +2070,7 @@
 "    l'insertion d'une carte SDHC après que le système ait été suspendu.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et insérez une carte SDHC dans le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "    2. Ne débranchez pas l'appareil après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
@@ -2107,7 +2107,7 @@
 "été suspendu.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et retirez la carte SDHC du le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -2131,7 +2131,7 @@
 "    détecter l'insertion d'une carte Compact Flash (CF).\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et insérez une carte CF dans le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "    2. Ne débranchez pas l'appareil après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
@@ -2164,7 +2164,7 @@
 "    le retrait d'une carte CF du lecteur de carte du système.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et retirez la carte CF du le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -2189,7 +2189,7 @@
 "    l'insertion d'une carte CF après que le système ait été suspendu.\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et insérez une carte CF le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "    2. Ne débranchez pas l'appareil après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
@@ -2226,7 +2226,7 @@
 "été suspendu..\n"
 "ÉTAPES :\n"
 "    1.  Cliquez sur « Tester » et retirez la carte CF du le lecteur.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne changez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -2264,7 +2264,7 @@
 "ÉTAPES :\n"
 "    1. Informations sur le testeur\n"
 "    2. Veuillez entrer les informations suivantes dans les zones de "
-"commentaires :\n"
+"commentaires :\n"
 "        a. Nom\n"
 "        b. Adresse de courrier électronique\n"
 "        c. La raison de l'exécution de ce test\n"
@@ -2530,7 +2530,7 @@
 "    Ce test va vérifier votre connexion filaire\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur l'icône Réseau dans le panneau supérieur\n"
-"    2. Sélectionnez un réseau en-dessous de la section \"Réseau filaire\"\n"
+"    2. Sélectionnez un réseau en-dessous de la section « Réseau filaire »\n"
 "    3. Cliquez sur « Tester » pour vérifier qu'il est possible d'établir une "
 "connexion HTTP\n"
 "VÉRIFICATION :\n"
@@ -2559,9 +2559,9 @@
 "ÉTAPES :\n"
 "    1. Connectez la ligne téléphonique à l'ordinateur\n"
 "    2. Cliquez sur l'icône Réseau dans le panneau supérieur.\n"
-"    3. Sélectionnez \"Modification des connexions\"\n"
-"    4. Sélectionnez l'onglet \"DSL\"\n"
-"    5. Cliquez sur le bouton \"Ajouter\"\n"
+"    3. Sélectionnez « Modification des connexions »\n"
+"    4. Sélectionnez l'onglet « DSL »\n"
+"    5. Cliquez sur le bouton « Ajouter »\n"
 "    6. Configurer les paramètres de connexion correctement\n"
 "    7. Cliquez sur « Tester » pour vérifier qu'il est possible d'établir une "
 "connexion HTTP\n"
@@ -2654,8 +2654,8 @@
 "fermer en toute sécurité ou ignorer cette fenêtre.\n"
 "    3.  Cliquez sur « Tester » pour démarrer le test.\n"
 "VÉRIFICATION :\n"
-"    Ce test devrait sélectionner automatiquement \"Oui\" s'il réussit, "
-"\"Non\" s'il échoue."
+"    Ce test devrait sélectionner automatiquement « Oui » s'il réussit, "
+"« Non » s'il échoue."
 
 #. description
 #: ../jobs/optical.txt.in:42
@@ -2673,6 +2673,19 @@
 "    This test should automatically select \"Yes\" if it passes, \"No\" if it "
 "fails."
 msgstr ""
+"BUT :\n"
+"    Ce test va vérifier la capacité d'écriture du graveur de CD. Ce test "
+"requiert un CD-R vierge. Si vous n'en possédez pas, passez ce test.\n"
+"ÉTAPES :\n"
+"    1. Insérez un CD-R vierge dans votre lecteur.\n"
+"    2. Cliquez sur \"Tester\" pour démarrer la gravure.\n"
+"    3. Lorsque le système éjecte le CD après la gravure, refermez-le "
+"(N'ENLEVEZ PAS le disque, il est nécessaire pour la seconde partie du test). "
+"(Note : Si le CD n'est pas inséré dans les 10 secondes, le test sera "
+"annulé.)\n"
+"VÉRIFICATION :\n"
+"    Le test devrait sélectionner automatiquement \"Oui\" s'il réussit, ou "
+"\"Non\" s'il échoue."
 
 #. description
 #: ../jobs/optical.txt.in:65
@@ -2700,11 +2713,11 @@
 "    2. Une fois le CD détecté, lancez le lecteur de musique.\n"
 "    3. Localisez le CD dans la fenêtre du lecteur de musique.\n"
 "    4. Sélectionnez le CD dans le lecteur de musique.\n"
-"    5. Cliquez sur le bouton \"Lecture\" pour écouter la musique à partir du "
+"    5. Cliquez sur le bouton « Lecture » pour écouter la musique à partir du "
 "CD.\n"
 "    6. Arrêtez la lecture après quelques instants d'écoute.\n"
-"    7. Faites un clic droit sur l'icône du CD et cliquez sur \"Éjecter le "
-"disque\".\n"
+"    7. Faites un clic droit sur l'icône du CD et cliquez sur « Éjecter le "
+"disque ».\n"
 "    8. Le CD devrait s'éjecter.\n"
 "    9. Fermez le lecteur de musique.\n"
 "VÉRIFICATION :\n"
@@ -2726,6 +2739,19 @@
 "    This test should automatically select \"Yes\" if it passes, \"No\" if it "
 "fails."
 msgstr ""
+"BUT :\n"
+"    Ce test va vérifier la capacité d'écriture du graveur de DVD. Ce test "
+"requiert un DVD-R vierge. Si vous n'en possédez pas, passez ce test.\n"
+"DÉMARCHE :\n"
+"    1. Insérez un DVD-R vierge dans votre lecteur.\n"
+"    2. Cliquez sur \"Tester\" pour démarrer la gravure.\n"
+"    3. Lorsque le graveur éjecte le DVD après la gravure, refermez-le "
+"(N'ENLEVEZ PAS le disque, il est nécessaire pour la seconde partie du test.) "
+"Note : Si le DVD n'est pas inséré dans les 10 secondes, le test sera "
+"annulé.\n"
+"VÉRIFICATION :\n"
+"    Le test devrait sélectionner automatiquement \"Oui\" s'il réussit, ou "
+"\"Non\" s'il échoue."
 
 #. description
 #: ../jobs/optical.txt.in:111
@@ -2746,7 +2772,7 @@
 "    Did all the steps work?"
 msgstr ""
 "BUT :\n"
-"    Ce test va vérifier la capacité de lecture de DVD vidéo. Note : "
+"    Ce test va vérifier la capacité de lecture de DVD vidéo. Note : "
 "l'installation de logiciels non-libres (codecs, lecteurs, etc) peut être "
 "nécessaire avant d'effectuer le test.\n"
 "ÉTAPES :\n"
@@ -2820,10 +2846,10 @@
 "l'horloge système.\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur « Tester » et vérifiez que l'horloge avance d'une heure.\n"
-"        (Note : L'horloge peut mettre presque une minute pour "
+"        (Note : L'horloge peut mettre presque une minute pour "
 "s'actualiser.)\n"
-"    2. Faites un clic droit sur l'horloge et cliquez sur \"Réglages de la "
-"date et de l'heure...\"\n"
+"    2. Faites un clic droit sur l'horloge et cliquez sur « Réglages de la "
+"date et de l'heure... »\n"
 "    3. Vérifiez que l'horloge est en réglage manuel.\n"
 "    4. Reculez l'horloge d'une heure.\n"
 "    5. Fermez la fenêtre et redémarrez l'ordinateur.\n"
@@ -2851,8 +2877,8 @@
 "menu du bureau.\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur l'icône Engrenage dans le coin supérieur droit de l'écran "
-"et cliquez sur \"Éteindre\".\n"
-"    2. Cliquez sur le bouton \"Redémarrer\" à gauche de la boîte de dialogue "
+"et cliquez sur « Éteindre ».\n"
+"    2. Cliquez sur le bouton « Redémarrer » à gauche de la boîte de dialogue "
 "de fermeture.\n"
 "    3. Après le redémarrage, relancez le Test Système. Il devrait reprendre "
 "à cet endroit.\n"
@@ -2900,14 +2926,14 @@
 "ÉTAPES :\n"
 "    1. Assurez-vous qu'une imprimante soit disponible sur votre réseau.\n"
 "    2. Cliquez sur l'icône Engrenage dans le coin supérieur droit de votre "
-"écran puis cliquez sur \"Imprimantes\".\n"
-"    3. Si l'imprimante n'est pas répertoriée, cliquez sur \"Ajouter\".\n"
+"écran puis cliquez sur « Imprimantes ».\n"
+"    3. Si l'imprimante n'est pas répertoriée, cliquez sur « Ajouter ».\n"
 "    4. L'imprimante devrait être détectée et les paramètres de configuration "
 "devraient s'afficher.\n"
 "    5. Imprimez une page de test.\n"
 "VÉRIFICATION :\n"
-"    Êtes-vous parvenu à imprimer une page de test sur l'imprimante en réseau "
-"?"
+"    Êtes-vous parvenu à imprimer une page de test sur l'imprimante en "
+"réseau ?"
 
 #. description
 #: ../jobs/peripheral.txt.in:18
@@ -2941,8 +2967,8 @@
 "    6. Configurez les paramètres de connexion correctement\n"
 "    7. Une notification à l'écran devrait confirmer que la connexion a été "
 "établie\n"
-"    8. Sélectionnez Test pour vérifier qu'il est possible d'établir une "
-"connexion HTTP\n"
+"    8. Sélectionnez « Tester » pour vérifier qu'il est possible d'établir "
+"une connexion HTTP\n"
 "VÉRIFICATION :\n"
 "    La connexion a-t-elle été établie correctement ?"
 
@@ -2998,16 +3024,16 @@
 "    Ce test va vérifier la capacité du système de s'éteindre et de "
 "redémarrer.\n"
 "ÉTAPES :\n"
-"    1. Sélectionnez \"Test\" pour démarrer.\n"
+"    1. Sélectionnez « Tester » pour démarrer.\n"
 "    2. L'ordinateur devrait s'éteindre.\n"
 "    3. Rallumez l'ordinateur.\n"
 "    4. Après le démarrage, attendez le message du test vous informant que le "
 "test est terminé.\n"
-"    5. Lorsque le test est terminé, redémarrez Checkbox et sélectionnez Ré-"
-"exécuter quand cela est proposé\n"
+"    5. Lorsque le test est terminé, redémarrez Checkbox et sélectionnez « Ré-"
+"exécuter » quand cela est proposé\n"
 "VÉRIFICATION :\n"
-"    Si l'ordinateur s'éteint et redémarre correctement, sélectionnez Oui "
-"puis Suivant."
+"    Si l'ordinateur s'éteint et redémarre correctement, sélectionnez « Oui » "
+"puis « Suivant »."
 
 #. description
 #: ../jobs/power-management.txt.in:54
@@ -3036,14 +3062,15 @@
 "BUT :\n"
 "    Ce test va vérifier la capacité du système à redémarrer proprement.\n"
 "ÉTAPES :\n"
-"    1. Sélectionnez \"Test\" pour démarrer.\n"
+"    1. Sélectionnez « Tester » pour démarrer.\n"
 "    2. L'ordinateur devrait redémarrer.\n"
 "    3. Après le redémarrage, attendez le message du test vous informant que "
 "le test est terminé.\n"
-"    4. Lorsque le test est terminé, redémarrez Checkbox et sélectionnez Ré-"
-"exécuter quand cela est proposé\n"
+"    4. Lorsque le test est terminé, redémarrez Checkbox et sélectionnez « Ré-"
+"exécuter » quand cela est proposé\n"
 "VÉRIFICATION :\n"
-"    Si l'ordinateur redémarre correctement, sélectionnez Oui puis Suivant."
+"    Si l'ordinateur redémarre correctement, sélectionnez « Oui«  puis "
+"« Suivant »."
 
 #. description
 #: ../jobs/power-management.txt.in:78
@@ -3087,7 +3114,7 @@
 "    Ce test va vérifier les capteurs du couvercle de votre ordinateur "
 "portable\n"
 "ÉTAPES :\n"
-"    1. Cliquez \"Test\"\n"
+"    1. Cliquez sur « Tester »\n"
 "    2. Rabattez et rouvrez le couvercle de votre ordinateur portable\n"
 "VÉRIFICATION :\n"
 "    Est-ce que l'écran s'est éteint quand le couvercle était fermé ?"
@@ -3109,7 +3136,7 @@
 "    Ce test va vérifier les capteurs du couvercle de votre ordinateur "
 "portable\n"
 "ÉTAPES :\n"
-"    1. Cliquez \"Test\"\n"
+"    1. Cliquez sur « Tester »\n"
 "    2. Rabattez le couvercle\n"
 "    3. Laissez le couvercle fermé 5 secondes\n"
 "    4. Ouvrez le couvercle de votre ordinateur portable\n"
@@ -3318,7 +3345,7 @@
 "BUT :\n"
 "    Ce test va vérifier la mise en veille et la sortie de veille\n"
 "ÉTAPES :\n"
-"    1. Cliquez sur « Oui » et votre système se mettra en veille pendant "
+"    1. Cliquez sur « Tester » et votre système se mettra en veille pendant "
 "environ 30 - 60 secondes\n"
 "    2. Si votre système ne se réveille pas de lui-même après 60 secondes, "
 "veuillez appuyer momentanément sur le bouton de mise en marche pour "
@@ -3707,7 +3734,7 @@
 "    Ce test va vérifier votre connexion USB.\n"
 "ÉTAPES :\n"
 "    1. Brancher un clavier USB sur l'ordinateur.\n"
-"    2. Cliquer \"Test\" et taper du texte.\n"
+"    2. Cliquer sur « Tester » et taper du texte.\n"
 "VÉRIFICATION :\n"
 "    Le clavier fonctionne-t-il ?"
 
@@ -3748,9 +3775,9 @@
 "    Ce test va vérifier que le système détecte correctement l'insertion\n"
 "    d'un périphérique de stockage USB\n"
 "ÉTAPES :\n"
-"    1. Cliquez sur « Test » et insérez un périphérique de stockage USB "
+"    1. Cliquez sur « Tester » et insérez un périphérique de stockage USB "
 "(mémoire flash USB \"pen-drive\"/disque dur).\n"
-"        Note : ce test s'interrompra après 20 secondes).\n"
+"        Note : ce test s'interrompra après 20 secondes).\n"
 "    2. Ne débranchez pas le périphérique après le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne modifiez pas le\n"
@@ -3773,8 +3800,8 @@
 "    Ce test va vérifier que le système détecte correctement le retrait\n"
 "    d'un périphérique de stockage USB\n"
 "ÉTAPES :\n"
-"    1. Cliquez \"Test\" et retirez le périphérique USB.\n"
-"        (Note : ce test s'interrompra après 20 secondes.)\n"
+"    1. Cliquez sur « Tester » et retirez le périphérique USB.\n"
+"        (Note : ce test s'interrompra après 20 secondes.)\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne modifiez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -3797,7 +3824,7 @@
 "ÉTAPES :\n"
 "    1. Branchez un disque dur USB ou une clé USB sur l'ordinateur.\n"
 "    2. Une icône devrait apparaître sur le lanceur d'application.\n"
-"    3. Cliquez \"Test\" pour démarrer le test.\n"
+"    3. Cliquez sur « Tester » pour démarrer le test.\n"
 "VÉRIFICATION :\n"
 "    La vérification de ce test est automatisée. Ne modifiez pas le\n"
 "    résultat sélectionné automatiquement."
@@ -3922,17 +3949,16 @@
 "dossier.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
-" 2. Faites un clic droit sur le dossier \"Test Folder\" et cliquez sur "
-"Copier.\n"
+" 2. Faites un clic droit sur le dossier Test Folder et cliquez sur Copier.\n"
 " 3. Faites un clic droit dans la partie blanche de la fenêtre et cliquez sur "
 "Coller.\n"
-" 4. Faites un clic droit sur le dossier \"Test Folder(copie)\" et cliquez "
-"sur Renommer.\n"
-" 5. Saisissez le nom \"Test Data\" dans le champ de saisie et appuyez sur "
+" 4. Faites un clic droit sur le dossier Test Folder(copie) et cliquez sur "
+"Renommer.\n"
+" 5. Saisissez le nom Test Data dans le champ de saisie et appuyez sur "
 "Entrée.\n"
 " 6. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" Avez-vous maintenant un dossier appelé \"Test Data\" ?"
+" Avez-vous maintenant un dossier appelé Test Data ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:54
@@ -3955,14 +3981,12 @@
 "dossier.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
-" 2. Cliquez et déplacez le dossier \"Test Data\" sur l'icône \"Test "
-"Folder\".\n"
+" 2. Cliquez et déplacez le dossier Test Data sur l'icône Test Folder.\n"
 " 3. Relâchez le bouton.\n"
-" 4. Double cliquez sur le dossier \"Test Folder\" pour l'ouvrir.\n"
+" 4. Double cliquez sur le dossier Test Folder pour l'ouvrir.\n"
 " 5. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" Le dossier \"Test Data\" a-t-il bien été déplacé dans le dossier \"Test "
-"Folder\" ?"
+" Le dossier Test Data a-t-il bien été déplacé dans le dossier Test Folder ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:70
@@ -3985,11 +4009,11 @@
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
 " 2. Faites un clic droit dans la partie blanche et cliquez sur Créer un "
 "nouveau document -> document vide.\n"
-" 3. Saisissez le nom \"Test File 1\" dans le champ de saisie et appuyez sur "
+" 3. Saisissez le nom Test File 1 dans le champ de saisie et appuyez sur "
 "Entrée.\n"
 " 4. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" Avez-vous maintenant un fichier \"Test File 1\" ?"
+" Avez-vous maintenant un fichier Test File 1 ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:85
@@ -4011,17 +4035,16 @@
 "fichier.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
-" 2. Faites un clic droit sur le fichier \"Test File 1\" et cliquez sur "
-"Copier.\n"
+" 2. Faites un clic droit sur le fichier Test File 1 et cliquez sur Copier.\n"
 " 3. Faites un clic droit dans la partie blanche de la fenêtre et cliquez sur "
 "Coller.\n"
-" 4. Faites un clic droit sur le fichier \"Test File 1(copie)\" et cliquez "
-"sur Renommer.\n"
-" 5. Saisissez le nom \"Test File 2\" dans le champ de saisie et appuyez sur "
+" 4. Faites un clic droit sur le fichier Test File 1(copie) et cliquez sur "
+"Renommer.\n"
+" 5. Saisissez le nom Test File 2 dans le champ de saisie et appuyez sur "
 "Entrée.\n"
 " 6. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" Avez-vous maintenant un fichier appelé \"Test File 2\" ?"
+" Avez-vous maintenant un fichier appelé Test File 2 ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:102
@@ -4043,14 +4066,13 @@
 "fichier.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
-" 2. Cliquez et déplacez le fichier \"Test File 2\" sur l'icône du dossier "
-"\"Test Data\".\n"
+" 2. Cliquez et déplacez le fichier Test File 2 sur l'icône du dossier Test "
+"Data.\n"
 " 3. Relâchez le bouton.\n"
-" 4. Double cliquez sur le dossier \"Test Data\" pour l'ouvrir.\n"
+" 4. Double cliquez sur le dossier Test Data pour l'ouvrir.\n"
 " 5. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" Le fichier \"Test File 2\" a-t-il bien été déplacé dans le dossier \"Test "
-"Data\" ?"
+" Le fichier Test File 2 a-t-il bien été déplacé dans le dossier Test Data ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:118
@@ -4070,12 +4092,12 @@
 "fichier.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
-" 2. Faites un clic droit sur le fichier \"Test File 1\" et cliquez sur "
-"Mettre à la corbeille.\n"
-" 3. Vérifiez que \"Test File 1\" a bien été supprimé.\n"
+" 2. Faites un clic droit sur le fichier Test File 1 et cliquez sur Mettre à "
+"la corbeille.\n"
+" 3. Vérifiez que Test File 1 a bien été supprimé.\n"
 " 4. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" \"Test File 1\" a-t-il bien disparu ?"
+" Test File 1 a-t-il bien disparu ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:133
@@ -4096,12 +4118,12 @@
 "dossier.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour lancer le gestionnaire de fichiers.\n"
-" 2. Faites un clic droit sur le dossier \"Test Folder\" et cliquez sur "
-"Mettre à la corbeille.\n"
-" 3. Vérifiez que \"Test Folder\" a bien été supprimé.\n"
+" 2. Faites un clic droit sur le dossier Test Folder et cliquez sur Mettre à "
+"la corbeille.\n"
+" 3. Vérifiez que Test Folder a bien été supprimé.\n"
 " 4. Fermez le gestionnaire de fichiers.\n"
 "VÉRIFICATION :\n"
-" \"Test Folder\" a-t-il bien été supprimé ?"
+" Test Folder a-t-il bien été supprimé ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:207
@@ -4141,7 +4163,7 @@
 "BUT :\n"
 " Ce test va vérifier que Firefox peut exécuter une applet java dans une page "
 "web.\n"
-" Note : ceci peut nécessiter l'installation de logiciels supplémentaires "
+" Note : ceci peut nécessiter l'installation de logiciels supplémentaires "
 "pour réussir.\n"
 "ÉTAPES :\n"
 " 1. Choisissez « Tester » pour lancer Firefox avec la page de test Java, et "
@@ -4162,8 +4184,8 @@
 " Did you see the text?"
 msgstr ""
 "BUT :\n"
-" Ce test va vérifier que Firefox peut exécuter des applications Flash. Note "
-": ceci\n"
+" Ce test va vérifier que Firefox peut exécuter des applications Flash. "
+"Note : ceci\n"
 " peut nécessiter l'installation de logiciels supplémentaires pour réussir.\n"
 "ÉTAPES :\n"
 " 1. Choisissez « Tester » pour lancer Firefox et voir un test Flash.\n"
@@ -4457,7 +4479,7 @@
 "BUT :\n"
 "Ce test vérifie si gcalctool (Calculatrice) fonctionne.\n"
 "ÉTAPES :\n"
-" Cliquez sur « Tester » pour ouvrir la calculatrice et faites :\n"
+" Cliquez sur « Tester » pour ouvrir la calculatrice et faites :\n"
 " 1. Couper\n"
 " 2. Copier\n"
 " 3. Coller\n"
@@ -4500,11 +4522,11 @@
 "BUT:\n"
 " Ce test vérifie que gedit fonctionne.\n"
 "ÉTAPES:\n"
-" 1. Cliquez sur le bouton \"Test\" pour ouvrir gedit, et ré-ouvrez le "
-"fichier que vous avez créé précédemment.\n"
+" 1. Cliquez sur « Tester » pour ouvrir gedit, et ré-ouvrez le fichier que "
+"vous avez créé précédemment.\n"
 " 2. Modifiez puis enregistrez le fichier, puis fermez gedit.\n"
 "VÉRIFICATION:\n"
-" Cela a t-il fonctionné comme prévu?"
+" Cela a t-il fonctionné comme prévu ?"
 
 #. description
 #: ../jobs/user_apps.txt.in:497
@@ -4523,7 +4545,7 @@
 "Ce test vérifie si le terminal GNOME fonctionne.\n"
 "ÉTAPES :\n"
 " 1. Cliquez sur « Tester » pour ouvrir le terminal.\n"
-" 2. Tapez 'ls' et appuyez sur Entrée. Vous devriez voir une liste de "
+" 2. Tapez « ls » et appuyez sur Entrée. Vous devriez voir une liste de "
 "fichiers et dossiers de votre dossier personnel.\n"
 " 3. Fermez la fenêtre du terminal.\n"
 "VÉRIFICATION :\n"
@@ -4553,7 +4575,7 @@
 "    Ce test va vérifier votre connexion sans fil.\n"
 "ÉTAPES :\n"
 "    1. Cliquez sur l'icône Réseau du tableau de bord..\n"
-"    2. Sélectionnez un réseau dans la section 'Réseaux sans fil'.\n"
+"    2. Sélectionnez un réseau dans la section « Réseaux sans fil ».\n"
 "    3. Cliquez sur « Tester » pour vérifier que vous pouvez établir une "
 "connexion HTTP.\n"
 "VÉRIFICATION :\n"
@@ -4762,7 +4784,7 @@
 
 #: ../checkbox_cli/cli_interface.py:127
 msgid "Press any key to continue..."
-msgstr "Appuyez sur une touche pour continuer..."
+msgstr "Appuyez sur une touche pour continuer…"
 
 #: ../checkbox_cli/cli_interface.py:136 ../checkbox_cli/cli_interface.py:235
 #, python-format
@@ -4776,7 +4798,7 @@
 
 #: ../checkbox_cli/cli_interface.py:368
 msgid "Combine with character above to expand node"
-msgstr ""
+msgstr "Combiner avec le caractère ci-dessus pour développer le nœud"
 
 #: ../checkbox_cli/cli_interface.py:417
 msgid "test"
@@ -4884,7 +4906,7 @@
 #: ../plugins/apport_prompt.py:247
 #, python-format
 msgid "Is a package upgrade in process? Error: %s"
-msgstr "Une mise à jour de paquet est-elle en cours ? Erreur : %s"
+msgstr "Une mise à niveau de paquet est-elle en cours ? Erreur : %s"
 
 #: ../plugins/final_prompt.py:33
 msgid "Successfully finished testing!"
@@ -4964,7 +4986,7 @@
 
 #: ../plugins/launchpad_prompt.py:99
 msgid "Exchanging information with the server..."
-msgstr "Échange d'informations avec le serveur..."
+msgstr "Échange d'informations avec le serveur…"
 
 #: ../plugins/launchpad_report.py:167
 msgid ""
@@ -5014,7 +5036,7 @@
 
 #: ../plugins/suites_prompt.py:136 ../qt/frontend/ui_qtfront.h:641
 msgid "Choose tests to run on your system:"
-msgstr "Sélectionnez les tests à exécuter sur votre système :"
+msgstr "Sélectionnez les tests à exécuter sur votre système :"
 
 #: ../scripts/keyboard_test:22
 msgid "Enter text:\n"
@@ -5030,7 +5052,7 @@
 
 #: ../scripts/internet_test:214
 msgid "Connection established lost a packet"
-msgstr "Connexion établie avec perte d'un paquet"
+msgstr "La connexion établie a perdu un paquet"
 
 #: ../scripts/internet_test:217
 msgid "Internet connection fully established"
@@ -5050,7 +5072,7 @@
 
 #: ../qt/frontend/qtfront.cpp:82
 msgid "CPU Test"
-msgstr "Test micropresseur"
+msgstr "Test microprocesseur"
 
 #: ../qt/frontend/qtfront.cpp:83
 msgid "Disk Test"
@@ -5162,7 +5184,7 @@
 
 #: ../qt/frontend/ui_qtfront.h:601
 msgid "OK"
-msgstr ""
+msgstr "OK"
 
 #: ../qt/frontend/ui_qtfront.h:602
 msgid "Don't show me this message in the future"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2012-09-26 16:10:55 +0000
+++ po/pt_BR.po	2012-10-05 14:06:24 +0000
@@ -8,20 +8,20 @@
 "Project-Id-Version: checkbox\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-07-12 16:08-0400\n"
-"PO-Revision-Date: 2012-04-10 03:27+0000\n"
-"Last-Translator: Neliton Pereira Jr. <[e-mail]>\n"
+"PO-Revision-Date: 2012-09-12 17:48+0000\n"
+"Last-Translator: Tiago Hillebrandt <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[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-09-11 04:36+0000\n"
-"X-Generator: Launchpad (build 15924)\n"
+"X-Launchpad-Export-Date: 2012-09-13 04:34+0000\n"
+"X-Generator: Launchpad (build 15944)\n"
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
 #: ../plugins/user_interface.py:43
 msgid "System Testing"
-msgstr "Testes do sistema"
+msgstr "Teste do sistema"
 
 #: ../gtk/checkbox-gtk.ui.h:2 ../checkbox_gtk/gtk_interface.py:561
 msgid "_Test"

=== removed file 'qt/checkbox-qt.ui'
--- qt/checkbox-qt.ui	2012-06-22 17:04:14 +0000
+++ qt/checkbox-qt.ui	1970-01-01 00:00:00 +0000
@@ -1,935 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>main</class>
- <widget class="QWidget" name="main">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>640</width>
-    <height>443</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="tabWelcome">
-      <attribute name="title">
-       <string>Tab 1</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_5">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_5">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QWidget" name="welcomeTop" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>100</height>
-            </size>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_6">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-            <item>
-             <layout class="QHBoxLayout" name="horizontalLayout_4">
-              <property name="spacing">
-               <number>0</number>
-              </property>
-              <item>
-               <widget class="QWidget" name="welcomeTopImage" native="true">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="minimumSize">
-                 <size>
-                  <width>120</width>
-                  <height>0</height>
-                 </size>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QWidget" name="welcomeTopText" native="true">
-                <widget class="QLabel" name="welcomeLabel">
-                 <property name="geometry">
-                  <rect>
-                   <x>30</x>
-                   <y>20</y>
-                   <width>330</width>
-                   <height>51</height>
-                  </rect>
-                 </property>
-                 <property name="font">
-                  <font>
-                   <family>Ubuntu</family>
-                   <pointsize>21</pointsize>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>Ubuntu System Testing</string>
-                 </property>
-                </widget>
-               </widget>
-              </item>
-             </layout>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QWidget" name="welcomeBottom" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <widget class="QTextEdit" name="welcomeTextBox">
-            <property name="geometry">
-             <rect>
-              <x>30</x>
-              <y>40</y>
-              <width>571</width>
-              <height>181</height>
-             </rect>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Plain</enum>
-            </property>
-            <property name="readOnly">
-             <bool>true</bool>
-            </property>
-           </widget>
-           <widget class="QPushButton" name="friendlyTestsButton">
-            <property name="geometry">
-             <rect>
-              <x>30</x>
-              <y>230</y>
-              <width>571</width>
-              <height>31</height>
-             </rect>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Ok</string>
-            </property>
-           </widget>
-           <widget class="QCheckBox" name="checkBox">
-            <property name="geometry">
-             <rect>
-              <x>330</x>
-              <y>280</y>
-              <width>281</width>
-              <height>20</height>
-             </rect>
-            </property>
-            <property name="font">
-             <font>
-              <family>Ubuntu</family>
-             </font>
-            </property>
-            <property name="text">
-             <string>Don't show me this message in the future</string>
-            </property>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tabMain">
-      <attribute name="title">
-       <string>Tab 2</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_7">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_7">
-         <property name="spacing">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QWidget" name="mainTop" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>89</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true">background-color: #C2C7CB;</string>
-           </property>
-           <widget class="QProgressBar" name="progressBar">
-            <property name="geometry">
-             <rect>
-              <x>50</x>
-              <y>40</y>
-              <width>191</width>
-              <height>16</height>
-             </rect>
-            </property>
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="autoFillBackground">
-             <bool>false</bool>
-            </property>
-            <property name="styleSheet">
-             <string notr="true"> QProgressBar {
-     border: 0px solid grey;
-     border-radius: 0px;
-     background: #FFFFFF;
- }
-
- QProgressBar::chunk {
-     background-color: #ed7341;
-     width: 20px;
- }</string>
-            </property>
-            <property name="value">
-             <number>50</number>
-            </property>
-            <property name="invertedAppearance">
-             <bool>false</bool>
-            </property>
-            <property name="format">
-             <string/>
-            </property>
-           </widget>
-           <widget class="QLabel" name="progressLabel">
-            <property name="geometry">
-             <rect>
-              <x>50</x>
-              <y>20</y>
-              <width>241</width>
-              <height>17</height>
-             </rect>
-            </property>
-            <property name="font">
-             <font>
-              <family>Ubuntu</family>
-              <pointsize>9</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>10 tests completed out of 30 (30%)</string>
-            </property>
-           </widget>
-          </widget>
-         </item>
-         <item>
-          <widget class="QTabWidget" name="testsTab">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="styleSheet">
-            <string notr="true"> QTabWidget::pane#testsTab { /* The tab widget frame */
-     border-top: 10 solid #C2C7CB;
-     position: absolute;
-     top: -1.2em;
- }
-
-QTabWidget::tab-bar#testsTab {
-     alignment: center;
- }
-
- /* Style the tab using the tab sub-control. Note that
-     it reads QTabBar _not_ QTabWidget */
- QTabBar::tab {
-    background: #FFFFFF;
-     border: 1px solid #000000;
-     border-bottom-color: #000000; /* same as the pane color */
-     min-width: 8ex;
-     padding: 0px;
- }
-
- QTabBar::tab:selected {
-    background: #C2C7CB;
-     border-color: #000000;
-     border-bottom-color: #000000; /* same as pane color */
- }</string>
-           </property>
-           <property name="currentIndex">
-            <number>1</number>
-           </property>
-           <widget class="QWidget" name="welcome">
-            <property name="font">
-             <font>
-              <pointsize>11</pointsize>
-             </font>
-            </property>
-            <attribute name="title">
-             <string> Welcome </string>
-            </attribute>
-           </widget>
-           <widget class="QWidget" name="testSelection">
-            <property name="font">
-             <font>
-              <pointsize>11</pointsize>
-             </font>
-            </property>
-            <attribute name="title">
-             <string> Selection </string>
-            </attribute>
-            <widget class="QLabel" name="label">
-             <property name="geometry">
-              <rect>
-               <x>50</x>
-               <y>20</y>
-               <width>401</width>
-               <height>16</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Choose tests to run on your system:</string>
-             </property>
-            </widget>
-            <widget class="Line" name="line">
-             <property name="geometry">
-              <rect>
-               <x>40</x>
-               <y>60</y>
-               <width>571</width>
-               <height>16</height>
-              </rect>
-             </property>
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-            </widget>
-            <widget class="Line" name="line_2">
-             <property name="geometry">
-              <rect>
-               <x>410</x>
-               <y>40</y>
-               <width>20</width>
-               <height>211</height>
-              </rect>
-             </property>
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_2">
-             <property name="geometry">
-              <rect>
-               <x>40</x>
-               <y>48</y>
-               <width>101</width>
-               <height>17</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Components</string>
-             </property>
-            </widget>
-            <widget class="QLabel" name="label_3">
-             <property name="geometry">
-              <rect>
-               <x>470</x>
-               <y>46</y>
-               <width>67</width>
-               <height>17</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Status</string>
-             </property>
-            </widget>
-            <widget class="QListView" name="listView">
-             <property name="geometry">
-              <rect>
-               <x>430</x>
-               <y>80</y>
-               <width>181</width>
-               <height>171</height>
-              </rect>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-            </widget>
-            <widget class="QTreeView" name="treeView">
-             <property name="geometry">
-              <rect>
-               <x>50</x>
-               <y>80</y>
-               <width>351</width>
-               <height>171</height>
-              </rect>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="showDropIndicator" stdset="0">
-              <bool>false</bool>
-             </property>
-             <property name="allColumnsShowFocus">
-              <bool>false</bool>
-             </property>
-             <attribute name="headerVisible">
-              <bool>false</bool>
-             </attribute>
-            </widget>
-            <widget class="QPushButton" name="buttonStartTesting">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="geometry">
-              <rect>
-               <x>430</x>
-               <y>260</y>
-               <width>181</width>
-               <height>27</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Start testing</string>
-             </property>
-            </widget>
-           </widget>
-           <widget class="QWidget" name="testing">
-            <property name="font">
-             <font>
-              <pointsize>11</pointsize>
-             </font>
-            </property>
-            <attribute name="title">
-             <string> Run </string>
-            </attribute>
-            <layout class="QHBoxLayout" name="horizontalLayout_2">
-             <property name="spacing">
-              <number>0</number>
-             </property>
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item>
-              <layout class="QVBoxLayout" name="verticalLayout">
-               <property name="spacing">
-                <number>0</number>
-               </property>
-               <item>
-                <widget class="QTabWidget" name="radioTestTab">
-                 <property name="currentIndex">
-                  <number>0</number>
-                 </property>
-                 <widget class="QWidget" name="tab">
-                  <attribute name="title">
-                   <string>Tab 1</string>
-                  </attribute>
-                  <layout class="QVBoxLayout" name="verticalLayout_3">
-                   <property name="spacing">
-                    <number>0</number>
-                   </property>
-                   <property name="margin">
-                    <number>0</number>
-                   </property>
-                   <item>
-                    <layout class="QVBoxLayout" name="verticalLayout_2">
-                     <property name="spacing">
-                      <number>0</number>
-                     </property>
-                     <item>
-                      <widget class="QWidget" name="widget_2" native="true">
-                       <property name="sizePolicy">
-                        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                         <horstretch>0</horstretch>
-                         <verstretch>0</verstretch>
-                        </sizepolicy>
-                       </property>
-                       <property name="minimumSize">
-                        <size>
-                         <width>0</width>
-                         <height>56</height>
-                        </size>
-                       </property>
-                       <widget class="QLabel" name="testTypeLabel">
-                        <property name="geometry">
-                         <rect>
-                          <x>20</x>
-                          <y>10</y>
-                          <width>291</width>
-                          <height>31</height>
-                         </rect>
-                        </property>
-                        <property name="font">
-                         <font>
-                          <family>Ubuntu</family>
-                          <pointsize>17</pointsize>
-                         </font>
-                        </property>
-                        <property name="text">
-                         <string>TextLabel</string>
-                        </property>
-                       </widget>
-                       <widget class="QLabel" name="purposeLabel">
-                        <property name="geometry">
-                         <rect>
-                          <x>30</x>
-                          <y>40</y>
-                          <width>571</width>
-                          <height>16</height>
-                         </rect>
-                        </property>
-                        <property name="font">
-                         <font>
-                          <family>Ubuntu</family>
-                          <pointsize>8</pointsize>
-                          <weight>50</weight>
-                          <bold>false</bold>
-                          <kerning>false</kerning>
-                         </font>
-                        </property>
-                        <property name="text">
-                         <string>TextLabel</string>
-                        </property>
-                       </widget>
-                      </widget>
-                     </item>
-                     <item>
-                      <widget class="QWidget" name="widget_3" native="true">
-                       <layout class="QHBoxLayout" name="horizontalLayout_6">
-                        <property name="spacing">
-                         <number>0</number>
-                        </property>
-                        <property name="margin">
-                         <number>0</number>
-                        </property>
-                        <item>
-                         <layout class="QHBoxLayout" name="horizontalLayout_3">
-                          <property name="spacing">
-                           <number>0</number>
-                          </property>
-                          <item>
-                           <widget class="QWidget" name="widget_5" native="true">
-                            <property name="sizePolicy">
-                             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                             </sizepolicy>
-                            </property>
-                            <layout class="QHBoxLayout" name="horizontalLayout_8">
-                             <property name="spacing">
-                              <number>0</number>
-                             </property>
-                             <property name="margin">
-                              <number>0</number>
-                             </property>
-                             <item>
-                              <widget class="QScrollArea" name="scrollArea">
-                               <property name="sizePolicy">
-                                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                                 <horstretch>0</horstretch>
-                                 <verstretch>0</verstretch>
-                                </sizepolicy>
-                               </property>
-                               <property name="frameShape">
-                                <enum>QFrame::NoFrame</enum>
-                               </property>
-                               <property name="frameShadow">
-                                <enum>QFrame::Plain</enum>
-                               </property>
-                               <property name="lineWidth">
-                                <number>0</number>
-                               </property>
-                               <property name="verticalScrollBarPolicy">
-                                <enum>Qt::ScrollBarAsNeeded</enum>
-                               </property>
-                               <property name="horizontalScrollBarPolicy">
-                                <enum>Qt::ScrollBarAsNeeded</enum>
-                               </property>
-                               <property name="widgetResizable">
-                                <bool>true</bool>
-                               </property>
-                               <widget class="QWidget" name="scrollAreaWidgetContents">
-                                <property name="geometry">
-                                 <rect>
-                                  <x>0</x>
-                                  <y>0</y>
-                                  <width>474</width>
-                                  <height>193</height>
-                                 </rect>
-                                </property>
-                                <layout class="QVBoxLayout" name="verticalLayout_9">
-                                 <property name="spacing">
-                                  <number>0</number>
-                                 </property>
-                                 <property name="sizeConstraint">
-                                  <enum>QLayout::SetDefaultConstraint</enum>
-                                 </property>
-                                 <property name="margin">
-                                  <number>0</number>
-                                 </property>
-                                 <item>
-                                  <widget class="QFrame" name="stepsFrame">
-                                   <property name="sizePolicy">
-                                    <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-                                     <horstretch>0</horstretch>
-                                     <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                   </property>
-                                   <property name="minimumSize">
-                                    <size>
-                                     <width>0</width>
-                                     <height>178</height>
-                                    </size>
-                                   </property>
-                                   <property name="sizeIncrement">
-                                    <size>
-                                     <width>0</width>
-                                     <height>0</height>
-                                    </size>
-                                   </property>
-                                   <property name="frameShape">
-                                    <enum>QFrame::NoFrame</enum>
-                                   </property>
-                                   <property name="frameShadow">
-                                    <enum>QFrame::Plain</enum>
-                                   </property>
-                                   <property name="lineWidth">
-                                    <number>0</number>
-                                   </property>
-                                  </widget>
-                                 </item>
-                                </layout>
-                               </widget>
-                              </widget>
-                             </item>
-                            </layout>
-                           </widget>
-                          </item>
-                          <item>
-                           <widget class="QWidget" name="widget_4" native="true">
-                            <property name="sizePolicy">
-                             <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                              <horstretch>0</horstretch>
-                              <verstretch>0</verstretch>
-                             </sizepolicy>
-                            </property>
-                            <property name="minimumSize">
-                             <size>
-                              <width>150</width>
-                              <height>0</height>
-                             </size>
-                            </property>
-                            <widget class="QPushButton" name="testTestButton">
-                             <property name="geometry">
-                              <rect>
-                               <x>30</x>
-                               <y>70</y>
-                               <width>80</width>
-                               <height>25</height>
-                              </rect>
-                             </property>
-                             <property name="text">
-                              <string>Test</string>
-                             </property>
-                            </widget>
-                            <widget class="QPushButton" name="yesTestButton">
-                             <property name="geometry">
-                              <rect>
-                               <x>30</x>
-                               <y>110</y>
-                               <width>80</width>
-                               <height>25</height>
-                              </rect>
-                             </property>
-                             <property name="text">
-                              <string>Yes</string>
-                             </property>
-                            </widget>
-                            <widget class="QPushButton" name="noTestButton">
-                             <property name="geometry">
-                              <rect>
-                               <x>30</x>
-                               <y>150</y>
-                               <width>80</width>
-                               <height>25</height>
-                              </rect>
-                             </property>
-                             <property name="text">
-                              <string>No</string>
-                             </property>
-                            </widget>
-                           </widget>
-                          </item>
-                         </layout>
-                        </item>
-                       </layout>
-                      </widget>
-                     </item>
-                    </layout>
-                   </item>
-                  </layout>
-                 </widget>
-                 <widget class="QWidget" name="tab_2">
-                  <attribute name="title">
-                   <string>Tab 2</string>
-                  </attribute>
-                 </widget>
-                </widget>
-               </item>
-               <item>
-                <widget class="QWidget" name="nextPrevButtons" native="true">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="minimumSize">
-                  <size>
-                   <width>0</width>
-                   <height>46</height>
-                  </size>
-                 </property>
-                 <widget class="QPushButton" name="nextTestButton">
-                  <property name="geometry">
-                   <rect>
-                    <x>520</x>
-                    <y>10</y>
-                    <width>80</width>
-                    <height>25</height>
-                   </rect>
-                  </property>
-                  <property name="text">
-                   <string>Next</string>
-                  </property>
-                 </widget>
-                 <widget class="QPushButton" name="previousTestButton">
-                  <property name="geometry">
-                   <rect>
-                    <x>420</x>
-                    <y>10</y>
-                    <width>80</width>
-                    <height>25</height>
-                   </rect>
-                  </property>
-                  <property name="text">
-                   <string>Previous</string>
-                  </property>
-                 </widget>
-                </widget>
-               </item>
-              </layout>
-             </item>
-            </layout>
-           </widget>
-           <widget class="QWidget" name="submitResults">
-            <property name="font">
-             <font>
-              <pointsize>11</pointsize>
-             </font>
-            </property>
-            <attribute name="title">
-             <string> Results </string>
-            </attribute>
-            <widget class="QLabel" name="label_4">
-             <property name="geometry">
-              <rect>
-               <x>30</x>
-               <y>20</y>
-               <width>571</width>
-               <height>41</height>
-              </rect>
-             </property>
-             <property name="font">
-              <font>
-               <pointsize>10</pointsize>
-               <weight>50</weight>
-               <bold>false</bold>
-               <kerning>true</kerning>
-              </font>
-             </property>
-             <property name="text">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;Please enter the e-mail address associated with your Launchpad account &#40;if applicable&#41;&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#000000;&quot;&gt;and click the Submit Results button to submit these test results to Ubuntu Friendly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="scaledContents">
-              <bool>false</bool>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-            <widget class="QPushButton" name="buttonViewResults">
-             <property name="geometry">
-              <rect>
-               <x>90</x>
-               <y>80</y>
-               <width>461</width>
-               <height>27</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>View results</string>
-             </property>
-            </widget>
-            <widget class="QPushButton" name="buttonSubmitResults">
-             <property name="geometry">
-              <rect>
-               <x>90</x>
-               <y>120</y>
-               <width>461</width>
-               <height>27</height>
-              </rect>
-             </property>
-             <property name="text">
-              <string>Submit results</string>
-             </property>
-            </widget>
-            <widget class="QGroupBox" name="groupBox">
-             <property name="geometry">
-              <rect>
-               <x>90</x>
-               <y>180</y>
-               <width>461</width>
-               <height>61</height>
-              </rect>
-             </property>
-             <property name="font">
-              <font>
-               <pointsize>10</pointsize>
-              </font>
-             </property>
-             <property name="title">
-              <string>Personal details</string>
-             </property>
-             <property name="flat">
-              <bool>false</bool>
-             </property>
-             <property name="checkable">
-              <bool>false</bool>
-             </property>
-             <widget class="QLineEdit" name="lineEditEmailAddress">
-              <property name="geometry">
-               <rect>
-                <x>110</x>
-                <y>24</y>
-                <width>201</width>
-                <height>27</height>
-               </rect>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-             <widget class="QLabel" name="label_5">
-              <property name="geometry">
-               <rect>
-                <x>10</x>
-                <y>30</y>
-                <width>101</width>
-                <height>17</height>
-               </rect>
-              </property>
-              <property name="font">
-               <font>
-                <pointsize>10</pointsize>
-               </font>
-              </property>
-              <property name="text">
-               <string>Email:</string>
-              </property>
-             </widget>
-            </widget>
-           </widget>
-          </widget>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>

=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-08-30 19:51:51 +0000
+++ qt/frontend/qtfront.cpp	2012-10-05 14:06:24 +0000
@@ -56,7 +56,7 @@
     ui->radioTestTab->setVisible(false);
     ui->nextPrevButtons->setVisible(false);
     ui->treeView->verticalScrollBar()->setTracking(true);
-    connect(ui->friendlyTestsButton, SIGNAL(clicked()), this, SLOT(onFullTestsClicked()));
+    connect(ui->continueButton, SIGNAL(clicked()), this, SLOT(onFullTestsClicked()));
     connect(ui->deselectAllButton, SIGNAL(clicked()), this, SLOT(onDeselectAllClicked()));
     connect(ui->selectAllButton, SIGNAL(clicked()), this, SLOT(onSelectAllClicked()));
     connect(ui->buttonStartTesting, SIGNAL(clicked()), this, SLOT(onStartTestsClicked()));
@@ -70,6 +70,7 @@
     connect(ui->treeView, SIGNAL(expanded(QModelIndex)), this, SLOT(onJobItemChanged(QModelIndex)));
     connect(ui->treeView, SIGNAL(clicked(QModelIndex)), this,  SLOT(onTestSelectionChanged()));
     connect(this, SIGNAL(testSelectionChanged()), this,  SLOT(onTestSelectionChanged()));
+    ui->continueButton->setFocus();
     ui->stepsFrame->setFixedHeight(0);
     ui->buttonSubmitResults->setEnabled(false);
     ui->submissionDataLineEdit->setEnabled(false);

=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui	2012-09-26 16:10:55 +0000
+++ qt/frontend/qtfront.ui	2012-10-05 14:06:24 +0000
@@ -56,7 +56,7 @@
       <attribute name="title">
        <string>Tab 1</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_Welcome">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -64,7 +64,7 @@
         <number>0</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <layout class="QVBoxLayout" name="verticalLayout_Welcome">
          <property name="spacing">
           <number>0</number>
          </property>
@@ -187,7 +187,7 @@
              <bool>true</bool>
             </property>
            </widget>
-           <widget class="QPushButton" name="friendlyTestsButton">
+           <widget class="QPushButton" name="continueButton">
             <property name="geometry">
              <rect>
               <x>20</x>
@@ -204,6 +204,9 @@
             <property name="text">
              <string>Continue</string>
             </property>
+            <property name="default">
+             <bool>true</bool>
+            </property>
            </widget>
            <widget class="Line" name="line_3">
             <property name="geometry">
@@ -745,7 +748,7 @@
                     </property>
                    </widget>
                   </widget>
-                  <widget class="QWidget" name="layoutWidget">
+                  <widget class="QWidget" name="mainTestLayoutWidget">
                    <property name="geometry">
                     <rect>
                      <x>10</x>
@@ -774,7 +777,7 @@
                     </item>
                    </layout>
                   </widget>
-                  <widget class="QWidget" name="layoutWidget">
+                  <widget class="QWidget" name="testLayoutWidget">
                    <property name="geometry">
                     <rect>
                      <x>9</x>

=== added file 'scripts/display_resource'
--- scripts/display_resource	1970-01-01 00:00:00 +0000
+++ scripts/display_resource	2012-10-05 14:06:24 +0000
@@ -0,0 +1,84 @@
+#!/usr/bin/python3
+
+import re
+import sys
+import subprocess
+
+CONNECTOR_RE = re.compile(
+    r"\n(?P<Name>[\w\-]+)"
+    r"(?:\s+.*?"
+    r"SignalFormat:\s+(?P<SignalFormat>[\w\-_]+)\s+.*?"
+    r"ConnectorType:\s+(?P<ConnectorType>[\w\-_]+))?", re.S)
+SVIDEO_RE = re.compile(r"s\-?video|din|cv", re.I)
+DP_RE = re.compile(r"dp|displayport", re.I)
+
+
+def main():
+    try:
+        xrandr_output = subprocess.check_output(
+            ["xrandr", "-q", "--verbose"], universal_newlines=True)
+    except subprocess.CalledProcessError:
+        return 0
+
+    xrandr_output = "\n" + ''.join(xrandr_output.splitlines(True)[1:])
+    supported_connections = dict()
+
+    for m in CONNECTOR_RE.finditer(xrandr_output):
+        name = m.group('Name').lower()
+        signal_format = connector_type = ''  # RandR 1.3 only
+        if m.group('SignalFormat'):
+            signal_format = m.group('SignalFormat').lower()
+        if m.group('ConnectorType'):
+            connector_type = m.group('ConnectorType').lower()
+
+        if name.startswith('vga'):
+            supported_connections['vga'] = 'supported'
+
+        elif name.startswith('dvi'):
+            supported_connections['dvi'] = 'supported'
+
+        elif DP_RE.match(name):
+            # HDMI uses TMDS links, DisplayPort (DP) uses LVDS pairs (lanes)
+            # to transmit micro data packets.
+            # Reported by NVIDIA proprietary drivers (version >= 302.17)
+            if signal_format == 'tmds':
+                supported_connections['hdmi'] = 'supported'
+            else:
+                supported_connections['dp'] = 'supported'
+
+        elif name.startswith('hdmi'):
+            supported_connections['hdmi'] = 'supported'
+
+        elif SVIDEO_RE.match(name):
+            supported_connections['svideo'] = 'supported'
+
+        elif name.startswith('rca'):
+            supported_connections['rca'] = 'supported'
+
+        elif name.startswith('tv'):
+            if SVIDEO_RE.match(signal_format):
+                supported_connections['svideo'] = 'supported'
+            else:
+                supported_connections['tv'] = 'supported'
+
+        # ATI/AMD proprietary FGLRX graphics driver codenames:
+        elif name.startswith('crt') or name.startswith('dfp'):
+            if connector_type.startswith('dvi'):
+                supported_connections['dvi'] = 'supported'
+            elif connector_type.startswith('vga'):
+                supported_connections['vga'] = 'supported'
+            elif DP_RE.match(connector_type) and DP_RE.match(signal_format):
+                supported_connections['dp'] = 'supported'
+            else:
+                # HDMI ports may appear as unknown
+                # (for both signal format and connector type).
+                supported_connections['hdmi'] = 'supported'
+
+    for connector in supported_connections.keys():
+        print("%s: supported" % connector)
+
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

=== modified file 'scripts/graphics_driver'
--- scripts/graphics_driver	2012-09-26 16:10:55 +0000
+++ scripts/graphics_driver	2012-10-05 14:06:24 +0000
@@ -38,19 +38,20 @@
 import sys
 import os
 
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, check_output, CalledProcessError
+
 
 class XorgLog(object):
 
     def __init__(self, logfile=None):
-        self.modules  = [ ]
-        self.errors   = [ ]
-        self.warnings = [ ]
-        self.info     = [ ]
-        self.notimpl  = [ ]
-        self.notices  = [ ]
-        self.cards    = [ ]
-        self.displays = { }
+        self.modules = []
+        self.errors = []
+        self.warnings = []
+        self.info = []
+        self.notimpl = []
+        self.notices = []
+        self.cards = []
+        self.displays = {}
         self.xserver_version = None
         self.boot_time = None
         self.boot_logfile = None
@@ -78,7 +79,8 @@
                     self.modules.append(module)
                 gathering_module = False
                 module = None
-                m = re.search('\(II\) Loading.*modules\/drivers\/(.+)_drv\.so', line)
+                m = re.search(
+                    '\(II\) Loading.*modules\/drivers\/(.+)_drv\.so', line)
                 if m:
                     found_ddx = True
                 m = re.search(r'\(II\) Module (\w+):', line)
@@ -96,26 +98,38 @@
                     gathering_module = True
 
             if gathering_module:
-                   m = re.search(r'vendor="(.*:?)"', line)
-                   if m:
-                       module['vendor'] = m.group(1)
-
-                   m = re.search(r'module version = (.*)', line)
-                   if m:
-                       module['version'] = m.group(1)
-
-                   m = re.search(r'class: (.*)', line)
-                   if m:
-                       module['class'] = m.group(1)
-
-                   m = re.search(r'ABI class:\s+(.*:?), version\s+(.*:?)', line)
-                   if m:
-                       if m.group(1)[:5] == "X.Org":
-                           module['abi_name'] = m.group(1)[6:]
-                       else:
-                           module['abi_name'] = m.group(1)
-                       module['abi_version'] = m.group(2)
-                   continue
+                m = re.search(r'vendor="(.*:?)"', line)
+                if m:
+                    module['vendor'] = m.group(1)
+
+                m = re.search(r'module version = (.*)', line)
+                if m:
+                    module['version'] = m.group(1)
+
+                if module['name'] == 'nvidia':
+                    try:
+                        version = check_output(
+                            "nvidia-settings -v",
+                            shell=True,
+                            universal_newlines=True)
+                        m = re.search(r'.*version\s+([0-9\.]+).*', version)
+                        if m:
+                            module['version'] = m.group(1)
+                    except CalledProcessError:
+                        pass
+
+                m = re.search(r'class: (.*)', line)
+                if m:
+                    module['class'] = m.group(1)
+
+                m = re.search(r'ABI class:\s+(.*:?), version\s+(.*:?)', line)
+                if m:
+                    if m.group(1)[:5] == "X.Org":
+                        module['abi_name'] = m.group(1)[6:]
+                    else:
+                        module['abi_name'] = m.group(1)
+                    module['abi_version'] = m.group(2)
+                continue
 
             # General details
             m = re.search(r'Current Operating System: (.*)$', line)
@@ -163,19 +177,29 @@
                 display = {'Output': display_name}
                 continue
 
-            m = re.search(r'\(II\) (.*)\(\d+\): Assigned Display Device: (.*)$', line)
-            if m:
-                self.displays[display_name] = display
-                self.video_driver = m.group(1)
-                display_name = m.group(2)
-                display = {'Output': display_name}
-                continue
-
-            m = re.search(r'Manufacturer: (.*) *Model: (.*) *Serial#: (.*)', line)
+            m = re.search(
+                r'\(II\) (.*)\(\d+\): Assigned Display Device: (.*)$', line)
+            if m:
+                self.displays[display_name] = display
+                self.video_driver = m.group(1)
+                display_name = m.group(2)
+                display = {'Output': display_name}
+                continue
+
+            m = re.search(r'\(II\) (.*)\(\d+\): Setting mode "(.*?):', line)
+            if m:
+                self.displays[display_name] = display
+                self.video_driver = m.group(1)
+                display_name = m.group(2)
+                display = {'Output': display_name}
+                continue
+
+            m = re.search(
+                r'Manufacturer: (.*) *Model: (.*) *Serial#: (.*)', line)
             if m:
                 display['display manufacturer'] = m.group(1)
-                display['display model']        = m.group(2)
-                display['display serial no.']   = m.group(3)
+                display['display model'] = m.group(2)
+                display['display serial no.'] = m.group(3)
 
             m = re.search(r'EDID Version: (.*)', line)
             if m:
@@ -186,15 +210,18 @@
                 display['vendor'] = m.group(1)
                 display['product id'] = m.group(2)
 
-            m = re.search(r'Max Image Size \[(.*)\]: *horiz.: (.*) *vert.: (.*)', line)
+            m = re.search(
+                r'Max Image Size \[(.*)\]: *horiz.: (.*) *vert.: (.*)', line)
             if m:
-                display['size max horizontal'] = "%s %s" %(m.group(2), m.group(1))
-                display['size max vertical'] = "%s %s" %(m.group(3), m.group(1))
+                display['size max horizontal'] = "%s %s" % (
+                    m.group(2), m.group(1))
+                display['size max vertical'] = "%s %s" % (
+                    m.group(3), m.group(1))
 
             m = re.search(r'Image Size: *(.*) x (.*) (.*)', line)
             if m:
-                display['size horizontal'] = "%s %s" %(m.group(1), m.group(3))
-                display['size vertical'] = "%s %s" %(m.group(2), m.group(3))
+                display['size horizontal'] = "%s %s" % (m.group(1), m.group(3))
+                display['size vertical'] = "%s %s" % (m.group(2), m.group(3))
 
             m = re.search(r'(.*) is preferred mode', line)
             if m:
@@ -202,7 +229,7 @@
 
             m = re.search(r'Modeline \"(\d+)x(\d+)\"x([0-9\.]+) *(.*)$', line)
             if m:
-                key = "mode %sx%s@%s" %(m.group(1), m.group(2), m.group(3))
+                key = "mode %sx%s@%s" % (m.group(1), m.group(2), m.group(3))
                 display[key] = m.group(4)
                 continue
 
@@ -244,9 +271,10 @@
             ])
         return [err for err in self.warnings if err not in excludes]
 
+
 def get_driver_info(xlog):
     '''Return the running driver and version'''
-    print('-'*13,'VIDEO DRIVER INFORMATION','-'*13)
+    print('-' * 13, 'VIDEO DRIVER INFORMATION', '-' * 13)
     if xlog.video_driver:
         for module in xlog.modules:
             if module['name'] == xlog.video_driver.lower():
@@ -259,9 +287,11 @@
                 file=sys.stderr)
         return 1
 
+
 def is_laptop():
     return os.path.isdir('/proc/acpi/button/lid')
 
+
 def hybrid_graphics_check(xlog):
     '''Check for Hybrid Graphics'''
     card_id1 = re.compile('.*0300: *(.+):(.+) \(.+\)')
@@ -289,14 +319,14 @@
             id = id1 + ':' + id2
             cards.append(id)
 
-    print('-'*13,'HYBRID GRAPHICS CHECK','-'*16)
+    print('-' * 13, 'HYBRID GRAPHICS CHECK', '-' * 16)
     for card in cards:
         formatted_name = cards_dict.get(card.split(':')[0], 'Unknown')
         formatted_cards.append(formatted_name)
         print('Graphics Chipset: %s (%s)' % (formatted_name, card))
 
     for module in xlog.modules:
-        if module['ddx'] == True and module['name'] not in drivers:
+        if module['ddx'] and module['name'] not in drivers:
             drivers.append(module['name'])
     print('Loaded DDX Drivers: %s' %
             ', '.join(drivers))
@@ -310,6 +340,7 @@
 
     return 0
 
+
 def main():
     xlog = XorgLog("/var/log/Xorg.0.log")
     results = []

=== modified file 'scripts/network_info'
--- scripts/network_info	2012-06-22 17:04:14 +0000
+++ scripts/network_info	2012-10-05 14:06:24 +0000
@@ -19,7 +19,13 @@
 def get_connected(interface):
     STATUS = ('No', 'Yes')
     carrier_file = os.path.join(SYS_PATH, interface, 'carrier')
-    carrier = int(_read_file(carrier_file))
+
+    carrier = 0
+    try:
+        carrier = int(_read_file(carrier_file))
+    except IOError:
+        pass
+
     return STATUS[carrier]
 
 
@@ -34,7 +40,14 @@
 
 def get_mac_address(interface):
     address_file = os.path.join(SYS_PATH, interface, 'address')
-    return _read_file(address_file)
+
+    address = ''
+    try:
+        address = _read_file(address_file)
+    except IOError:
+        pass
+
+    return address
 
 
 def main(args):

=== removed file 'scripts/network_wireless_test'
--- scripts/network_wireless_test	2011-07-01 11:37:27 +0000
+++ scripts/network_wireless_test	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-#assume that the test fail at the beginning
-found=0
-
-iw_inter=`iwconfig 2>/dev/null | grep "^[^ ]" | awk '{print $1}'`
-if [ -z "$iw_inter" ]; then
-    echo "No wireless device found"
-    exit 0
-fi
-for dev in $iw_inter ; do
-    iw_net=`iwlist $dev scan 2>/dev/null | grep "ESSID:"`
-    if [ ! -z "$iw_net" ] ; then
-        echo "Wireless network found on "$dev
-        cat << EOF
-$iw_net
-EOF
-        found=`expr $found + 1`
-    else
-        echo "No wireless network found on "$dev
-    fi
-done
-if [ $found -eq 0 ]; then
-    exit 1
-fi

=== modified file 'scripts/optical_write_test'
--- scripts/optical_write_test	2012-08-20 18:13:17 +0000
+++ scripts/optical_write_test	2012-10-05 14:06:24 +0000
@@ -68,14 +68,14 @@
     while true; do
         sleep $INTERVAL
         SLEEP_COUNT=`expr $SLEEP_COUNT + $INTERVAL`
-        
+
         mount $OPTICAL_DRIVE 2>&1 |egrep -q "already mounted"
         rt=$?
         if [ $rt -eq 0 ]; then
             echo "Drive appears to be mounted now"
             break
         fi
-        
+
         # If they exceed the timeout limit, make a best effort to load the tray
         # in the next steps
         if [ $SLEEP_COUNT -ge $TIMEOUT ]; then
@@ -84,7 +84,6 @@
         fi
     done
 
-        
     echo "Deleting original data files ..."
     rm -rf $SAMPLE_FILE
     if [ ! -z "$(mount | grep $OPTICAL_DRIVE)" ]; then
@@ -131,7 +130,7 @@
     OPTICAL_DRIVE=$(readlink -f $1)
 else
     OPTICAL_DRIVE='/dev/sr0'
-fi    
+fi
 
 create_working_dirs || failed "Failed to create working directories"
 get_sample_data || failed "Failed to copy sample data"

=== modified file 'setup.py'
--- setup.py	2012-07-17 16:27:55 +0000
+++ setup.py	2012-10-05 14:06:24 +0000
@@ -212,7 +212,7 @@
 This project provides an extensible interface for system testing.
 """,
     data_files = [
-        ("lib/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png", "qt/frontend/checkbox-qt-service"]),
+        ("lib/checkbox/qt/", ["qt/frontend/checkbox-qt-service"]),
         ("share/checkbox/", ["backend", "run"]),
         ("share/checkbox/data/audio/", ["data/audio/*"]), 
         ("share/checkbox/data/documents/", ["data/documents/*"]),