# HG changeset patch # User Wagner Bruna # Date 2009-04-21 00:16:14 # Node ID 388bb482024eee1365dc355f9d4785152add4cea # Parent 67efe5e3b0fba18688942411deb7338f8ae1aa2d patch, i18n: avoid parameterized plural diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -421,11 +421,12 @@ class patchfile: f = self.ui.note offset = l - orig_start - fuzzlen if offset == 1: - linestr = "line" + msg = _("Hunk #%d succeeded at %d %s" + "(offset %d line).\n") else: - linestr = "lines" - f(_("Hunk #%d succeeded at %d %s(offset %d %s).\n") % - (h.number, l+1, fuzzstr, offset, linestr)) + msg = _("Hunk #%d succeeded at %d %s" + "(offset %d lines).\n") + f(msg % (h.number, l+1, fuzzstr, offset)) return fuzzlen self.printfile(True) self.ui.warn(_("Hunk #%d FAILED at %d\n") % (h.number, orig_start))