Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 12746:8b438cb84c57
merge/progress: marking strings for localization
| author | timeless <timeless@gmail.com> |
|---|---|
| date | Mon, 02 Aug 2010 07:15:47 +0300 |
| parents | bc13e17067d9 |
| children | 62c8f7691bc3 |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Aug 02 07:15:47 2010 +0300 +++ b/mercurial/merge.py Mon Aug 02 07:15:47 2010 +0300 @@ -299,7 +299,8 @@ numupdates = len(action) for i, a in enumerate(action): f, m = a[:2] - u.progress(_('updating'), i + 1, item=f, total=numupdates, unit='files') + u.progress(_('updating'), i + 1, item=f, total=numupdates, + unit=_('files')) if f and f[0] == "/": continue if m == "r": # remove @@ -361,7 +362,7 @@ flags = a[2] util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) ms.commit() - u.progress(_('updating'), None, total=numupdates, unit='files') + u.progress(_('updating'), None, total=numupdates, unit=_('files')) return updated, merged, removed, unresolved