# HG changeset patch
# User timeless <timeless@gmail.com>
# Date 1280722547 -10800
# Node ID 8b438cb84c5746bea2bd8ec6cc3e98f6d1086173
# Parent  5a1912b5aa4272291acd26b4e60dd3daff615627
merge/progress: marking strings for localization

diff -r 5a1912b5aa42 -r 8b438cb84c57 mercurial/merge.py
--- 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