[PATCH] merge/progress: marking strings for localization

[timeless]

# HG changeset patch
# User timeless <timeless at gmail.com>
# Date 1280722547 -10800
# Node ID 8071b7c9be9d0900fa231050ae23c6fb9b16cdfb
# Parent  fb2771df0fb88cb35d0d4670f708b4c726d24034
merge/progress: marking strings for localization

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -299,7 +299,7 @@ def applyupdates(repo, action, wctx, mct
     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 +361,7 @@ def applyupdates(repo, action, wctx, mct
             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