[PATCH 3 of 4] i18n: use plural forms in 'N files updated' message

[Andrei Polushin]

# HG changeset patch
# User Andrei Polushin <polushin at gmail.com>
# Date 1324155298 -25200
# Node ID dcce87b206cba3eff318fb9c03b313277fb49fde
# Parent  0ea1c79ae748034287e2543467c7482a6c15e4ba
i18n: use plural forms in 'N files updated' message

diff -r 0ea1c79ae748 -r dcce87b206cb mercurial/hg.py
--- a/mercurial/hg.py	Sun Dec 18 03:33:44 2011 +0700
+++ b/mercurial/hg.py	Sun Dec 18 03:54:58 2011 +0700
@@ -6,7 +6,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-from i18n import _
+from i18n import _, ngettext
 from lock import release
 from node import hex, nullid
 import localrepo, bundlerepo, httprepo, sshrepo, statichttprepo, bookmarks
@@ -403,8 +403,18 @@
             dircleanup.cleanup()
 
 def _showstats(repo, stats):
-    repo.ui.status(_("%d files updated, %d files merged, "
-                     "%d files removed, %d files unresolved\n") % stats)
+    updated = ngettext("%d file updated",
+                       "%d files updated", stats[0]) % stats[0]
+    merged = ngettext("%d file merged",
+                      "%d files merged", stats[1]) % stats[1]
+    removed = ngettext("%d file removed",
+                       "%d files removed", stats[2]) % stats[2]
+    unresolved = ngettext("%d file unresolved",
+                          "%d files unresolved", stats[3]) % stats[3]
+
+    # i18n: N updated, M merged, X removed, Y unresolved
+    repo.ui.status(_("%s, %s, %s, %s\n")
+                   % (updated, merged, removed, unresolved))
 
 def update(repo, node):
     """update the working directory to node, merging linear changes"""