Merge lp:~dobey/ubuntuone-control-panel/fix-grammar into lp:ubuntuone-control-panel

Proposed by dobey on 2011-09-07
Status: Merged
Approved by: dobey on 2011-09-07
Approved revision: 215
Merged at revision: 215
Proposed branch: lp:~dobey/ubuntuone-control-panel/fix-grammar
Merge into: lp:ubuntuone-control-panel
Diff against target: 47 lines (+4/-4)
3 files modified
docs/ubuntuone-control-panel-gtk.1 (+2/-2)
setup.py (+1/-1)
ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py (+1/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-control-panel/fix-grammar
Reviewer Review Type Date Requested Status
Natalia Bidart 2011-09-07 Approve on 2011-09-07
Review via email: mp+74483@code.launchpad.net

Commit message

Fix a few grammar mistakes

To post a comment you must log in.
Natalia Bidart (nataliabidart) wrote :

Looks great!

review: Approve
Paul Stewart (paulbrianstewart) wrote :

Hi Natalia,

Thanks for this. I have upgraded to 11.10, but the text in the control file description is still the same...i.e, it say 'a' instead of 'an'. Am I missing something?

Thanks
Paul Stewart.

dobey (dobey) wrote :

Paul, the changes in this branch are not for the control file, but for similar issues in trunk. It looks like your fix was merged into the packaging for Ubuntu, but hasn't been uploaded yet. I'll bug the person who merged it to upload.

Paul Stewart (paulbrianstewart) wrote :

Ok Rodney,

Thanks..I just wanted to make sure that I hadn't missed something. I thought perhaps I had neglected to propose a merge somewhere or something like that.

Thanks
Paul Stewart

dobey (dobey) wrote :

Paul, your fix will appear soon, when ubuntuone-control-panel 2.0.0-0ubuntu1 makes it into the archives. Should appear in the next day or two. Thanks.

Paul Stewart (paulbrianstewart) wrote :

Thanks Rodney,

Appreciate the teams' work...keep it up.

Paul

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/ubuntuone-control-panel-gtk.1'
2--- docs/ubuntuone-control-panel-gtk.1 2010-11-11 14:49:10 +0000
3+++ docs/ubuntuone-control-panel-gtk.1 2011-09-07 17:16:36 +0000
4@@ -1,7 +1,7 @@
5 .TH UBUNTUONE-CONTROL-PANEL-GTK 1
6
7 .SH NAME
8-ubuntuone-control-panel-gtk \- A GTK UI for managing a Ubuntu One account
9+ubuntuone-control-panel-gtk \- A GTK UI for managing an Ubuntu One account
10
11 .SH SYNOPSYS
12 .B ubutuone-control-panel-gtk
13@@ -9,7 +9,7 @@
14 .SH DESCRIPTION
15 This manual page briefly documents the
16 .BR ubuntuone-control-panel-gtk
17-process, which provides a desktop application to manage a Ubuntu One account.
18+process, which provides a desktop application to manage an Ubuntu One account.
19
20 .SH AUTHOR
21 This manual page was written by Natalia Bidart <natalia.bidart@canonical.com>
22
23=== modified file 'setup.py'
24--- setup.py 2011-08-25 19:33:07 +0000
25+++ setup.py 2011-09-07 17:16:36 +0000
26@@ -234,7 +234,7 @@
27 author='Natalia Bidart',
28 author_email='natalia.bidart@canonical.com',
29 description='Ubuntu One Control Panel',
30- long_description='Application to manage a Ubuntu One account. Provides' \
31+ long_description='Application to manage an Ubuntu One account. Provides' \
32 ' a DBus service to query/modify all the Ubuntu One bits.',
33 url='https://launchpad.net/ubuntuone-control-panel',
34 packages=[
35
36=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
37--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py 2011-08-18 16:30:27 +0000
38+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py 2011-09-07 17:16:36 +0000
39@@ -315,7 +315,7 @@
40
41
42 class UbuntuOneBinTestCase(BaseTestCase):
43- """The test suite for a Ubuntu One panel."""
44+ """The test suite for the Ubuntu One panel."""
45
46 klass = gui.UbuntuOneBin
47 kwargs = {'title': 'Something old, something new and something blue.'}

Subscribers

People subscribed via source and target branches

to all changes: