diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -1629,7 +1629,7 @@ def import_(ui, repo, patch1, *patches, if opts.get('exact'): if hex(n) != nodeid: repo.rollback() - raise util.Abort(_('patch is damaged' + + raise util.Abort(_('patch is damaged' ' or loses information')) finally: os.unlink(tmpname) @@ -1937,7 +1937,7 @@ def merge(ui, repo, node=None, force=Non if len(heads) == 1: msg = _('there is nothing to merge') if parent != repo.lookup(repo.workingctx().branch()): - msg = _('%s - use "hg update" instead' % msg) + msg = _('%s - use "hg update" instead') % msg raise util.Abort(msg) if parent not in heads: diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py --- a/mercurial/dispatch.py +++ b/mercurial/dispatch.py @@ -125,7 +125,7 @@ def _runcatch(ui, args): ui.warn("\n%r\n" % util.ellipsis(inst[1])) except ImportError, inst: m = str(inst).split()[-1] - ui.warn(_("abort: could not import module %s!\n" % m)) + ui.warn(_("abort: could not import module %s!\n") % m) if m in "mpatch bdiff".split(): ui.warn(_("(did you forget to compile extensions?)\n")) elif m in "zlib".split():