Merge lp:~evfool/ubuntuone-control-panel/fix715710 into lp:ubuntuone-control-panel

[Robert Roth]

- Fixed usage string to be more readable (LP: #715710).

Fixed usage string problem reported in bug #715710.

[Natalia Bidart (nataliabidart)]

Yey!

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

[Eric Casteleijn (thisfred)]

Hi Robert, have you signed the Canonical Contributer's agreement?

review: Needs Information

[Robert Roth (evfool)]

Hi Eric, you can check that on my launchpad profile page, https://launchpad.net/~evfool, which says : "Signed Ubuntu Code of Conduct: Yes"

[Eric Casteleijn (thisfred)]

Hi Robert, thanks, but the Code of Conduct and the Contributors Agreement are not the same. The Contributors agreement needs to be signed before contributing to any project that Canonical holds the copyrights to, which is true of all of the Ubuntu One related software.

Thanks for contributing to this project, this is really appreciated, and I apologize for having to be strict about this, even for such a small patch, but the upside is, that you'll only have to sign the agreement once, and it's valid for all the projects covered by it. Do read it carefully though, not everybody agrees with it.

http://www.canonical.com/contributors

[Robert Roth (evfool)]

> Hi Robert, thanks, but the Code of Conduct and the Contributors Agreement are
> not the same. The Contributors agreement needs to be signed before
> contributing to any project that Canonical holds the copyrights to, which is
> true of all of the Ubuntu One related software.
>

Sorry, I didn't know about the Contributors Agreement and i didn't know this is a project that Canonical holds the copyrights to, as it's not mentioned on that page. Who is the project lead for the ubuntuone-control-panel (who should I send the contributor agreement to, besides contributor-agreement at ......)? Thanks.

[Eric Casteleijn (thisfred)]

Sorry that that's not clearer on the project page, I'll ask if someone can update that. Please CC John Lenton <email address hidden> when you send in the agreement.

[Natalia Bidart (nataliabidart)]

John Lenton confirmed that contributor's agreement was signed.

[Eric Casteleijn (thisfred)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Attempt to merge into lp:ubuntuone-control-panel failed due to conflicts:

text conflict in ubuntuone/controlpanel/gtk/gui.py

[Robert Roth (evfool)]

How can a text conflict be fixed?

[dobey (dobey)]

On Sun, 2011-02-13 at 22:18 +0000, Robert Roth wrote:
> How can a text conflict be fixed?

In your branch, merge trunk back in, fix the conflicts, commit, and
push.

[lp:~evfool/ubuntuone-control-panel/fix715710]

65. By Robert Roth on 2011-02-14

Conflict resolved

[Robert Roth (evfool)]

Conflict resolved, it should be ok now. I hope I've done everything fine, this was the first time I've resolved bzr conflicts.

[dobey (dobey)]

Looks ok.

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-02-11 20:31:43 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-02-14 19:45:12 +0000
@@ -1261,7 +1261,7 @@
                                  gobject.TYPE_NONE, ()),
     }
 
-    QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
+    QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).1f%%)')
     DASHBOARD_BUTTON_NAME = 'Account'
     DEVICES_BUTTON_NAME = 'Devices'