Mercurial > public > mercurial-scm > hg

diff mercurial/patch.py @ 6952:3fffba1c87d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n: avoid naive plural tricks
author Martin Geisler <mg@daimi.au.dk>
date Sun, 31 Aug 2008 16:12:02 +0200
parents 359e93ceee3a
children 63b5f4c73c98
line wrap: on
line diff
--- a/mercurial/patch.py	Sun Aug 31 12:05:29 2008 +0200
+++ b/mercurial/patch.py	Sun Aug 31 16:12:02 2008 +0200
@@ -376,15 +376,11 @@
 
         if not self.rej:
             return
-        if self.hunks != 1:
-            hunkstr = "s"
-        else:
-            hunkstr = ""
 
         fname = self.fname + ".rej"
         self.ui.warn(
-            _("%d out of %d hunk%s FAILED -- saving rejects to file %s\n") %
-            (len(self.rej), self.hunks, hunkstr, fname))
+            _("%d out of %d hunks FAILED -- saving rejects to file %s\n") %
+            (len(self.rej), self.hunks, fname))
         try: os.unlink(fname)
         except:
             pass