Merge lp:~cmiller/xdiagnose/fix-confusing-dialog into lp:xdiagnose

[Chad Miller]

Clarify the 'development is completed' dialog.

[Bryce Harrington (bryce)]

Thanks, looks good.

review: Approve (code)

=== modified file 'apport/source_xorg.py'
--- apport/source_xorg.py	2011-10-05 18:50:03 +0000
+++ apport/source_xorg.py	2011-11-17 15:03:26 +0000
@@ -211,15 +211,15 @@
     elif status == "Supported" or status == "Current Stable Release":
         # TODO: Perhaps avoid this check if the time since the release < 1 month?
         response = ui.choice(
-            "Development is completed for the '%s' version of Ubuntu, so\n"
-            "you should probably use technical support channels unless you know for\n"
-            "certain it should be reported here?" %(distro_codename),
+            "Since development is completed for the '%s' version of Ubuntu, \n"
+            "you should probably use its technical support channels instead \n"
+            "of this tool.\n" %(distro_codename),
             [
-                "I don't know",
-                "Yes, I already know the fix for this problem.",
-                "Yes, The problem began right after doing a system software update.",
-                "Yes.",
-                "No, please point me to a good place to get support.",
+                "I don't know what to do",
+                "Continue. I already know the fix for this problem.",
+                "Continue. The problem began right after system software update.",
+                "Continue. I was referred here by Support.",
+                "Please point me to a good place to get support.",
                 ]
             )
         if response == None: