##// END OF EJS Templates
i18n: fix complaints from pygettext
Matt Mackall -
r5542:253736bb default
parent child Browse files
Show More
@@ -1629,7 +1629,7 b' def import_(ui, repo, patch1, *patches, '
1629 if opts.get('exact'):
1629 if opts.get('exact'):
1630 if hex(n) != nodeid:
1630 if hex(n) != nodeid:
1631 repo.rollback()
1631 repo.rollback()
1632 raise util.Abort(_('patch is damaged' +
1632 raise util.Abort(_('patch is damaged'
1633 ' or loses information'))
1633 ' or loses information'))
1634 finally:
1634 finally:
1635 os.unlink(tmpname)
1635 os.unlink(tmpname)
@@ -1937,7 +1937,7 b' def merge(ui, repo, node=None, force=Non'
1937 if len(heads) == 1:
1937 if len(heads) == 1:
1938 msg = _('there is nothing to merge')
1938 msg = _('there is nothing to merge')
1939 if parent != repo.lookup(repo.workingctx().branch()):
1939 if parent != repo.lookup(repo.workingctx().branch()):
1940 msg = _('%s - use "hg update" instead' % msg)
1940 msg = _('%s - use "hg update" instead') % msg
1941 raise util.Abort(msg)
1941 raise util.Abort(msg)
1942
1942
1943 if parent not in heads:
1943 if parent not in heads:
@@ -125,7 +125,7 b' def _runcatch(ui, args):'
125 ui.warn("\n%r\n" % util.ellipsis(inst[1]))
125 ui.warn("\n%r\n" % util.ellipsis(inst[1]))
126 except ImportError, inst:
126 except ImportError, inst:
127 m = str(inst).split()[-1]
127 m = str(inst).split()[-1]
128 ui.warn(_("abort: could not import module %s!\n" % m))
128 ui.warn(_("abort: could not import module %s!\n") % m)
129 if m in "mpatch bdiff".split():
129 if m in "mpatch bdiff".split():
130 ui.warn(_("(did you forget to compile extensions?)\n"))
130 ui.warn(_("(did you forget to compile extensions?)\n"))
131 elif m in "zlib".split():
131 elif m in "zlib".split():
General Comments 0
You need to be logged in to leave comments. Login now