[PATCH stable] progress: use gerund (updating) for merge progress

[timeless]

# HG changeset patch
# User timeless <timeless at gmail.com>
# Date 1280475144 -10800
# Node ID 34dcaf005589da2b3123a1a7bfc97569fc42f412
# Parent  704b499d247da4b3ba5a6a82d034a1b5d48e2183
progress: use gerund (updating) for merge progress

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -286,7 +286,7 @@ def applyupdates(repo, action, wctx, mct
     numupdates = len(action)
     for i, a in enumerate(action):
         f, m = a[:2]
-        u.progress('update', 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
@@ -346,7 +346,7 @@ def applyupdates(repo, action, wctx, mct
         elif m == "e": # exec
             flags = a[2]
             util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
-    u.progress('update', None, total=numupdates, unit='files')
+    u.progress(_('updating'), None, total=numupdates, unit='files')

     return updated, merged, removed, unresolved