Merge lp:~bladernr/indicator-applet/clean-up-apport-hooks into lp:~indicator-applet-developers/indicator-applet/ubuntu

[Ted Gould]

Fixed up the instances of "in not working" in the ui.choice menu.

[Jeff Lane  (bladernr)]

I should add that I'm not sure if this is the correct place to propose this or not... it's a branch of lp:~ubuntu-desktop/indicator-applet/ubuntu originally...

[Sebastien Bacher (seb128)]

you should do a merge request against the packaging vcs if that's what you did checkout to work on

[Ted Gould (ted)]

Seb is correct, I'm going to resubmit this on that branch.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-17 20:56:54 +0000
+++ debian/changelog	2011-03-14 13:51:00 +0000
@@ -1,4 +1,4 @@
-indicator-applet (0.4.9-0ubuntu1~ppa1) natty; urgency=low
+indicator-applet (0.4.9-0ubuntu1) natty; urgency=low
 
   * New upstream release.
     * Support for accessible descriptions
@@ -6,7 +6,7 @@
 
  -- Ted Gould <[e-mail]>  Thu, 17 Feb 2011 14:56:51 -0600
 
-indicator-applet (0.4.8-0ubuntu1~ppa1) natty; urgency=low
+indicator-applet (0.4.8-0ubuntu1) natty; urgency=low
 
   * New upstream release.
     * Close menus when asked nicely.

=== modified file 'debian/source_indicator-applet.py'
--- debian/source_indicator-applet.py	2010-07-06 22:03:40 +0000
+++ debian/source_indicator-applet.py	2011-03-14 13:51:00 +0000
@@ -12,7 +12,7 @@
         report['ThirdParty'] = 'True'
         report['CrashDB'] = 'indicator_applet'
 
-    response = ui.choice("How would you describe the issue?", ["None of the indicator applets are working correctly", "The sound applet is not working correctly", "The Social Networking Menu is not working correctly", "The login/logout applet is not working correctly", "The network applet is not working correctly", "The date/time applet in not working correctly", "The application testing applet in not working correctly", "The all-in-one (complete) applet is not working correctly", "Another applet is not working correctly"], False)
+    response = ui.choice("How would you describe the issue?", ["None of the indicator applets are working correctly", "The sound applet is not working correctly", "The Social Networking Menu is not working correctly", "The login/logout applet is not working correctly", "The network applet is not working correctly", "The date/time applet is not working correctly", "The application testing applet is not working correctly", "The all-in-one (complete) applet is not working correctly", "Another applet is not working correctly"], False)
     try:
         if response == None: # user cancelled
             raise StopIteration