Merge lp:~roadmr/checkbox/friendly-sunset into lp:checkbox

[Daniel Manrique]

Removed references to Ubuntu Friendly due to sunsetting of the project.

Removed references to Ubuntu Friendly due to sunsetting of the project.

[Zygmunt Krynicki (zyga)]

sob ;-|

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-09-12 11:13:12 +0000
+++ checkbox-old/debian/changelog	2013-09-12 15:20:04 +0000
@@ -4,6 +4,8 @@
   * scripts/pm_test, scripts/fwts_test: Removed dmesg_common that's no longer
     present in fwts and added specific version dependency to checkbox
     (LP: #1206016)
+  * Removed references to Ubuntu Friendly due to sunsetting of the project.
+    (LP: #1224533)
 
  -- Brendan Donegan <[e-mail]>  Mon, 09 Sep 2013 09:30:32 +0100
 
 
=== modified file 'checkbox-old/plugins/suites_prompt.py'
--- checkbox-old/plugins/suites_prompt.py	2013-05-29 07:50:30 +0000
+++ checkbox-old/plugins/suites_prompt.py	2013-09-12 15:20:04 +0000
@@ -33,11 +33,7 @@
 
 class SuitesPrompt(Plugin):
 
-    deselect_warning = String(default=_("""\
-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.\
-"""))
+    deselect_warning = String(default="")
 
     @property
     def persist(self):
 
=== modified file 'checkbox-old/qt/checkbox-qt.desktop.in'
--- checkbox-old/qt/checkbox-qt.desktop.in	2013-05-29 07:50:30 +0000
+++ checkbox-old/qt/checkbox-qt.desktop.in	2013-09-12 15:20:04 +0000
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=System Testing
-_Comment=Test your system and submit results to the Ubuntu Friendly project
+_Comment=Test your system and submit results to Launchpad
 Encoding=UTF-8
 Exec=/usr/bin/checkbox-qt
 Terminal=false
 
=== modified file 'checkbox-old/qt/frontend/qtfront.ui'
--- checkbox-old/qt/frontend/qtfront.ui	2013-05-29 07:50:30 +0000
+++ checkbox-old/qt/frontend/qtfront.ui	2013-09-12 15:20:04 +0000
@@ -1057,7 +1057,7 @@
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=;&quot;&gt;Please enter the e-mail address associated with your Launchpad account (if applicable)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=;&quot;&gt;and click the Submit Results button to submit these test results to Ubuntu Friendly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=;&quot;&gt;and click the Submit Results button to submit these test results to Launchpad.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
              <property name="scaledContents">
               <bool>false</bool>