[meld] Fix plural forms for unpushed commits message (bgo#702008)

[Kai Willadsen <kaiw src gnome org>]

commit 093f814f96054f4b017ab44aeabdf838437b2619
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jun 15 07:00:35 2013 +1000

    Fix plural forms for unpushed commits message (bgo#702008)
    
    Fix suggested by Marek Černocký.

 meld/vc/git.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index abacea0..67c7532 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -118,8 +118,13 @@ class Vc(_vc.CachedVc):
         unpushed_commits = sum(len(v) for v in branch_refs.values())
         if unpushed_commits:
             if unpushed_branches > 1:
-                label = _("%d unpushed commits in %d branches") % \
-                    (unpushed_commits, unpushed_branches)
+                # Translators: First %s is replaced by translated "%d unpushed
+                # commits", second %s is replaced by translated "%d branches"
+                label = _("%s in %s") % (
+                    ngettext("%d unpushed commit", "%d unpushed commits",
+                             unpushed_commits) % unpushed_commits,
+                    ngettext("%d branch", "%d branches",
+                             unpushed_branches) % unpushed_branches)
             else:
                 label = ngettext("%d unpushed commit", "%d unpushed commits",
                                  unpushed_commits) % (unpushed_commits)