# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1240310270 -3600
# Node ID fa7d7d6ca1adcfe82f0213595e9d179a10a86b4f
# Parent  09d1575f16c7f08259a6fa8eddcca4bc7d896e10# Parent  70220c2a4940620cff448955ebf954c2e3558ff0
Merge with stable

diff -r 09d1575f16c7 -r fa7d7d6ca1ad hgkw/keyword.py
--- a/hgkw/keyword.py	Wed Apr 08 23:13:51 2009 +0200
+++ b/hgkw/keyword.py	Tue Apr 21 11:37:50 2009 +0100
@@ -179,7 +179,8 @@
         candidates = [f for f in files if self.iskwfile(f, ctx.flags)]
         if candidates:
             self.restrict = True # do not expand when reading
-            action = expand and 'expanding' or 'shrinking'
+            msg = (expand and _('overwriting %s expanding keywords\n')
+                   or _('overwriting %s shrinking keywords\n'))
             for f in candidates:
                 fp = self.repo.file(f)
                 data = fp.read(mf[f])
@@ -193,7 +194,7 @@
                 else:
                     found = self.re_kw.search(data)
                 if found:
-                    notify(_('overwriting %s %s keywords\n') % (f, action))
+                    notify(msg % f)
                     self.repo.wwrite(f, data, mf.flags(f))
                     self.repo.dirstate.normal(f)
             self.restrict = False