Merge lp:~dpm/ubuntuone-client/plurals-fix into lp:ubuntuone-client

[dobey]

Don't redefine ngettext as P_ but use ngettext instead
Reword one string to be a bit more clear and remain singular

[dobey (dobey)]

Was already approved for merging to my branch, but should have been proposed to merge to trunk.

review: Approve

=== modified file 'bin/ubuntuone-client-applet'
--- bin/ubuntuone-client-applet	2009-10-14 18:23:35 +0000
+++ bin/ubuntuone-client-applet	2009-10-21 14:55:19 +0000
@@ -50,7 +50,7 @@
 DBusGMainLoop(set_as_default=True)
 
 _ = gettext.gettext
-P_ = gettext.ngettext
+ngettext = gettext.ngettext
 
 APPLET_BUS_NAME = "com.ubuntuone.ClientApplet"
 APPLET_CONFIG_NAME = APPLET_BUS_NAME + ".Config"
@@ -518,7 +518,7 @@
       def __update_transfer_status(self, done=False):
             """Update the status display."""
             with self.__lock:
-                  text = _("Updating %(transfers)d of %(total)d files...") % (
+                  text = _("Updating file %(transfers)d of %(total)d...", % (
                         { 'transfers' : self.__updating,
                           'total' : self.__total})
             label = self.__litems["status"].get_child()
@@ -582,7 +582,7 @@
             with self.__lock:
                   n = pynotify.Notification(
                         _("Updating Finished"),
-                        P_("Ubuntu One finished updating %(total)d file.",
+                        ngettext("Ubuntu One finished updating %(total)d file.",
                            "Ubuntu One finished updating %(total)d files.",
                            self.__total) % { 'total' : self.__total })
                   self.__total = 0