Merge lp:~cr3/checkbox/check_unity into lp:checkbox

[Marc Tardif]

Note that the change in this merge request is not quite related to Python 3 conversion, just cleaning up.

[Javier Collado (javier.collado)]

I'm not sure about how useful was the unity test case or the reasons why autopilot.py isn't part of the unity package anymore. Would it be useful to get the latest autopilot.py and add it to the checkbox branch?

review: Needs Information

[Marc Tardif (cr3)]

The autopilot.py script was mostly relevant during the early phases of unity development. After talking with the #ubuntu-unity folks, it seems that the script has outlived its usefulness. It also seems that the unity folks have folded the functionality of the script into their unit testing.

[Daniel Manrique (roadmr)]

I'll merge this, only change was a conflict in the .pot file, which I solved by just rebuilding it :)

Thanks!

review: Approve

=== modified file 'debian/po/ast.po'
--- debian/po/ast.po	2012-05-30 05:17:51 +0000
+++ debian/po/ast.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-03-21 15:41+0000\n"
 "Last-Translator: Xandru <[e-mail]>\n"
 "Language-Team: Asturian <[e-mail]>\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/cs.po'
--- debian/po/cs.po	2012-05-30 05:17:51 +0000
+++ debian/po/cs.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-03-05 19:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/de.po'
--- debian/po/de.po	2012-05-30 05:17:51 +0000
+++ debian/po/de.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-09-27 06:16+0000\n"
 "Last-Translator: Hendrik Knackstedt <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/en_AU.po'
--- debian/po/en_AU.po	2012-05-30 05:17:51 +0000
+++ debian/po/en_AU.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-21 02:39+0000\n"
 "Last-Translator: Jared Norris <[e-mail]>\n"
 "Language-Team: English (Australia) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/en_GB.po'
--- debian/po/en_GB.po	2012-05-30 05:17:51 +0000
+++ debian/po/en_GB.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-09 23:13+0000\n"
 "Last-Translator: Alfredo Hernández <Unknown>\n"
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/es.po'
--- debian/po/es.po	2012-05-30 05:17:51 +0000
+++ debian/po/es.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-04-06 14:01+0000\n"
 "Last-Translator: Daniel Manrique <[e-mail]>\n"
 "Language-Team: Spanish <[e-mail]>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -74,8 +75,7 @@
 #. Description
 #: ../checkbox.templates:4001
 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-05-30 05:17:51 +0000
+++ debian/po/fr.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-19 10:27+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/he.po'
--- debian/po/he.po	2012-05-30 05:17:51 +0000
+++ debian/po/he.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-26 09:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/hu.po'
--- debian/po/hu.po	2012-05-30 05:17:51 +0000
+++ debian/po/hu.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 12:57+0000\n"
 "Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/it.po'
--- debian/po/it.po	2012-05-30 05:17:51 +0000
+++ debian/po/it.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-09-22 14:07+0000\n"
 "Last-Translator: Sergio Zanchetta <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/ja.po'
--- debian/po/ja.po	2012-05-30 05:17:51 +0000
+++ debian/po/ja.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-25 17:03+0000\n"
 "Last-Translator: Fumihito YOSHIDA <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,8 +31,9 @@
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
 msgstr ""
-"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどうか、checkboxが確認するようになります。これはapportが有効になって"
-"いなくても機能します。"
+"このオプションが有効になっていると、テストに失敗した際にバグ報告を行うかどう"
+"か、checkboxが確認するようになります。これはapportが有効になっていなくても機"
+"能します。"
 
 #. Type: string
 #. Description
@@ -45,7 +47,9 @@
 msgid ""
 "When filing a new bug through checkbox, if it does not guess the  package, "
 "the default package that the bug will be file against."
-msgstr "checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デフォルトのパッケージ名を用いて報告します。"
+msgstr ""
+"checkbox経由でバグ報告を行う場合、パッケージ名を推定できなかったときは、デ"
+"フォルトのパッケージ名を用いて報告します。"
 
 #. Type: string
 #. Description

=== modified file 'debian/po/nl.po'
--- debian/po/nl.po	2012-05-30 05:17:51 +0000
+++ debian/po/nl.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-08-17 12:02+0000\n"
 "Last-Translator: Rachid <Unknown>\n"
 "Language-Team: Dutch <[e-mail]>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/oc.po'
--- debian/po/oc.po	2012-05-30 05:17:51 +0000
+++ debian/po/oc.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-02-24 07:45+0000\n"
 "Last-Translator: Cédric VALMARY (Tot en òc) <[e-mail]>\n"
 "Language-Team: Occitan (post 1500) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/pl.po'
--- debian/po/pl.po	2012-05-30 05:17:51 +0000
+++ debian/po/pl.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 21:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Polish <[e-mail]>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/pt_BR.po'
--- debian/po/pt_BR.po	2012-05-30 05:17:51 +0000
+++ debian/po/pt_BR.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-05-12 03:33+0000\n"
 "Last-Translator: eniomarconcini <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/ro.po'
--- debian/po/ro.po	2012-05-30 05:17:51 +0000
+++ debian/po/ro.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-10-27 20:38+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Romanian <[e-mail]>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/ru.po'
--- debian/po/ru.po	2012-05-30 05:17:51 +0000
+++ debian/po/ru.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-18 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/tr.po'
--- debian/po/tr.po	2012-05-30 05:17:51 +0000
+++ debian/po/tr.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-05-18 12:51+0000\n"
 "Last-Translator: Hasan Yılmaz <[e-mail]>\n"
 "Language-Team: Turkish <[e-mail]>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/uk.po'
--- debian/po/uk.po	2012-05-30 05:17:51 +0000
+++ debian/po/uk.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-01-21 07:24+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/zh_CN.po'
--- debian/po/zh_CN.po	2012-05-30 05:17:51 +0000
+++ debian/po/zh_CN.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2012-05-09 02:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Chinese (Simplified) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'debian/po/zh_TW.po'
--- debian/po/zh_TW.po	2012-05-30 05:17:51 +0000
+++ debian/po/zh_TW.po	2012-06-05 19:41:20 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: checkbox\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2011-03-29 15:19+0200\n"
 "PO-Revision-Date: 2011-07-26 15:03+0000\n"
 "Last-Translator: Cheng-Chia Tseng <[e-mail]>\n"
 "Language-Team: Chinese (Traditional) <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,7 +30,9 @@
 msgid ""
 "If this option is set to Yes, then checkbox will ask if the user wants to "
 "file a bug for failing tests, even if apport is not enabled."
-msgstr "若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提交失敗測試的臭蟲回報。"
+msgstr ""
+"若這個選項設為「是」，checkbox 會詢問使用者是否要不管 apport 有沒有啟用，都提"
+"交失敗測試的臭蟲回報。"
 
 #. Type: string
 #. Description

=== modified file 'jobs/local.txt.in'
--- jobs/local.txt.in	2012-04-16 15:59:04 +0000
+++ jobs/local.txt.in	2012-06-05 19:41:20 +0000
@@ -236,13 +236,6 @@
   shopt -s extglob
   cat $CHECKBOX_SHARE/jobs/touchpad.txt?(.in)
 
-name: __unity__
-plugin: local
-_description: Unity tests
-command:
-  shopt -s extglob
-  cat $CHECKBOX_SHARE/jobs/unity.txt?(.in)
-
 name: __usb__
 plugin: local
 _description: USB tests

=== removed file 'jobs/unity.txt.in'
--- jobs/unity.txt.in	2011-07-07 10:36:02 +0000
+++ jobs/unity.txt.in	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-plugin: local
-name: unity/check_and_install_xlib
-requires: package.name == 'unity'
-user: root
-command: dpkg -l | grep -iq 'python-xlib' || apt-get install -y  python-xlib
-_description: Xlib is required for unity testing. This checks for Xlib and installs it if not available.
-
-plugin: shell
-name: unity/autopilot_test
-requires: package.name == 'unity'
-depends: unity/check_and_install_xlib
-command: check_unity
-_description:
- This test will verify that Unity is running and then run the autopilot.py test against the Unity interface.

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2012-04-28 15:34:26 +0000
+++ po/POTFILES.in	2012-06-05 19:41:20 +0000
@@ -39,7 +39,6 @@
 [type: gettext/rfc822deb] jobs/stress.txt.in
 [type: gettext/rfc822deb] jobs/suspend.txt.in
 [type: gettext/rfc822deb] jobs/touchpad.txt.in
-[type: gettext/rfc822deb] jobs/unity.txt.in
 [type: gettext/rfc822deb] jobs/usb.txt.in
 [type: gettext/rfc822deb] jobs/user_apps.txt.in
 [type: gettext/rfc822deb] jobs/wireless.txt.in

=== modified file 'po/checkbox.pot'
--- po/checkbox.pot	2012-05-15 17:51:28 +0000
+++ po/checkbox.pot	2012-06-05 19:41:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.launchpad.net/checkbox/+filebug\n"
-"POT-Creation-Date: 2012-05-15 13:32-0400\n"
+"POT-Creation-Date: 2012-06-05 15:36-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"
@@ -19,7 +19,7 @@
 
 #. Title of the user interface
 #: ../gtk/checkbox-gtk.ui.h:1 ../qt/checkbox-qt.desktop.in.h:1
-#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:589
+#: ../plugins/user_interface.py:43 ../qt/frontend/ui_qtfront.h:590
 msgid "System Testing"
 msgstr ""
 
@@ -145,6 +145,19 @@
 msgstr ""
 
 #. description
+#: ../jobs/audio.txt.in:107
+msgid ""
+"Collect audio-related system information. This data can be used to simulate "
+"this computer's audio subsystem and perform more detailed tests under a "
+"controlled environment."
+msgstr ""
+
+#. description
+#: ../jobs/audio.txt.in:116
+msgid "Attaches the audio hardware data collection log to the results."
+msgstr ""
+
+#. description
 #: ../jobs/autotest.txt.in:6
 msgid ""
 "PURPOSE:\n"
@@ -916,19 +929,31 @@
 msgstr ""
 
 #. description
-#: ../jobs/keys.txt.in:74
+#: ../jobs/keys.txt.in:75
 msgid ""
 "PURPOSE:\n"
 "    This test will test the media keys of your keyboard\n"
 "STEPS:\n"
-"    1. Click test to open a window on which to test the media control keys.\n"
+"    1. Click test to open a window on which to test the media 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"
+"    3. If your computer has no media keys, Skip this test.\n"
 "VERIFICATION:\n"
 "    Do the keys work as expected?"
 msgstr ""
 
 #. description
+#: ../jobs/keys.txt.in:91
+msgid ""
+"PURPOSE:\n"
+"    This test will test the super key of your keyboard\n"
+"STEPS:\n"
+"    1. Click test to open a window on which to test the super key.\n"
+"    2. If the key works, the test will pass and the window will close.\n"
+"VERIFICATION:\n"
+"    Does the super key work as expected?"
+msgstr ""
+
+#. description
 #: ../jobs/local.txt.in:3
 msgid "Audio tests"
 msgstr ""
@@ -1100,36 +1125,31 @@
 
 #. description
 #: ../jobs/local.txt.in:241
-msgid "Unity tests"
+msgid "USB tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:248
-msgid "USB tests"
+msgid "User Applications"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:255
-msgid "User Applications"
+msgid "Wireless networking tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:262
-msgid "Wireless networking tests"
+msgid "Stress tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:269
-msgid "Stress tests"
+msgid "Smoke tests"
 msgstr ""
 
 #. description
 #: ../jobs/local.txt.in:276
-msgid "Smoke tests"
-msgstr ""
-
-#. description
-#: ../jobs/local.txt.in:283
 msgid "Sniff Sniffers"
 msgstr ""
 
@@ -1458,7 +1478,22 @@
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:8
+#: ../jobs/miscellanea.txt.in:3
+msgid ""
+"PURPOSE:\n"
+"    Keep tester related information in the report\n"
+"STEPS:\n"
+"    1. Tester Information\n"
+"    2. Please enter the following information in the comments field:\n"
+"       a. Name\n"
+"       b. Email Address\n"
+"       c. Reason for this test run\n"
+"VERIFICATION:\n"
+"    Nothing to verify for this test"
+msgstr ""
+
+#. description
+#: ../jobs/miscellanea.txt.in:22
 msgid ""
 "PURPOSE:\n"
 "    This test will check that the system can switch to a virtual terminal "
@@ -1472,31 +1507,31 @@
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:22
+#: ../jobs/miscellanea.txt.in:36
 msgid "Run Firmware Test Suite (fwts) automated tests."
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:31
+#: ../jobs/miscellanea.txt.in:45
 msgid "Attaches the FWTS results log to the submission"
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:38
+#: ../jobs/miscellanea.txt.in:52
 msgid ""
 "This will run some basic connectivity tests against a BMC, verifying that "
 "IPMI works."
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:44
+#: ../jobs/miscellanea.txt.in:58
 msgid ""
 "   Determine if we need to run tests specific to portable computers that may "
 "not apply to desktops."
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:52
+#: ../jobs/miscellanea.txt.in:66
 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 "
@@ -1504,7 +1539,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/miscellanea.txt.in:60
+#: ../jobs/miscellanea.txt.in:74
 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"
@@ -1919,7 +1954,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:20
+#: ../jobs/power-management.txt.in:16
+msgid "Test ACPI Wakealarm (fwts wakealarm)"
+msgstr ""
+
+#. description
+#: ../jobs/power-management.txt.in:30
 msgid ""
 "PURPOSE:\n"
 " This test will check the system's ability to power-off and boot.\n"
@@ -1937,14 +1977,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:35
+#: ../jobs/power-management.txt.in:45
 msgid ""
 "This will attach any logs from the power-management/poweroff test to the "
 "results."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:45
+#: ../jobs/power-management.txt.in:55
 msgid ""
 "PURPOSE:\n"
 " This test will check the system's ability to reboot cleanly.\n"
@@ -1960,14 +2000,14 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:59
+#: ../jobs/power-management.txt.in:69
 msgid ""
 "This will attach any logs from the power-management/reboot test to the "
 "results."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:64
+#: ../jobs/power-management.txt.in:74
 msgid ""
 "PURPOSE:\n"
 "    This test will check your lid sensors\n"
@@ -1978,7 +2018,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:81
+#: ../jobs/power-management.txt.in:91
 msgid ""
 "PURPOSE:\n"
 "    This test will check your lid sensors\n"
@@ -1990,7 +2030,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:99
+#: ../jobs/power-management.txt.in:109
 msgid ""
 "PURPOSE:\n"
 "    This test will check your lid sensors\n"
@@ -2004,17 +2044,12 @@
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:115
+#: ../jobs/power-management.txt.in:125
 msgid "Make sure that the RTC (Real-Time Clock) device exists."
 msgstr ""
 
 #. description
-#: ../jobs/power-management.txt.in:120
-msgid "Test ACPI Wakealarm (fwts wakealarm) "
-msgstr ""
-
-#. description
-#: ../jobs/power-management.txt.in:129
+#: ../jobs/power-management.txt.in:131
 msgid ""
 "Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple "
 "regression check)"
@@ -2092,6 +2127,52 @@
 msgstr ""
 
 #. description
+#: ../jobs/stress.txt.in:50
+msgid ""
+"PURPOSE:\n"
+"   This is an automated stress test that will force the system to hibernate/"
+"resume for 250 cycles"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:57
+msgid "Attaches the log from the 250 cycle Hibernate/Resume test if it exists"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:66
+msgid ""
+"PURPOSE:\n"
+"   This is an automated stress test that will force the system to suspend/"
+"resume for 250 cycles."
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:73
+msgid "Attaches the log from the 250 cycle Suspend/Resume test if it exists"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:83
+msgid "Stress reboot system (100 cycles)"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:98
+msgid "Stress poweroff system (100 cycles)"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:110
+msgid "Check logs for the stress reboot (100 cycles) test case"
+msgstr ""
+
+#. description
+#: ../jobs/stress.txt.in:122
+msgid "Check logs for the stress poweroff (100 cycles) test case"
+msgstr ""
+
+#. description
 #: ../jobs/suspend.txt.in:4
 msgid "Record the current network before suspending."
 msgstr ""
@@ -2356,20 +2437,6 @@
 msgstr ""
 
 #. description
-#: ../jobs/unity.txt.in:6
-msgid ""
-"Xlib is required for unity testing. This checks for Xlib and installs it if "
-"not available."
-msgstr ""
-
-#. description
-#: ../jobs/unity.txt.in:13
-msgid ""
-"This test will verify that Unity is running and then run the autopilot.py "
-"test against the Unity interface."
-msgstr ""
-
-#. description
 #: ../jobs/usb.txt.in:5
 msgid "Detects and shows USB devices attached to this system."
 msgstr ""
@@ -2461,7 +2528,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/usb.txt.in:111
+#: ../jobs/usb.txt.in:112
 msgid ""
 "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  "
@@ -2469,7 +2536,7 @@
 msgstr ""
 
 #. description
-#: ../jobs/usb.txt.in:119
+#: ../jobs/usb.txt.in:120
 msgid ""
 "PURPOSE:\n"
 "    This test will check your USB connection.\n"
@@ -3082,17 +3149,17 @@
 msgstr ""
 
 #: ../checkbox_cli/cli_interface.py:31
-#: ../checkbox_urwid/urwid_interface.py:917 ../checkbox_qt/qt_interface.py:33
+#: ../checkbox_urwid/urwid_interface.py:917 ../checkbox_qt/qt_interface.py:34
 msgid "yes"
 msgstr ""
 
 #: ../checkbox_cli/cli_interface.py:32
-#: ../checkbox_urwid/urwid_interface.py:918 ../checkbox_qt/qt_interface.py:34
+#: ../checkbox_urwid/urwid_interface.py:918 ../checkbox_qt/qt_interface.py:35
 msgid "no"
 msgstr ""
 
 #: ../checkbox_cli/cli_interface.py:33
-#: ../checkbox_urwid/urwid_interface.py:919 ../checkbox_qt/qt_interface.py:35
+#: ../checkbox_urwid/urwid_interface.py:919 ../checkbox_qt/qt_interface.py:36
 msgid "skip"
 msgstr ""
 
@@ -3137,14 +3204,14 @@
 #: ../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
+#: ../checkbox_urwid/urwid_interface.py:547 ../qt/frontend/ui_qtfront.h:610
 msgid "Previous"
 msgstr ""
 
 #: ../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
+#: ../checkbox_urwid/urwid_interface.py:548 ../qt/frontend/ui_qtfront.h:609
 msgid "Next"
 msgstr ""
 
@@ -3166,7 +3233,7 @@
 msgid "Collapse All"
 msgstr ""
 
-#: ../checkbox_urwid/urwid_interface.py:1013 ../qt/frontend/ui_qtfront.h:603
+#: ../checkbox_urwid/urwid_interface.py:1013 ../qt/frontend/ui_qtfront.h:604
 msgid "Test"
 msgstr ""
 
@@ -3178,7 +3245,7 @@
 msgid "_Test Again"
 msgstr ""
 
-#: ../checkbox_gtk/gtk_interface.py:574 ../qt/frontend/qtfront.cpp:536
+#: ../checkbox_gtk/gtk_interface.py:574 ../qt/frontend/qtfront.cpp:540
 msgid "Info"
 msgstr ""
 
@@ -3288,6 +3355,10 @@
 "  https://launchpad.net/+login"
 msgstr ""
 
+#: ../plugins/launchpad_prompt.py:84
+msgid "Email"
+msgstr ""
+
 #: ../plugins/launchpad_prompt.py:93
 msgid "Email address must be in a proper format."
 msgstr ""
@@ -3323,28 +3394,34 @@
 msgid "Running %s..."
 msgstr ""
 
-#. Get results
-#: ../plugins/suites_prompt.py:126
-msgid "Select the suites to test"
-msgstr ""
-
-#: ../scripts/keyboard_test:21
+#: ../plugins/suites_prompt.py:36
+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 ""
+
+#: ../plugins/suites_prompt.py:134 ../qt/frontend/ui_qtfront.h:596
+msgid "Choose tests to run on your system:"
+msgstr ""
+
+#: ../scripts/keyboard_test:22
 msgid "Enter text:\n"
 msgstr ""
 
-#: ../scripts/keyboard_test:41
+#: ../scripts/keyboard_test:43
 msgid "Type Text"
 msgstr ""
 
-#: ../scripts/internet_test:196
+#: ../scripts/internet_test:214
 msgid "No Internet connection"
 msgstr ""
 
-#: ../scripts/internet_test:199
+#: ../scripts/internet_test:217
 msgid "Connection established lost a packet"
 msgstr ""
 
-#: ../scripts/internet_test:202
+#: ../scripts/internet_test:220
 msgid "Internet connection fully established"
 msgstr ""
 
@@ -3468,78 +3545,67 @@
 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
+#: ../qt/frontend/ui_qtfront.h:589
 msgid "Form"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:590
+#: ../qt/frontend/ui_qtfront.h:591
 msgid "OK"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:591
+#: ../qt/frontend/ui_qtfront.h:592
 msgid "Don't show me this message in the future"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:592 ../qt/frontend/ui_qtfront.h:606
+#: ../qt/frontend/ui_qtfront.h:593 ../qt/frontend/ui_qtfront.h:607
 msgid "Tab 1"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:593
+#: ../qt/frontend/ui_qtfront.h:594
 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
+#: ../qt/frontend/ui_qtfront.h:597
 msgid "Components"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:597
+#: ../qt/frontend/ui_qtfront.h:598
 msgid "Status"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:598
+#: ../qt/frontend/ui_qtfront.h:599
 msgid "Start testing"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:599
+#: ../qt/frontend/ui_qtfront.h:600
 msgid " Selection "
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:600 ../qt/frontend/ui_qtfront.h:601
+#: ../qt/frontend/ui_qtfront.h:601 ../qt/frontend/ui_qtfront.h:602
 msgid "TextLabel"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:602
+#: ../qt/frontend/ui_qtfront.h:603
 msgid "Yes"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:604
+#: ../qt/frontend/ui_qtfront.h:605
 msgid "No"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:605
+#: ../qt/frontend/ui_qtfront.h:606
 msgid "Comment"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:607 ../qt/frontend/ui_qtfront.h:623
+#: ../qt/frontend/ui_qtfront.h:608 ../qt/frontend/ui_qtfront.h:624
 msgid "Tab 2"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:610
+#: ../qt/frontend/ui_qtfront.h:611
 msgid " Run "
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:611
+#: ../qt/frontend/ui_qtfront.h:612
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
 "REC-html40/strict.dtd\">\n"
@@ -3558,22 +3624,22 @@
 "to Ubuntu Friendly.</span></p></body></html>"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:617
-msgid "Personal details"
+#: ../qt/frontend/ui_qtfront.h:618
+msgid "Submission details"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:619
+#: ../qt/frontend/ui_qtfront.h:620
 msgid "Email:"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:620
+#: ../qt/frontend/ui_qtfront.h:621
 msgid "Submit results"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:621
+#: ../qt/frontend/ui_qtfront.h:622
 msgid "View results"
 msgstr ""
 
-#: ../qt/frontend/ui_qtfront.h:622
+#: ../qt/frontend/ui_qtfront.h:623
 msgid " Results "
 msgstr ""

=== removed file 'scripts/check_unity'
--- scripts/check_unity	2012-05-22 18:01:21 +0000
+++ scripts/check_unity	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-#!/usr/bin/python
-
-import sys
-import dbus
-from subprocess import call
-
-
-def main():
-    # Connect to the session
-    bus = dbus.SessionBus()
-
-    unity = bus.get_object("org.freedesktop.DBus", "/com/canonical/Unity")
-    if unity.NameHasOwner("com.canonical.Unity"):
-        retcode = call(["/usr/lib/unity/autopilot.py"])
-        return retcode
-    else:
-        print "Unity is not running"
-        return 1
-
-if __name__ == "__main__":
-    sys.exit(main())

=== modified file 'setup.cfg'
--- setup.cfg	2012-04-28 15:34:26 +0000
+++ setup.cfg	2012-06-05 19:41:20 +0000
@@ -46,7 +46,6 @@
          "jobs/stress.txt.in",
          "jobs/suspend.txt.in",
          "jobs/touchpad.txt.in",
-         "jobs/unity.txt.in",
          "jobs/usb.txt.in",
          "jobs/user_apps.txt.in",
          "jobs/wireless.txt.in"))]