Merge lp:~roadmr/checkbox/checkbox-qt-i18n into lp:checkbox

[Daniel Manrique]

This adds i18n support via gettext to checkbox-qt, to address concerns from the translations team about the new checkbox UI.

What I did basically:

- Adder wrapper checkboxTr functions, inspired from unity-2d's implementation.
- Modified main.cpp and qtfront.h to include headers and initialize gettext.
- Modified frontend.pro to instruct uic-qt4 to use checkboxTr as a translation
  function.
- Added checkbox-qt files to po/POTFILES.in, so intltool gets them. NOTE that
  this depends on uic-qt4 running *before* intltool to generate ui_qtfront.h.
- Added po/Makevars to instruct intltool to extract strings from checkboxTr
  calls. Thanks to Gabor Kelemen for pointers on this.

Note that I didn't wrap all text strings in qt/frontend/*.cpp files, I saw a few that use a "tr" function that I didn't touch, and I'm sure some strings are not wrapped. They need to be wrapped in checkboxTr("string",0).

I'd appreciate review of this in case I did something wrong (maybe run it by the ubuntu-translators crowd), and if it gets merged, it'd be good to go over the .cpp files and checkboxTr-wrap any stray strings in another merge request.

Also note that, due to the criticality of the linked bug, this may be worth a Freeze Exception so it can be merged into the Ubuntu version.

[lp:~roadmr/checkbox/checkbox-qt-i18n]

1342. By Daniel Manrique on 2012-03-28

wrapped a few more strings in checkboxTr

1343. By Daniel Manrique on 2012-03-28

Updated the checkbox.pot file

[Sylvain Pineau (sylvain-pineau)]

checkboxTr function works well and the resulting checkbox.pot now includes strings from the header ui file and treemodel.cpp.

But why leaving some strings not wrapped (e.g. qtfront.cpp)?
Do you prefer to include the checkboxTr mechanism asap and do the rest of the job later ?
And last question, do we have to update the checkbox.pot in bzr to reflect the new additions ?

review: Needs Information

[Daniel Manrique (roadmr)]

I think it'd be worth wrapping the remaining strings in checkboxTr. I translated the ones I spotted, but I may have missed a few.

I'll work on them (I think the ones in lines 87-106 are the main ones to work on) and update the MR in a moment. If you spot any more, please let me know.

review: Needs Fixing

[lp:~roadmr/checkbox/checkbox-qt-i18n]

1344. By Daniel Manrique on 2012-03-28

Wrapped last batch of strings in checkboxTr

1345. By Daniel Manrique on 2012-03-28

minor changelog update

[Daniel Manrique (roadmr)]

I wrapped the remaining strings and did a minor update to the changelog.

review: Needs Resubmitting

[lp:~roadmr/checkbox/checkbox-qt-i18n]

1346. By Daniel Manrique on 2012-03-28

Set localedir to a sane value - otherwise things *don't* work

[TienFu Chen (ctf)]

Hi Daniel,
I set up the destination language in system configuration, the Qt string has been translated to the destination locale. Not sure what's wrong with setting up the environment variables LANG,LANGUAGE,LC_ALL that I tried during the sprint.
Thanks for the works.

review: Approve

[David Planella (dpm)]

Daniel has asked me to have a look at the merge proposal. While I don't think I'll manage to review in detail today, I can say that reading the MP's description all the high level steps make perfect sense to me.

You might have already addressed this, but it would make sense to make the unity 2d translation wrapper function as much generic as possible, as I could well imagine that future Ubuntu projects will make use of it, and it will be much easier to set up those projects if it can be used in a generic way.

As per Sylvain's comment, the .pot file should be updated every time you do a release, or every time you've got a set of new strings that you think translators can work on.

In terms of the Ubuntu packaging, the package will need to generate the .pot file as part of the build so translations for the source package can be shipped in language packs (have a look at dh_translations and have a chat with pitti if you've got questions on this area).

Good work, non-English users will appreciate it!

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-28 19:09:16 +0000
+++ debian/changelog	2012-03-28 20:30:26 +0000
@@ -18,7 +18,15 @@
     checkbox_qt/qt_interface.py, plugins/jobs_prompt.py: The selection tree is
     now updated when recovering from a previous run (LP: #937696)
 
+<<<<<<< TREE
  -- Jeff Lane <[e-mail]>  Wed, 28 Mar 2012 15:07:54 -0400
+=======
+  [Daniel Manrique]
+  * Internationalization support in checkbox-qt; updated checkbox.pot file
+    (LP: #951054) 
+
+ -- Daniel Manrique <[e-mail]>  Thu, 22 Mar 2012 23:56:40 -0400
+>>>>>>> MERGE-SOURCE
 
 checkbox (0.13.5) precise; urgency=low
 

=== added file 'po/Makevars'
--- po/Makevars	1970-01-01 00:00:00 +0000
+++ po/Makevars	2012-03-28 20:30:26 +0000
@@ -0,0 +1,42 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+#
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=g_dngettext:2,3 --keyword=checkboxTr:1,2t --keyword=checkboxTr:1,2,4t
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Canonical Ltd.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = https://bugs.launchpad.net/checkbox/+filebug
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-02-24 21:20:22 +0000
+++ po/POTFILES.in	2012-03-28 20:30:26 +0000
@@ -64,4 +64,14 @@
 plugins/user_interface.py
 scripts/keyboard_test
 scripts/internet_test
-
+checkbox_qt/qt_interface.py
+qt/frontend/checkboxtr.cpp
+qt/frontend/checkboxtr.h
+qt/frontend/main.cpp
+qt/frontend/qtfront.cpp
+qt/frontend/qtfront.h
+qt/frontend/step.cpp
+qt/frontend/step.h
+qt/frontend/treemodel.cpp
+qt/frontend/treemodel.h
+qt/frontend/ui_qtfront.h

=== modified file 'po/checkbox.pot'
--- po/checkbox.pot	2012-01-06 17:51:11 +0000
+++ po/checkbox.pot	2012-03-28 20:30:26 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-06 12:39-0500\n"
+"Report-Msgid-Bugs-To: https://bugs.launchpad.net/checkbox/+filebug\n"
+"POT-Creation-Date: 2012-03-28 10:50-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../gtk/checkbox-gtk.ui.h:1 ../checkbox_cli/cli_interface.py:351
-#: ../checkbox_urwid/urwid_interface.py:261
+#: ../gtk/checkbox-gtk.ui.h:1 ../checkbox_cli/cli_interface.py:444
+#: ../checkbox_urwid/urwid_interface.py:267
 msgid "Further information:"
 msgstr ""
 
@@ -27,8 +27,8 @@
 msgstr ""
 
 #. Title of the user interface
-#: ../gtk/checkbox-gtk.ui.h:3 ../gtk/checkbox-gtk.desktop.in.h:1
-#: ../plugins/user_interface.py:40
+#: ../gtk/checkbox-gtk.ui.h:3 ../qt/checkbox-qt.desktop.in.h:1
+#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:589
 msgid "System Testing"
 msgstr ""
 
@@ -52,7 +52,7 @@
 msgid "_Skip this test"
 msgstr ""
 
-#: ../gtk/checkbox-gtk.ui.h:9 ../checkbox_gtk/gtk_interface.py:535
+#: ../gtk/checkbox-gtk.ui.h:9 ../checkbox_gtk/gtk_interface.py:553
 msgid "_Test"
 msgstr ""
 
@@ -60,7 +60,7 @@
 msgid "_Yes"
 msgstr ""
 
-#: ../gtk/checkbox-gtk.desktop.in.h:2
+#: ../qt/checkbox-qt.desktop.in.h:2
 msgid "Test your system and submit results to the Ubuntu Friendly project"
 msgstr ""
 
@@ -130,18 +130,14 @@
 "    This test will check that a USB audio device works correctly\n"
 "STEPS:\n"
 "    1. Connect a USB audio device to your system\n"
-"    2. Open the volume control application by left-clicking on the speaker "
-"icon in the panel and selecting \"Sound Settings\"\n"
-"    3. Select the \"Input\" tab and choose your USB device\n"
-"    4. Select the \"Output\" tab and choose your USB device\n"
-"    5. Click \"Test\", then speak into the microphone\n"
-"    6. After a few seconds, your speech will be played back to you\n"
+"    2. Click \"Test\", then speak into the microphone\n"
+"    3. After a few seconds, your speech will be played back to you\n"
 "VERIFICATION:\n"
 "    Did you hear your speech played back through the USB headphones?"
 msgstr ""
 
 #. description
-#: ../jobs/audio.txt.in:102
+#: ../jobs/audio.txt.in:99
 msgid ""
 "Play back a sound on the default output and listen for it on the  default "
 "input.  This makes the most sense when the output and input  are directly "
@@ -157,19 +153,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/bluetooth.txt.in:7
-msgid ""
-"This test will detect your Bluetooth device and output the device's hardware "
-"address.  If no device is found, the test will exit with an error."
-msgstr ""
-
-#. description
-#: ../jobs/bluetooth.txt.in:16
+#: ../jobs/bluetooth.txt.in:8
 msgid "Automated test to store bluetooth device information in checkbox report"
 msgstr ""
 
 #. description
-#: ../jobs/bluetooth.txt.in:22
+#: ../jobs/bluetooth.txt.in:14
 msgid ""
 "PURPOSE:\n"
 "    This test will check that bluetooth connection works correctly\n"
@@ -188,7 +177,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/bluetooth.txt.in:41
+#: ../jobs/bluetooth.txt.in:33
 msgid ""
 "PURPOSE:\n"
 "    This test will check that you can transfer information through a "
@@ -202,7 +191,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/bluetooth.txt.in:55
+#: ../jobs/bluetooth.txt.in:47
 msgid ""
 "PURPOSE:\n"
 "    This test will check that you can record and hear audio using a "
@@ -221,7 +210,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/bluetooth.txt.in:73
+#: ../jobs/bluetooth.txt.in:65
 msgid ""
 "PURPOSE:\n"
 "    This test will check that you can use a bluetooth keyboard\n"
@@ -237,7 +226,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/bluetooth.txt.in:89
+#: ../jobs/bluetooth.txt.in:81
 msgid ""
 "PURPOSE:\n"
 "    This test will check that you can use a bluetooth mouse\n"
@@ -263,7 +252,8 @@
 "PURPOSE:\n"
 "    This test will check that the built-in camera works\n"
 "STEPS:\n"
-"    1. Click on Test to display a video capture from the camera\n"
+"    1. Click on Test to display a video capture from the camera for ten "
+"seconds.\n"
 "VERIFICATION:\n"
 "    Did you see the video capture?"
 msgstr ""
@@ -280,19 +270,6 @@
 msgstr ""
 
 #. description
-#: ../jobs/camera.txt.in:49
-msgid ""
-"PURPOSE:\n"
-"    This test will check that you can capture video with the built-in "
-"camera\n"
-"STEPS:\n"
-"    1. Click on Test to capture video to a file (it will automatically open "
-"in Totem)\n"
-"VERIFICATION:\n"
-"    Did you see and hear the capture?"
-msgstr ""
-
-#. description
 #: ../jobs/codecs.txt.in:7
 msgid ""
 "PURPOSE:\n"
@@ -405,26 +382,31 @@
 
 #. description
 #: ../jobs/disk.txt.in:9
-msgid "Benchmark for each disk "
-msgstr ""
-
-#. description
-#: ../jobs/disk.txt.in:26
+msgid "Benchmark for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:23
+msgid "Check stats changes for each disk"
+msgstr ""
+
+#. description
+#: ../jobs/disk.txt.in:40
 msgid "SMART test"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:42
+#: ../jobs/disk.txt.in:56
 msgid "Maximum disk space used during a default installation test"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:57
+#: ../jobs/disk.txt.in:71
 msgid "Verify system storage performs at or above baseline performance"
 msgstr ""
 
 #. description
-#: ../jobs/disk.txt.in:74
+#: ../jobs/disk.txt.in:88
 msgid ""
 "Verify that storage devices, such as Fibre Channel and RAID can be detected "
 "and perform under stress."
@@ -471,18 +453,42 @@
 msgstr ""
 
 #. description
-#: ../jobs/firewire.txt.in:3
+#: ../jobs/firewire.txt.in:4
 msgid ""
 "PURPOSE:\n"
-"    This test will check that the firewire port works\n"
+"    This test will check the system can detect the insertion of a FireWire "
+"HDD\n"
 "STEPS:\n"
-"    1. Plug a Firewire HDD into the computer\n"
-"    2. Either a window asking which action should be performed (open folder, "
-"photo manager, etc) or a file browser will open.\n"
-"    3. Copy some files from your internal HDD to the firewire HDD\n"
-"    4. Copy some files from the firewire HDD to your internal HDD\n"
+"    1. Click 'Test' to begin the test. This test will\n"
+"       timeout and fail if the insertion has not been detected within 10 "
+"seconds.\n"
+"    2. Plug a FireWire HDD into an available FireWire port.\n"
 "VERIFICATION:\n"
-"    Do the copy operations work as expected?"
+"    The verification of this test is automated. Do not change the "
+"automatically\n"
+"    selected result"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:19
+msgid ""
+"This is an automated test which performs read/write operations on an "
+"attached FireWire HDD"
+msgstr ""
+
+#. description
+#: ../jobs/firewire.txt.in:27
+msgid ""
+" PURPOSE:\n"
+"   This test will check the system can detect the removal of a FireWire HDD\n"
+" STEPS:\n"
+"   1. Click 'Test' to begin the test. This test will timeout and fail if\n"
+"      the removal has not been detected within 10 seconds.\n"
+"   2. Remove the previously attached FireWire HDD from the FireWire port.\n"
+" VERIFICATION:\n"
+"   The verification of this test is automated. Do not change the "
+"automatically\n"
+"   selected result"
 msgstr ""
 
 #. description
@@ -586,21 +592,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:107
-msgid ""
-"PURPOSE:\n"
-"    This test checks the detected video modes\n"
-"STEPS:\n"
-"    1. The following screens and video modes have been detected on your "
-"system\n"
-"INFO:\n"
-"    $output\n"
-"VERIFICATION:\n"
-"    Are those correct?"
+#: ../jobs/graphics.txt.in:106
+msgid "Check that VESA drivers are not in use"
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:122
+#: ../jobs/graphics.txt.in:113
 msgid ""
 "PURPOSE:\n"
 "    This test cycles through the detected video modes\n"
@@ -611,12 +608,17 @@
 msgstr ""
 
 #. description
+#: ../jobs/graphics.txt.in:126
+msgid "Check that hardware is able to run compiz"
+msgstr ""
+
+#. description
 #: ../jobs/graphics.txt.in:133
-msgid "Check that the hardware is able to run compiz."
+msgid "Check that hardware is able to run Unity 3D"
 msgstr ""
 
 #. description
-#: ../jobs/graphics.txt.in:140
+#: ../jobs/graphics.txt.in:139
 msgid ""
 "PURPOSE:\n"
 "    This test tests the basic 3D capabilities of your video card\n"
@@ -630,6 +632,55 @@
 msgstr ""
 
 #. description
+#: ../jobs/graphics.txt.in:159
+msgid ""
+"PURPOSE:\n"
+"    Do some challenging operations and check for lockup on the GPU\n"
+"STEPS:\n"
+"    1. Create 2 glxgears windows and move them quickly\n"
+"    2. Switch workspaces/viewports with wmctrl\n"
+"    3. Launch a Flash playback in firefox\n"
+"    4. Suspend/resume\n"
+"VERIFICATION:\n"
+"    1. Atfer a 60s workload, check kern.log for reported GPU errors"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:174
+msgid ""
+"PURPOSE:\n"
+"    Take a screengrab of the current screen (logged on Unity desktop)\n"
+"STEPS:\n"
+"    1. Take picture using USB webcam\n"
+"VERIFICATION:\n"
+"    1. Review attachment manually later"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:186 ../jobs/suspend.txt.in:316
+msgid "Attaches the screenshot captured in graphics/screenshot."
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:194
+msgid ""
+"PURPOSE:\n"
+"    Take a screengrab of the current screen during fullscreen video "
+"playback\n"
+"STEPS:\n"
+"    1. Start a fullscreen video playback\n"
+"    2. Take picture using USB webcam after a few seconds\n"
+"VERIFICATION:\n"
+"    1. Review attachment manually later"
+msgstr ""
+
+#. description
+#: ../jobs/graphics.txt.in:207
+msgid ""
+"Attaches the screenshot captured in graphics/screenshot_fullscreen_video."
+msgstr ""
+
+#. description
 #: ../jobs/hibernate.txt.in:7
 msgid ""
 "PURPOSE:\n"
@@ -714,52 +765,42 @@
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:85
-msgid "Captures a screenshot."
-msgstr ""
-
-#. description
-#: ../jobs/info.txt.in:91
-msgid "Attaches the screenshot captured in info/screenshot."
-msgstr ""
-
-#. description
-#: ../jobs/info.txt.in:96
+#: ../jobs/info.txt.in:82
 msgid "Gather log from the Firmware Test Suite run."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:103
+#: ../jobs/info.txt.in:89
 msgid "Attaches the contents of /proc/acpi/sleep if it exists."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:107
+#: ../jobs/info.txt.in:93
 msgid "Bootchart information."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:116
+#: ../jobs/info.txt.in:102
 msgid "SATA/IDE device information."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:133
+#: ../jobs/info.txt.in:119
 msgid "Attaches the bootchart png file for bootchart runs"
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:142
+#: ../jobs/info.txt.in:128
 msgid "Attaches the bootchart log for bootchart test runs."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:150
+#: ../jobs/info.txt.in:136
 msgid "installs the installer bootchart tarball if it exists."
 msgstr ""
 
 #. description
-#: ../jobs/info.txt.in:155
+#: ../jobs/info.txt.in:141
 msgid "Attaches the installer debug log if it exists."
 msgstr ""
 
@@ -864,16 +905,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/keys.txt.in:76
+#: ../jobs/keys.txt.in:74
 msgid ""
 "PURPOSE:\n"
 "    This test will test the media keys of your keyboard\n"
 "STEPS:\n"
-"    1. Click test to launch the media player\n"
-"    2. Press the play/pause key on the keyboard\n"
-"    3. Press the forward key on the keyboard\n"
-"    4. Press the backward key on the keyboard\n"
-"    5. Press stop key on the keyboard\n"
+"    1. Click test to open a window on which to test the media control keys.\n"
+"    2. If all the keys work, the test will be marked as passed.\n"
+"    3. If your computer has no media control keys, Skip this test.\n"
 "VERIFICATION:\n"
 "    Do the keys work as expected?"
 msgstr ""
@@ -884,187 +923,187 @@
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:8
+#: ../jobs/local.txt.in:10
 msgid "Autotest Suite tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:13
+#: ../jobs/local.txt.in:17
 msgid "Bluetooth tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:18
+#: ../jobs/local.txt.in:24
 msgid "Camera tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:23
+#: ../jobs/local.txt.in:31
 msgid "Codec tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:28
+#: ../jobs/local.txt.in:38
 msgid "CPU tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:33
+#: ../jobs/local.txt.in:45
 msgid "System Daemon tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:38
+#: ../jobs/local.txt.in:52
 msgid "Disk tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:43
+#: ../jobs/local.txt.in:59
 msgid "Fingerprint reader tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:48
+#: ../jobs/local.txt.in:66
 msgid "Firewire disk tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:53
+#: ../jobs/local.txt.in:73
 msgid "Floppy disk tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:58
+#: ../jobs/local.txt.in:80
 msgid "Graphics tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:63
+#: ../jobs/local.txt.in:87
 msgid "Hibernation tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:68
+#: ../jobs/local.txt.in:94
 msgid "Informational tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:73
+#: ../jobs/local.txt.in:101
 msgid "Input Devices tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:78
+#: ../jobs/local.txt.in:108
 msgid "Software Installation tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:83
+#: ../jobs/local.txt.in:115
 msgid "Hotkey tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:88
+#: ../jobs/local.txt.in:122
 msgid "Linux Test Project tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:93
+#: ../jobs/local.txt.in:129
 msgid "Mago Automated Desktop Testing"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:98
+#: ../jobs/local.txt.in:136
 msgid "Media Card tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:103
+#: ../jobs/local.txt.in:143
 msgid "Memory tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:108
+#: ../jobs/local.txt.in:150
 msgid "Miscellaneous tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:113
+#: ../jobs/local.txt.in:157
 msgid "Monitor tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:118
+#: ../jobs/local.txt.in:164
 msgid "Networking tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:123
+#: ../jobs/local.txt.in:171
 msgid "Optical Drive tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:128
+#: ../jobs/local.txt.in:178
 msgid "Panel Clock Verification tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:133
+#: ../jobs/local.txt.in:185
 msgid "PCMCIA/PCIX Card tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:138
+#: ../jobs/local.txt.in:192
 msgid "Peripheral tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:143
+#: ../jobs/local.txt.in:199
 msgid "Phoronix Test Suite tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:148
+#: ../jobs/local.txt.in:206
 msgid "Power Management tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:153
+#: ../jobs/local.txt.in:213
 msgid "QA Regression tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:158
+#: ../jobs/local.txt.in:220
 msgid "Server Services checks"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:163
+#: ../jobs/local.txt.in:227
 msgid "Suspend tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:168
+#: ../jobs/local.txt.in:234
 msgid "Unity tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:173
+#: ../jobs/local.txt.in:241
 msgid "USB tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:178
+#: ../jobs/local.txt.in:248
 msgid "User Applications"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:183
+#: ../jobs/local.txt.in:255
 msgid "Wireless networking tests"
 msgstr ""
 
 #. description
-#: ../jobs/local.txt.in:188
+#: ../jobs/local.txt.in:262
 msgid "Stress tests"
 msgstr ""
 
@@ -1083,195 +1122,312 @@
 msgstr ""
 
 #. description
-#: ../jobs/mediacard.txt.in:3
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Secure Digital (SD) media card support\n"
-"STEPS:\n"
-"    1. Plug a SD media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:17
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Secure Digital (SD) media card support "
-"after suspend\n"
-"STEPS:\n"
-"    1. Plug a SD media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:30
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Secure Digital High Capacity (SDHC) "
-"media card support\n"
-"STEPS:\n"
-"    1. Plug a SDHC media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:44
-msgid ""
-"    This test will check your system Secure Digital High Capacity (SDHC) "
-"media card support after suspend\n"
-"STEPS:\n"
-"    1. Plug a SDHC media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:56
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Multi Media Card (MMC) media card "
-"support\n"
-"STEPS:\n"
-"    1. Plug a MMC media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:70
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Multi Media Card (MMC) media card "
-"support after suspend\n"
-"STEPS:\n"
-"    1. Plug a MMC media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:83
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Memory Stick (MS) media card support\n"
-"STEPS:\n"
-"    1. Plug a MS media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
+#: ../jobs/mediacard.txt.in:4
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Multimedia Card (MMC) media\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:20
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert test is "
+"run. It tests reading and writing to the MMC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:28
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of the MMC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:43
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an MMC card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an MMC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:59
+msgid ""
+"This test is automated and executes after the mediacard/mmc-insert-after-"
+"suspend test is run. It tests reading and writing to the MMC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:67
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an MMC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the MMC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:81
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital (SD) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
 msgstr ""
 
 #. description
 #: ../jobs/mediacard.txt.in:97
 msgid ""
-"PURPOSE:\n"
-"    This test will check your system Memory Stick (MS) media card support "
-"after suspend\n"
-"STEPS:\n"
-"    1. Plug a MS media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:110
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Memory Stick Pro (MSP) media card "
-"support\n"
-"STEPS:\n"
-"    1. Plug a MSP media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:124
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Memory Stick Pro (MSP) media card "
-"support after suspend\n"
-"STEPS:\n"
-"    1. Plug a MSP media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:137
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system Compact Flash (CF) media card support\n"
-"STEPS:\n"
-"    1. Plug a CF media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/mediacard.txt.in:151
-msgid ""
-"    This test will check your system Compact Flash (CF) media card support "
-"after suspend\n"
-"STEPS:\n"
-"    1. Plug a CF media card into the computer\n"
-"    2. An icon should appear on the Launcher\n"
-"    3. Right click on the Launcher icon and select \"Safely Remove Drive\"\n"
-"    4. The icon should disappear from the Launcher\n"
-"VERIFICATION:\n"
-"    Does the icon automatically appear/disappear?"
-msgstr ""
-
-#. description
-#: ../jobs/memory.txt.in:4
-msgid ""
-"PURPOSE:\n"
-"    This test checks the amount of memory that is detected\n"
-"STEPS:\n"
-"    1. Click Test to see the amount of detected memory\n"
-"INFO:\n"
-"    $output\n"
-"VERIFICATION:\n"
-"    Is the amount of detected memory correct?"
-msgstr ""
-
-#. description
-#: ../jobs/memory.txt.in:19
+"This test is automated and executes after the mediacard/sd-insert test is "
+"run. It tests reading and writing to the SD card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:105
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:120
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SD card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SD card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:136
+msgid ""
+"This test is automated and executes after the mediacard/sd-insert-after-"
+"suspend test is run. It tests reading and writing to the SD card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:144
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SD card from the systems card reader after the system "
+"has been suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SD card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:158
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Secure Digital High-Capacity (SDHC) media "
+"card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:174
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert test is "
+"run. It tests reading and writing to the SDHC card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:182
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of an SDHC card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:197
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of an SDHC media card after the system has been "
+"suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert an SDHC card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:213
+msgid ""
+"This test is automated and executes after the mediacard/sdhc-insert-after-"
+"suspend test is run. It tests reading and writing to the SDHC card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:221
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of an SDHC card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the SDHC card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:235
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a Compact Flash (CF) media card\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:251
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert test is "
+"run. It tests reading and writing to the CF card."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:259
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects\n"
+"    the removal of a CF card from the systems card reader.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:274
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the systems media card reader can\n"
+"    detect the insertion of a CF card after the system has been suspended\n"
+"STEPS:\n"
+"    1. Click \"Test\" and insert a CF card into the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"    2. Do not unplug the device after the test.\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:290
+msgid ""
+"This test is automated and executes after the mediacard/cf-insert-after-"
+"suspend test is run. It tests reading and writing to the CF card after the "
+"system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/mediacard.txt.in:298
+msgid ""
+"PURPOSE:\n"
+"    This test will check that the system correctly detects the removal\n"
+"    of a CF card from the systems card reader after the system has been "
+"suspended.\n"
+"STEPS:\n"
+"    1. Click \"Test\" and remove the CF card from the reader.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
+"VERIFICATION:\n"
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:5
+msgid ""
+"This test checks the amount of memory which is reporting in meminfo against "
+"the size of the memory modules detected by DMI."
+msgstr ""
+
+#. description
+#: ../jobs/memory.txt.in:14
 msgid "Test and exercise memory."
 msgstr ""
 
@@ -1295,39 +1451,36 @@
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:30
-msgid ""
-"ipmitool is required for ipmi testing. This checks for ipmitool and installs "
-"it if not available."
-msgstr ""
-
-#. description
-#: ../jobs/miscellanea.txt.in:37
+#: ../jobs/miscellanea.txt.in:31
 msgid ""
 "This will run some basic connectivity tests against a BMC, verifying that "
 "IPMI works."
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:43
+#: ../jobs/miscellanea.txt.in:37
 msgid ""
 "   Determine if we need to run tests specific to portable computers that may "
 "not apply to desktops."
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:51
-msgid ""
-"This test checks /var/crash to see if there are any crash reports present."
-msgstr ""
-
-#. description
-#: ../jobs/miscellanea.txt.in:51
-msgid "If there are, this test will fail."
-msgstr ""
-
-#. description
-#: ../jobs/monitor.txt.in:3
+#: ../jobs/miscellanea.txt.in:45
+msgid ""
+"Test that the /var/crash directory doesn't contain anything. Lists the files "
+"contained within if it does, or echoes the status of the directory (doesn't "
+"exist/is empty)"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:53
+msgid ""
+"Test to check that virtualization is supported and the test system has at "
+"least a minimal amount of RAM to function as an OpenStack Compute Node"
+msgstr ""
+
+#. description
+#: ../jobs/monitor.txt.in:4
 msgid ""
 "PURPOSE:\n"
 "    This test will check your VGA port. Skip if your system does not have a "
@@ -1340,7 +1493,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:13
+#: ../jobs/monitor.txt.in:15
 msgid ""
 "PURPOSE:\n"
 "    This test will check your DVI port. Skip if your system does not have a "
@@ -1353,7 +1506,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:23
+#: ../jobs/monitor.txt.in:26
 msgid ""
 "PURPOSE:\n"
 "    This test will check your DisplayPort port. Skip if your system does not "
@@ -1366,7 +1519,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:33
+#: ../jobs/monitor.txt.in:37
 msgid ""
 "PURPOSE:\n"
 "    This test will check your HDMI port. Skip if your system does not have a "
@@ -1379,7 +1532,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:43
+#: ../jobs/monitor.txt.in:48
 msgid ""
 "PURPOSE:\n"
 "    This test will check your S-VIDEO port. Skip if your system does not "
@@ -1392,7 +1545,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:53
+#: ../jobs/monitor.txt.in:59
 msgid ""
 "PURPOSE:\n"
 "    This test will check your RCA port. Skip if your system does not have a "
@@ -1405,7 +1558,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/monitor.txt.in:64
+#: ../jobs/monitor.txt.in:70
 msgid ""
 "PURPOSE:\n"
 "    This test will check your monitor power saving capabilities\n"
@@ -1432,7 +1585,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:36
+#: ../jobs/networking.txt.in:40
+msgid ""
+"This is an automated test to gather some info on the current state of your "
+"network devices. If no devices are found, the test will exit with an error."
+msgstr ""
+
+#. description
+#: ../jobs/networking.txt.in:46
 msgid ""
 "PURPOSE:\n"
 "    This test will check your wired connection\n"
@@ -1446,7 +1606,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:49
+#: ../jobs/networking.txt.in:59
 msgid ""
 "PURPOSE:\n"
 "    This test will check that a DSL modem can be configured and connected.\n"
@@ -1464,44 +1624,44 @@
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:66
+#: ../jobs/networking.txt.in:76
 msgid ""
 "Automated test case to verify availability of some system on the network "
 "using ICMP ECHO packets."
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:73 ../jobs/peripheral.txt.in:37
+#: ../jobs/networking.txt.in:83 ../jobs/peripheral.txt.in:37
 msgid ""
 "Automated test case to make sure that it's possible to download files "
 "through HTTP"
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:81
+#: ../jobs/networking.txt.in:91
 msgid "Test to see if we can sync local clock to an NTP server"
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:87
+#: ../jobs/networking.txt.in:97
 msgid ""
 "Verify that an installation of checkbox-server on the network can be reached "
 "over SSH."
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:93
+#: ../jobs/networking.txt.in:103
 msgid "Try to enable a remote printer on the network and print a test page."
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:98
+#: ../jobs/networking.txt.in:108
 msgid ""
 "Automated test to walk multiple network cards and test each one in sequence."
 msgstr ""
 
 #. description
-#: ../jobs/networking.txt.in:118
+#: ../jobs/networking.txt.in:128
 msgid "Test to measure the network bandwidth"
 msgstr ""
 
@@ -1511,63 +1671,80 @@
 msgstr ""
 
 #. description
-#: ../jobs/optical.txt.in:13
-msgid "Optical Storage device read tests"
-msgstr ""
-
-#. description
-#: ../jobs/optical.txt.in:36
-msgid ""
-"PURPOSE:\n"
-"    This test will check your system's CDROM writing capabilities. If your "
-"drive does not support writing CDs or you do not have any blank CD media, "
-"please skip this test.\n"
-"STEPS:\n"
-"    1. Enter a blank CDROM into your drive\n"
-"    2. Write something in the CDROM\n"
-"    3. Read the newly written CDROM\n"
-"VERIFICATION:\n"
-"    Was the data correctly written?"
-msgstr ""
-
-#. description
-#: ../jobs/optical.txt.in:49
+#: ../jobs/optical.txt.in:16
+msgid ""
+"PURPOSE:\n"
+"    This test will check your optical devices ability to read CD media\n"
+"STEPS:\n"
+"    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.\n"
+"    2. If a file browser window opens, you can safely close or ignore that "
+"window.\n"
+"    3. Click \"Test\" to being the test.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:43
+msgid ""
+"PURPOSE:\n"
+"    This test will check your system's CD writing capabilities. This test "
+"requires a blank CD-R. If you do not have a blank CD-R, skip this test.\n"
+"STEPS:\n"
+"    1. Enter a blank CD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    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 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
+"VERIFICATION:\n"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
+msgstr ""
+
+#. description
+#: ../jobs/optical.txt.in:57
 msgid ""
 "PURPOSE:\n"
 "    This test will check your CD audio playback capabilities\n"
 "STEPS:\n"
 "    1. Insert an audio CD in your optical drive\n"
-"    2. Open the Dash (click on the Ubuntu Circle of Friends button on the "
-"Launcher)\n"
-"    3. Click \"Listen to Music\" to open Banshee\n"
-"    4. Select the CD under \"Libraries\" in the left panel of Banshee\n"
-"    5. Click the Play button to listen to music\n"
+"    2. When prompted, launch the Music Player\n"
+"    3. Locate the CD in the display of the Music Player\n"
+"    4. Select the CD in the Music Player\n"
+"    5. Click the Play button to listen to the music on the CD\n"
 "    6. Stop playing after some time\n"
-"    7. Right click on the CD icon under \"Libraries\" and select \"Eject Disc"
-"\"\n"
+"    7. Right click on the CD icon and select \"Eject Disc\"\n"
 "    8. The CD should be ejected\n"
-"    9. Close Banshee\n"
+"    9. Close the Music Player\n"
 "VERIFICATION:\n"
 "    Did all the steps work?"
 msgstr ""
 
 #. description
-#: ../jobs/optical.txt.in:69
+#: ../jobs/optical.txt.in:80
 msgid ""
 "PURPOSE:\n"
-"    This test will check your system's DVD writing capabilities. If your "
-"drive does not support writing DVDs or you do not have any blank DVD media, "
-"please skip this test.\n"
+"    This test will check your system's DVD writing capabilities. This test "
+"requires a blank DVD-R. If you do not have a blank DVD-R, skip this test.\n"
 "STEPS:\n"
-"    1. Enter a blank DVD into your drive\n"
-"    2. Write something in the DVD\n"
-"    3. Read the newly written DVD\n"
+"    1. Enter a blank DVD-R into your drive\n"
+"    2. Click \"Test\" to begin.\n"
+"    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 10 seconds or the test will time out.\n"
+"    4. When the test completes, proceed by clicking \"Next\"\n"
 "VERIFICATION:\n"
-"    Was the data correctly written?"
+"    This test should automatically select \"Yes\" if it passes, \"No\" if it "
+"fails."
 msgstr ""
 
 #. description
-#: ../jobs/optical.txt.in:82
+#: ../jobs/optical.txt.in:94
 msgid ""
 "PURPOSE:\n"
 "    This test will check your DVD movie playback capabilities. Note that "
@@ -1586,7 +1763,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/optical.txt.in:100
+#: ../jobs/optical.txt.in:112
 msgid ""
 "PURPOSE:\n"
 "    This test will check your DVD  playback capabilities\n"
@@ -1842,35 +2019,40 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:3
+#: ../jobs/suspend.txt.in:4
+msgid "Record the current network before suspending."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:9
 msgid "Record the current resolution before suspending."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:11
+#: ../jobs/suspend.txt.in:17
 msgid "Record mixer settings before suspending."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:18
+#: ../jobs/suspend.txt.in:24
 msgid "Verify that all the CPUs are online before suspending"
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:25
+#: ../jobs/suspend.txt.in:31
 msgid ""
 "Dumps memory info to a file for comparison after suspend test has been run"
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:43
+#: ../jobs/suspend.txt.in:40
 msgid ""
 "This test disconnects all connections and then connects to the wireless "
 "interface. It then checks the connection to confirm it's working as expected."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:73
+#: ../jobs/suspend.txt.in:74
 msgid ""
 "PURPOSE:\n"
 "    This test will check suspend and resume\n"
@@ -1886,33 +2068,33 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:86
+#: ../jobs/suspend.txt.in:87
 msgid "Test the network after resuming."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:92
+#: ../jobs/suspend.txt.in:93
 msgid "Test to see that we have the same resolution after resuming as before."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:101
+#: ../jobs/suspend.txt.in:102
 msgid ""
 "Verify that mixer settings after suspend are the same as before suspend."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:117
+#: ../jobs/suspend.txt.in:118
 msgid "Verify that all CPUs are online after resuming."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:134
+#: ../jobs/suspend.txt.in:135
 msgid "Verify that all memory is available after resuming from suspend."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:143
+#: ../jobs/suspend.txt.in:144
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the display is correct after suspend and "
@@ -1922,7 +2104,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:164
+#: ../jobs/suspend.txt.in:155
 msgid ""
 "This test checks that the wireless interface is working after suspending the "
 "system. It disconnects all interfaces and then connects to the wireless "
@@ -1930,21 +2112,49 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:174
+#: ../jobs/suspend.txt.in:167
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11b/g protocols after the system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:178
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11b/g protocols after the system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:189
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using WPA "
+"security and the 802.11n protocol after the system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:200
+msgid ""
+"Tests that the systems wireless hardware can connect to a router using no "
+"security and the 802.11n protocol after the system has been suspended."
+msgstr ""
+
+#. description
+#: ../jobs/suspend.txt.in:211
 msgid ""
 "This test grabs the hardware address of the bluetooth adapter after suspend "
 "and compares it to the address grabbed before suspend."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:182
+#: ../jobs/suspend.txt.in:221
 msgid ""
 "This is an automated Bluetooth file transfer test. It sends an image to the "
 "device specified by the BTDEVADDR environment variable."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:190
+#: ../jobs/suspend.txt.in:231
 msgid ""
 "PURPOSE:\n"
 "    This test will send the image 'JPEG_Color_Image_Ubuntu.jpg' to a "
@@ -1959,7 +2169,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:204
+#: ../jobs/suspend.txt.in:245
 msgid ""
 "PURPOSE:\n"
 "    This test will cycle through the detected display modes\n"
@@ -1970,7 +2180,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:216
+#: ../jobs/suspend.txt.in:257
 msgid ""
 "This test will check to make sure supported video modes work after a suspend "
 "and resume. This is done automatically by taking screenshots and uploading "
@@ -1978,28 +2188,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:225
+#: ../jobs/suspend.txt.in:266
 msgid ""
 "This attaches screenshots from the suspend/"
 "cycle_resolutions_after_suspend_auto test to the results submission."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:231
-msgid ""
-"PURPOSE:\n"
-"    This will test that USB functionality is restored after a suspend and "
-"resume cycle\n"
-"STEPS:\n"
-"    1. Plug in at least one USB storage device if one is not already "
-"connected\n"
-"    2. Click \"Test\" to start\n"
-"VERIFICATION:\n"
-"    Automatically verified"
-msgstr ""
-
-#. description
-#: ../jobs/suspend.txt.in:248
+#: ../jobs/suspend.txt.in:276
 msgid ""
 "This will check to make sure that your audio device works properly after a "
 "suspend and resume.  This may work fine with speakers and onboard "
@@ -2008,12 +2204,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:255
+#: ../jobs/suspend.txt.in:285
 msgid "This is the automated version of suspend/suspend_advanced."
 msgstr ""
 
 #. description
-#: ../jobs/suspend.txt.in:264
+#: ../jobs/suspend.txt.in:294
 msgid ""
 "This automatically tests Wake-on-LAN capability with the aid of a suitably "
 "configured server. During this process the system will suspend, then "
@@ -2021,6 +2217,18 @@
 msgstr ""
 
 #. description
+#: ../jobs/suspend.txt.in:304
+msgid ""
+"PURPOSE:\n"
+"    Take a screengrab of the current screen after suspend (logged on Unity "
+"desktop)\n"
+"STEPS:\n"
+"    1. Take picture using USB webcam\n"
+"VERIFICATION:\n"
+"    1. Review attachment manually later"
+msgstr ""
+
+#. description
 #: ../jobs/unity.txt.in:6
 msgid ""
 "Xlib is required for unity testing. This checks for Xlib and installs it if "
@@ -2043,7 +2251,7 @@
 #: ../jobs/usb.txt.in:12
 msgid ""
 "PURPOSE:\n"
-"    This test will check your USB connection.\n"
+"    This test will check that your system detects USB storage devices.\n"
 "STEPS:\n"
 "    1. Plug in one or more USB keys or hard drives.\n"
 "    2. Click on \"Test\".\n"
@@ -2081,28 +2289,33 @@
 #: ../jobs/usb.txt.in:55
 msgid ""
 "PURPOSE:\n"
-"    This test will check your USB connection.\n"
+"    This test will check that the system correctly detects the insertion of\n"
+"    a USB storage device\n"
 "STEPS:\n"
-"    1. Click \"Test\" and insert a USB device within 5 seconds.\n"
+"    1. Click \"Test\" and insert a USB storage device (pen-drive/HDD).\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
 "    2. Do not unplug the device after the test.\n"
 "VERIFICATION:\n"
-"    The verification of this test is automated."
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
 msgstr ""
 
 #. description
-#: ../jobs/usb.txt.in:69
+#: ../jobs/usb.txt.in:72
 msgid ""
 "PURPOSE:\n"
-"    This test will check your USB connection.\n"
+"    This test will check that the system correctly detects the removal of\n"
+"    a USB storage device\n"
 "STEPS:\n"
-"    1. Click \"Test\" and remove the USB device within 5 seconds.\n"
-"    2. Do not unplug the device after the test.\n"
+"    1. Click \"Test\" and remove the USB device.\n"
+"       (Note: this test will time-out after 10 seconds.)\n"
 "VERIFICATION:\n"
-"    The verification of this test is automated."
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
 msgstr ""
 
 #. description
-#: ../jobs/usb.txt.in:82
+#: ../jobs/usb.txt.in:88
 msgid ""
 "PURPOSE:\n"
 "    This test will check your USB connection.\n"
@@ -2111,18 +2324,25 @@
 "    2. An icon should appear on the Launcher.\n"
 "    3. Click \"Test\" to begin the test.\n"
 "VERIFICATION:\n"
-"    The verification of this test is automated."
-msgstr ""
-
-#. description
-#: ../jobs/usb.txt.in:96
+"    The verification of this test is automated. Do not change the\n"
+"    automatically selected result."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:104
+msgid "This test is automated and executes after the usb/insert test is run."
+msgstr ""
+
+#. description
+#: ../jobs/usb.txt.in:111
 msgid ""
-"This test is automated and requires that you plug in at least one usb "
-"storage device before running checkbox."
+"This is an automated version of usb/storage-automated and assumes that the  "
+"server has usb storage devices plugged in prior to checkbox execution. It  "
+"is intended for servers and SRU automated testing."
 msgstr ""
 
 #. description
-#: ../jobs/usb.txt.in:102
+#: ../jobs/usb.txt.in:119
 msgid ""
 "PURPOSE:\n"
 "    This test will check your USB connection.\n"
@@ -2569,7 +2789,7 @@
 #. description
 #: ../jobs/wireless.txt.in:38
 msgid ""
-"Tests that the systems wireless hardware can connect to a router using no no "
+"Tests that the systems wireless hardware can connect to a router using no "
 "security and the 802.11b/g protocols."
 msgstr ""
 
@@ -2583,7 +2803,7 @@
 #. description
 #: ../jobs/wireless.txt.in:58
 msgid ""
-"Tests that the systems wireless hardware can connect to a router using no no "
+"Tests that the systems wireless hardware can connect to a router using no "
 "security and the 802.11n protocol."
 msgstr ""
 
@@ -2735,17 +2955,17 @@
 msgstr ""
 
 #: ../checkbox_cli/cli_interface.py:31
-#: ../checkbox_urwid/urwid_interface.py:684
+#: ../checkbox_urwid/urwid_interface.py:917 ../checkbox_qt/qt_interface.py:33
 msgid "yes"
 msgstr ""
 
 #: ../checkbox_cli/cli_interface.py:32
-#: ../checkbox_urwid/urwid_interface.py:685
+#: ../checkbox_urwid/urwid_interface.py:918 ../checkbox_qt/qt_interface.py:34
 msgid "no"
 msgstr ""
 
 #: ../checkbox_cli/cli_interface.py:33
-#: ../checkbox_urwid/urwid_interface.py:686
+#: ../checkbox_urwid/urwid_interface.py:919 ../checkbox_qt/qt_interface.py:35
 msgid "skip"
 msgstr ""
 
@@ -2753,77 +2973,92 @@
 msgid "Press any key to continue..."
 msgstr ""
 
-#: ../checkbox_cli/cli_interface.py:135
+#: ../checkbox_cli/cli_interface.py:135 ../checkbox_cli/cli_interface.py:234
 #, python-format
 msgid "Please choose (%s): "
 msgstr ""
 
-#: ../checkbox_cli/cli_interface.py:323
+#: ../checkbox_cli/cli_interface.py:229 ../checkbox_cli/cli_interface.py:338
+#: ../checkbox_cli/cli_interface.py:368
+msgid "Space when finished"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:367
+msgid "Combine with character above to expand node"
+msgstr ""
+
+#: ../checkbox_cli/cli_interface.py:416
 msgid "test"
 msgstr ""
 
-#: ../checkbox_cli/cli_interface.py:347
+#: ../checkbox_cli/cli_interface.py:440
 msgid "test again"
 msgstr ""
 
-#: ../checkbox_cli/cli_interface.py:353
+#: ../checkbox_cli/cli_interface.py:446
 msgid "Please type here and press Ctrl-D when finished:\n"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:60
+#: ../checkbox_urwid/urwid_interface.py:66
 msgid "Checkbox System Testing"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:99
+#: ../checkbox_urwid/urwid_interface.py:105
 msgid "Continue"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:192
-#: ../checkbox_urwid/urwid_interface.py:268
-#: ../checkbox_urwid/urwid_interface.py:416
+#: ../checkbox_urwid/urwid_interface.py:198
+#: ../checkbox_urwid/urwid_interface.py:274
+#: ../checkbox_urwid/urwid_interface.py:425
+#: ../checkbox_urwid/urwid_interface.py:547 ../qt/frontend/ui_qtfront.h:609
 msgid "Previous"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:193
-#: ../checkbox_urwid/urwid_interface.py:269
-#: ../checkbox_urwid/urwid_interface.py:417
+#: ../checkbox_urwid/urwid_interface.py:199
+#: ../checkbox_urwid/urwid_interface.py:275
+#: ../checkbox_urwid/urwid_interface.py:426
+#: ../checkbox_urwid/urwid_interface.py:548 ../qt/frontend/ui_qtfront.h:608
 msgid "Next"
 msgstr ""
 
 #. Show buttons
-#: ../checkbox_urwid/urwid_interface.py:414
+#: ../checkbox_urwid/urwid_interface.py:423 ../qt/frontend/qtfront.cpp:137
 msgid "Select All"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:415
+#: ../checkbox_urwid/urwid_interface.py:424 ../qt/frontend/qtfront.cpp:138
 msgid "Deselect All"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:772
+#. Show buttons
+#: ../checkbox_urwid/urwid_interface.py:545
+msgid "Expand All"
+msgstr ""
+
+#: ../checkbox_urwid/urwid_interface.py:546
+msgid "Collapse All"
+msgstr ""
+
+#: ../checkbox_urwid/urwid_interface.py:1013 ../qt/frontend/ui_qtfront.h:603
 msgid "Test"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:787
+#: ../checkbox_urwid/urwid_interface.py:1028
 msgid "Test Again"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:500
+#: ../checkbox_gtk/gtk_interface.py:517
 msgid "_Test Again"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:548
+#: ../checkbox_gtk/gtk_interface.py:566
 msgid "Info"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:567
+#: ../checkbox_gtk/gtk_interface.py:590
 msgid "Error"
 msgstr ""
 
-#: ../checkbox/user_interface.py:136
-#, python-format
-msgid "Unable to start web browser to open %s."
-msgstr ""
-
 #: ../plugins/apport_prompt.py:83
 msgid ""
 "Collecting information about this test.\n"
@@ -2838,19 +3073,19 @@
 
 #: ../plugins/apport_prompt.py:227
 #, python-format
-msgid "Test %(name)s from suite %(suite)s failed."
+msgid "Test %(name)s failed."
+msgstr ""
+
+#: ../plugins/apport_prompt.py:230
+#, python-format
+msgid "Test %s failed."
 msgstr ""
 
 #: ../plugins/apport_prompt.py:231
-#, python-format
-msgid "Test %s failed."
-msgstr ""
-
-#: ../plugins/apport_prompt.py:232
 msgid "Do you want to report a bug?"
 msgstr ""
 
-#: ../plugins/apport_prompt.py:249
+#: ../plugins/apport_prompt.py:248
 #, python-format
 msgid "Is a package upgrade in process? Error: %s"
 msgstr ""
@@ -2867,7 +3102,7 @@
 msgid "Gathering information from your system..."
 msgstr ""
 
-#: ../plugins/intro_prompt.py:29
+#: ../plugins/intro_prompt.py:28
 msgid ""
 "Welcome to System Testing!\n"
 "\n"
@@ -2876,7 +3111,7 @@
 "your system."
 msgstr ""
 
-#: ../plugins/intro_prompt.py:34
+#: ../plugins/intro_prompt.py:33
 msgid ""
 "\n"
 "\n"
@@ -2911,7 +3146,7 @@
 msgid "Information not posted to Launchpad."
 msgstr ""
 
-#: ../plugins/launchpad_prompt.py:71
+#: ../plugins/launchpad_prompt.py:74
 #, python-format
 msgid ""
 "The following report has been generated for submission to the Launchpad "
@@ -2919,26 +3154,22 @@
 "\n"
 "  [[%s|View Report]]\n"
 "\n"
-"You can submit this information about your system by providing the e-mail "
+"You can submit this information about your system by providing the email "
 "address you use to sign in to Launchpad. If you do not have a Launchpad "
 "account, please register here:\n"
 "\n"
 "  https://launchpad.net/+login"
 msgstr ""
 
-#: ../plugins/launchpad_prompt.py:88
-msgid "No e-mail address provided, not submitting to Launchpad."
-msgstr ""
-
-#: ../plugins/launchpad_prompt.py:92
+#: ../plugins/launchpad_prompt.py:93
 msgid "Email address must be in a proper format."
 msgstr ""
 
-#: ../plugins/launchpad_prompt.py:98
+#: ../plugins/launchpad_prompt.py:99
 msgid "Exchanging information with the server..."
 msgstr ""
 
-#: ../plugins/launchpad_report.py:151
+#: ../plugins/launchpad_report.py:167
 msgid ""
 "The generated report seems to have validation errors,\n"
 "so it might not be processed by Launchpad."
@@ -2948,7 +3179,15 @@
 msgid "There is another checkbox running. Please close it first."
 msgstr ""
 
+#: ../plugins/recover_prompt.py:53
+msgid "Recover"
+msgstr ""
+
 #: ../plugins/recover_prompt.py:54
+msgid "Restart"
+msgstr ""
+
+#: ../plugins/recover_prompt.py:56
 msgid ""
 "Checkbox did not finish completely.\n"
 "Do you want to recover from the previous run?"
@@ -2964,7 +3203,7 @@
 msgstr ""
 
 #. Get results
-#: ../plugins/suites_prompt.py:108
+#: ../plugins/suites_prompt.py:124
 msgid "Select the suites to test"
 msgstr ""
 
@@ -2976,14 +3215,159 @@
 msgid "Type Text"
 msgstr ""
 
-#: ../scripts/internet_test:139
+#: ../scripts/internet_test:196
 msgid "No Internet connection"
 msgstr ""
 
-#: ../scripts/internet_test:142
+#: ../scripts/internet_test:199
 msgid "Connection established lost a packet"
 msgstr ""
 
-#: ../scripts/internet_test:145
+#: ../scripts/internet_test:202
 msgid "Internet connection fully established"
 msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:108
+msgid "Not Started"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:109 ../qt/frontend/qtfront.cpp:110
+msgid "Done"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:111
+msgid "Not Supported"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:112
+msgid "Not Resolved"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:113
+msgid "Not Tested"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:114
+msgid "In Progress"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:182
+msgid "Are you sure?"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:182
+msgid "Do you really want to skip this test?"
+msgstr ""
+
+#: ../qt/frontend/qtfront.cpp:183
+msgid "Don't ask me again"
+msgstr ""
+
+#: ../qt/frontend/treemodel.cpp:13
+msgid ""
+"Unselecting a test will invalidate your submission for Ubuntu Friendly. If "
+"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 ""
+
+#: ../qt/frontend/ui_qtfront.h:588
+msgid "Form"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:590
+msgid "OK"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:591
+msgid "Don't show me this message in the future"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:592 ../qt/frontend/ui_qtfront.h:606
+msgid "Tab 1"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:593
+msgid "10 tests completed out of 30 (30%)"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:595
+msgid "Lists of tests to run based on your system:"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:596
+msgid "Components"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:597
+msgid "Status"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:598
+msgid "Start testing"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:599
+msgid " Selection "
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:600 ../qt/frontend/ui_qtfront.h:601
+msgid "TextLabel"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:602
+msgid "Yes"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:604
+msgid "No"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:605
+msgid "Comment"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:607 ../qt/frontend/ui_qtfront.h:623
+msgid "Tab 2"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:610
+msgid " Run "
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:611
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Ubuntu'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:"
+"#ff0000;\">Warning: Not all tests have been run yet.</span></p>\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:"
+"#ff0000;\">You can send the results now, but the submission won't make it to "
+"Ubuntu Friendly.</span></p></body></html>"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:617
+msgid "Personal details"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:619
+msgid "Email:"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:620
+msgid "Submit results"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:621
+msgid "View results"
+msgstr ""
+
+#: ../qt/frontend/ui_qtfront.h:622
+msgid " Results "
+msgstr ""

=== added file 'qt/frontend/checkboxtr.cpp'
--- qt/frontend/checkboxtr.cpp	1970-01-01 00:00:00 +0000
+++ qt/frontend/checkboxtr.cpp	2012-03-28 20:30:26 +0000
@@ -0,0 +1,48 @@
+/*
+ * This file is part of checkbox
+ *
+ * Copyright 2011 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+// Self
+#include <checkboxtr.h>
+
+// Qt
+
+// libc
+#include <libintl.h>
+
+void trInit(const char* domain, const char* localeDir)
+{
+    setlocale(LC_ALL, "");
+    bindtextdomain(domain, localeDir);
+    textdomain(domain);
+}
+
+QString checkboxTr(const char* text, const char* domain)
+{
+    return QString::fromUtf8(dgettext(domain, text));
+}
+
+QString checkboxTr(const char* singular, const char* plural, int n, const char* domain)
+{
+    QString text = QString::fromUtf8(dngettext(domain, singular, plural, n));
+    // Note: if `text` is "%%n" (meaning the string on screen should be "%n"
+    // literally), this will fail. I think we don't care for now.
+    text.replace("%n", QString::number(n));
+    return text;
+}

=== added file 'qt/frontend/checkboxtr.h'
--- qt/frontend/checkboxtr.h	1970-01-01 00:00:00 +0000
+++ qt/frontend/checkboxtr.h	2012-03-28 20:30:26 +0000
@@ -0,0 +1,46 @@
+/*
+ * This file is part of checkbox - taken from unity-2d 
+ *
+ * Copyright 2012 Canonical Ltd.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef CHECKBOXTR_H
+#define CHECKBOXTR_H
+
+#include <QObject>
+class QString;
+
+/**
+ * Installs our gettext catalog
+ */
+void trInit(const char* domain, const char* localeDir);
+
+/**
+ * Translate the string text.
+ *
+ * If domain is NULL, the default domain name (set in init(…)) is used instead.
+ */
+QString checkboxTr(const char* text, const char* domain = NULL);
+
+/**
+ * Plural version of checkboxTr. Should be called like this:
+ *
+ * checkboxTr("%n file", "%n files", count, domain)
+ */
+QString checkboxTr(const char* singular, const char* plural, int n, const char* domain = NULL);
+
+#endif /* CHECKBOXTR_H */

=== modified file 'qt/frontend/frontend.pro'
--- qt/frontend/frontend.pro	2012-02-15 19:52:52 +0000
+++ qt/frontend/frontend.pro	2012-03-28 20:30:26 +0000
@@ -6,6 +6,8 @@
 
 QT       += core dbus service
 
+QMAKE_UIC = /usr/bin/uic-qt4 -tr checkboxTr 
+
 TARGET = checkbox-qt-service
 TEMPLATE = app
 
@@ -13,11 +15,13 @@
 SOURCES += main.cpp\
         qtfront.cpp \
     treemodel.cpp \
-    step.cpp
+    step.cpp \
+    checkboxtr.cpp
 
 HEADERS  += qtfront.h \
     treemodel.h \
-    step.h
+    step.h \
+    checkboxtr.h
 
 FORMS    += qtfront.ui
 

=== modified file 'qt/frontend/main.cpp'
--- qt/frontend/main.cpp	2012-02-13 22:16:30 +0000
+++ qt/frontend/main.cpp	2012-03-28 20:30:26 +0000
@@ -1,11 +1,15 @@
 #include <QtGui/QApplication>
+#include "checkboxtr.h"
 #include "qtfront.h"
 
 int main(int argc, char *argv[])
 {
+    trInit("checkbox","/usr/share/locale/");
+
     QApplication a(argc, argv);
     a.setWindowIcon(QIcon::fromTheme("checkbox"));
     new QtFront(&a);
+
     QDBusConnection::sessionBus().registerObject("/QtCheckbox", &a);
     QDBusConnection::sessionBus().registerService("com.canonical.QtCheckbox");
     //w.show();

=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-03-20 22:31:41 +0000
+++ qt/frontend/qtfront.cpp	2012-03-28 20:30:26 +0000
@@ -83,35 +83,35 @@
     m_currentTextComment->setFocus();
     m_currentTextComment->setStyleSheet("background-color: white");
 
-    m_titleTestTypes["__audio__"] = "Audio Test";
-    m_titleTestTypes["__bluetooth__"] = "Bluetooth Test";
-    m_titleTestTypes["__camera__"] = "Camera Test";
-    m_titleTestTypes["__cpu__"] = "CPU Test";
-    m_titleTestTypes["__disk__"] = "Disk Test";
-    m_titleTestTypes["__firewire__"] = "Firewire Test";
-    m_titleTestTypes["__graphics__"] = "Graphics Test";
-    m_titleTestTypes["__info__"] = "Info Test";
-    m_titleTestTypes["__input__"] = "Input Test";
-    m_titleTestTypes["__keys__"] = "Keys Test";
-    m_titleTestTypes["__mediacard__"] = "Media Card Test";
-    m_titleTestTypes["__memory__"] = "Memory Test";
-    m_titleTestTypes["__miscellanea__"] = "Miscellanea Test";
-    m_titleTestTypes["__monitor__"] = "Monitor Test";
-    m_titleTestTypes["__networking__"] = "Networking Test";
-    m_titleTestTypes["__wireless__"] = "Wireless Test";
-    m_titleTestTypes["__optical__"] = "Optical Test";
-    m_titleTestTypes["__pcmcia-pcix__"] = "PCMCIA/PCIX Test";
-    m_titleTestTypes["__power-management__"] = "Power Management Test";
-    m_titleTestTypes["__suspend__"] = "Suspend Test";
-    m_titleTestTypes["__usb__"] = "USB Test";
+    m_titleTestTypes["__audio__"] = checkboxTr("Audio Test",0);
+    m_titleTestTypes["__bluetooth__"] = checkboxTr("Bluetooth Test", 0);
+    m_titleTestTypes["__camera__"] = checkboxTr("Camera Test", 0);
+    m_titleTestTypes["__cpu__"] = checkboxTr("CPU Test", 0);
+    m_titleTestTypes["__disk__"] = checkboxTr("Disk Test", 0);
+    m_titleTestTypes["__firewire__"] = checkboxTr("Firewire Test", 0);
+    m_titleTestTypes["__graphics__"] = checkboxTr("Graphics Test", 0);
+    m_titleTestTypes["__info__"] = checkboxTr("Info Test", 0);
+    m_titleTestTypes["__input__"] = checkboxTr("Input Test", 0);
+    m_titleTestTypes["__keys__"] = checkboxTr("Keys Test", 0);
+    m_titleTestTypes["__mediacard__"] = checkboxTr("Media Card Test", 0);
+    m_titleTestTypes["__memory__"] = checkboxTr("Memory Test", 0);
+    m_titleTestTypes["__miscellanea__"] = checkboxTr("Miscellanea Test", 0);
+    m_titleTestTypes["__monitor__"] = checkboxTr("Monitor Test", 0);
+    m_titleTestTypes["__networking__"] = checkboxTr("Networking Test", 0);
+    m_titleTestTypes["__wireless__"] = checkboxTr("Wireless Test", 0);
+    m_titleTestTypes["__optical__"] = checkboxTr("Optical Test", 0);
+    m_titleTestTypes["__pcmcia-pcix__"] = checkboxTr("PCMCIA/PCIX Test", 0);
+    m_titleTestTypes["__power-management__"] = checkboxTr("Power Management Test", 0);
+    m_titleTestTypes["__suspend__"] = checkboxTr("Suspend Test", 0);
+    m_titleTestTypes["__usb__"] = checkboxTr("USB Test", 0);
 
-    m_statusStrings[STATUS_UNINITIATED] = tr("Not Started");
-    m_statusStrings[STATUS_PASS] = tr("Done");
-    m_statusStrings[STATUS_FAIL] = tr("Done");
-    m_statusStrings[STATUS_UNSUPPORTED] = tr("Not Supported");
-    m_statusStrings[STATUS_UNRESOLVED] = tr("Not Resolved");
-    m_statusStrings[STATUS_UNTESTED] = tr("Not Tested");
-    m_statusStrings[STATUS_INPROGRESS] = tr("In Progress");
+    m_statusStrings[STATUS_UNINITIATED] = checkboxTr("Not Started", 0);
+    m_statusStrings[STATUS_PASS] = checkboxTr("Done", 0);
+    m_statusStrings[STATUS_FAIL] = checkboxTr("Done", 0);
+    m_statusStrings[STATUS_UNSUPPORTED] = checkboxTr("Not Supported", 0);
+    m_statusStrings[STATUS_UNRESOLVED] = checkboxTr("Not Resolved", 0);
+    m_statusStrings[STATUS_UNTESTED] = checkboxTr("Not Tested", 0);
+    m_statusStrings[STATUS_INPROGRESS] = checkboxTr("In Progress", 0);
 
 }
 
@@ -134,8 +134,8 @@
 
     QPoint position = ui->treeView->mapToGlobal(pos);
     QMenu menu;
-    QAction *selectAll = menu.addAction(tr("Select All"));
-    QAction *deselectAll = menu.addAction(tr("Deselect All"));
+    QAction *selectAll = menu.addAction(checkboxTr("Select All", 0));
+    QAction *deselectAll = menu.addAction(checkboxTr("Deselect All", 0));
 
     QAction* selectedItem = menu.exec(position);
     if (selectedItem && selectedItem == selectAll)
@@ -179,8 +179,8 @@
 void QtFront::onNextTestClicked()
 {
     if (!m_skipTestMessage) {
-        QMessageBox msgBox(QMessageBox::Question, tr("Are you sure?"), tr("Do you really want to skip this test?"), 0, ui->tabWidget);
-        QCheckBox dontPrompt(tr("Don't ask me again"), &msgBox);
+        QMessageBox msgBox(QMessageBox::Question, checkboxTr("Are you sure?", 0), checkboxTr("Do you really want to skip this test?", 0), 0, ui->tabWidget);
+        QCheckBox dontPrompt(checkboxTr("Don't ask me again", 0), &msgBox);
         dontPrompt.blockSignals(true);
         msgBox.addButton(&dontPrompt, QMessageBox::ActionRole);
         QAbstractButton *yesButton = (QAbstractButton*)msgBox.addButton(QMessageBox::Yes);
@@ -244,7 +244,7 @@
 
 void QtFront::showError(QString text)
 {
-    QMessageBox::critical(ui->tabWidget, "Error", text);
+    QMessageBox::critical(ui->tabWidget, checkboxTr("Error", 0), text);
 }
 
 void QtFront::setWindowTitle(QString title)
@@ -528,7 +528,7 @@
         buttonMap[connectButton] = option;
     }
     dialog->setText(text);
-    dialog->setWindowTitle("Info");
+    dialog->setWindowTitle(checkboxTr("Info", 0));
     dialog->exec();
     QString result = buttonMap[dialog->clickedButton()];
     delete dialog;

=== modified file 'qt/frontend/qtfront.h'
--- qt/frontend/qtfront.h	2012-03-20 22:31:41 +0000
+++ qt/frontend/qtfront.h	2012-03-28 20:30:26 +0000
@@ -6,6 +6,7 @@
 #include <QCloseEvent>
 #include <QTextEdit>
 
+#include "checkboxtr.h"
 #include "treemodel.h"
 
 class Ui_main;

=== modified file 'qt/frontend/treemodel.cpp'
--- qt/frontend/treemodel.cpp	2012-02-29 18:49:58 +0000
+++ qt/frontend/treemodel.cpp	2012-03-28 20:30:26 +0000
@@ -1,3 +1,4 @@
+#include "checkboxtr.h"
 #include "treemodel.h"
 #include <QErrorMessage>
 TreeModel::TreeModel() : m_messageBox(0) 
@@ -9,7 +10,7 @@
 {
     if (!m_messageBox)
         m_messageBox = new QErrorMessage();
-    m_messageBox->showMessage("Unselecting a test will invalidate your submission for Ubuntu Friendly. If 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.");
+    m_messageBox->showMessage(checkboxTr("Unselecting a test will invalidate your submission for Ubuntu Friendly. If 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.",0));
 }
 
 void TreeModel::changeAllChildren(QStandardItem *item, const QVariant &value, int role )