Merge lp:~indicator-applet-developers/indicator-applet/ubuntu into lp:~ubuntu-desktop/indicator-applet/ubuntu

Proposed by Ted Gould
Status: Merged
Merged at revision: 285
Proposed branch: lp:~indicator-applet-developers/indicator-applet/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-applet/ubuntu
Diff against target: 32 lines (+13/-1)
2 files modified
debian/changelog (+12/-0)
debian/source_indicator-applet.py (+1/-1)
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-applet/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+53686@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-17 21:13:29 +0000
3+++ debian/changelog 2011-03-16 19:19:12 +0000
4@@ -1,3 +1,15 @@
5+indicator-applet (0.4.9-0ubuntu2~ppa1) natty; urgency=low
6+
7+ [Jeff Lane]
8+ * debian/source_indicator-applet.py:
9+ * Fixing a typo with from 'in' to 'is' in the menu
10+
11+ [Ted Gould]
12+ * debian/source_indicator-applet.py:
13+ * Changing to be 'menus' where appropriate in the text
14+
15+ -- Ted Gould <ted@ubuntu.com> Wed, 16 Mar 2011 09:52:58 -0500
16+
17 indicator-applet (0.4.9-0ubuntu1) natty; urgency=low
18
19 * New upstream release.
20
21=== modified file 'debian/source_indicator-applet.py'
22--- debian/source_indicator-applet.py 2010-07-06 22:03:40 +0000
23+++ debian/source_indicator-applet.py 2011-03-16 19:19:12 +0000
24@@ -12,7 +12,7 @@
25 report['ThirdParty'] = 'True'
26 report['CrashDB'] = 'indicator_applet'
27
28- 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)
29+ response = ui.choice("How would you describe the issue?", ["None of the indicator menus are working correctly", "The Sound Menu is not working correctly", "The Social Networking Menu is not working correctly", "The login/logout menu is not working correctly", "The Networking Menu is not working correctly", "The date/time menu is not working correctly", "The application testing menu is not working correctly", "The all-in-one (complete) applet is not working correctly", "Another menu is not working correctly"], False)
30 try:
31 if response == None: # user cancelled
32 raise StopIteration

Subscribers

People subscribed via source and target branches