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

[dobey]

Fix a few grammar mistakes

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[Paul Stewart (paulbrianstewart)]

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)]

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)]

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)]

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)]

Thanks Rodney,

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

Paul

=== modified file 'docs/ubuntuone-control-panel-gtk.1'
--- docs/ubuntuone-control-panel-gtk.1	2010-11-11 14:49:10 +0000
+++ docs/ubuntuone-control-panel-gtk.1	2011-09-07 17:16:36 +0000
@@ -1,7 +1,7 @@
 .TH UBUNTUONE-CONTROL-PANEL-GTK 1
 
 .SH NAME
-ubuntuone-control-panel-gtk \- A GTK UI for managing a Ubuntu One account
+ubuntuone-control-panel-gtk \- A GTK UI for managing an Ubuntu One account
 
 .SH SYNOPSYS
 .B ubutuone-control-panel-gtk
@@ -9,7 +9,7 @@
 .SH DESCRIPTION
 This manual page briefly documents the
 .BR ubuntuone-control-panel-gtk
-process, which provides a desktop application to manage a Ubuntu One account.
+process, which provides a desktop application to manage an Ubuntu One account.
 
 .SH AUTHOR
 This manual page was written by Natalia Bidart <[e-mail]>

=== modified file 'setup.py'
--- setup.py	2011-08-25 19:33:07 +0000
+++ setup.py	2011-09-07 17:16:36 +0000
@@ -234,7 +234,7 @@
     author='Natalia Bidart',
     author_email='[e-mail]',
     description='Ubuntu One Control Panel',
-    long_description='Application to manage a Ubuntu One account. Provides' \
+    long_description='Application to manage an Ubuntu One account. Provides' \
         ' a DBus service to query/modify all the Ubuntu One bits.',
     url='https://launchpad.net/ubuntuone-control-panel',
     packages=[

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-08-18 16:30:27 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-09-07 17:16:36 +0000
@@ -315,7 +315,7 @@
 
 
 class UbuntuOneBinTestCase(BaseTestCase):
-    """The test suite for a Ubuntu One panel."""
+    """The test suite for the Ubuntu One panel."""
 
     klass = gui.UbuntuOneBin
     kwargs = {'title': 'Something old, something new and something blue.'}