--- a/hgext/bookmarks.py Fri Feb 19 02:11:37 2010 +0100
+++ b/hgext/bookmarks.py Fri Feb 19 02:23:38 2010 +0100
@@ -147,7 +147,7 @@
if rev:
raise util.Abort(_("bookmark name required"))
if len(marks) == 0:
- ui.status("no bookmarks set\n")
+ ui.status(_("no bookmarks set\n"))
else:
for bmark, n in marks.iteritems():
if ui.configbool('bookmarks', 'track.current'):
--- a/hgext/gpg.py Fri Feb 19 02:11:37 2010 +0100
+++ b/hgext/gpg.py Fri Feb 19 02:23:38 2010 +0100
@@ -221,8 +221,8 @@
for n in nodes:
hexnode = hgnode.hex(n)
- ui.write("Signing %d:%s\n" % (repo.changelog.rev(n),
- hgnode.short(n)))
+ ui.write(_("Signing %d:%s\n") % (repo.changelog.rev(n),
+ hgnode.short(n)))
# build data
data = node2txt(repo, n, sigver)
sig = mygpg.sign(data)
--- a/hgext/mq.py Fri Feb 19 02:11:37 2010 +0100
+++ b/hgext/mq.py Fri Feb 19 02:23:38 2010 +0100
@@ -2199,7 +2199,7 @@
patch = q.lookup(patch)
else:
if not q.applied:
- ui.write('no patches applied\n')
+ ui.write(_('no patches applied\n'))
return 1
patch = q.lookup('qtip')
ph = patchheader(q.join(patch), q.plainmode)
@@ -2302,8 +2302,7 @@
raise util.Abort(
_('A patch named %s already exists in the series file') % name)
- if ui.verbose:
- ui.write('renaming %s to %s\n' % (patch, name))
+ ui.note(_('renaming %s to %s\n') % (patch, name))
i = q.find_series(patch)
guards = q.guard_re.findall(q.full_series[i])
q.full_series[i] = name + ''.join([' #' + g for g in guards])
--- a/hgext/transplant.py Fri Feb 19 02:11:37 2010 +0100
+++ b/hgext/transplant.py Fri Feb 19 02:23:38 2010 +0100
@@ -393,13 +393,13 @@
def browserevs(ui, repo, nodes, opts):
'''interactively transplant changesets'''
def browsehelp(ui):
- ui.write('y: transplant this changeset\n'
- 'n: skip this changeset\n'
- 'm: merge at this changeset\n'
- 'p: show patch\n'
- 'c: commit selected changesets\n'
- 'q: cancel transplant\n'
- '?: show this help\n')
+ ui.write(_('y: transplant this changeset\n'
+ 'n: skip this changeset\n'
+ 'm: merge at this changeset\n'
+ 'p: show patch\n'
+ 'c: commit selected changesets\n'
+ 'q: cancel transplant\n'
+ '?: show this help\n'))
displayer = cmdutil.show_changeset(ui, repo, opts)
transplants = []
@@ -418,7 +418,7 @@
ui.write(chunk)
action = None
elif action not in ('y', 'n', 'm', 'c', 'q'):
- ui.write('no such option\n')
+ ui.write(_('no such option\n'))
action = None
if action == 'y':
transplants.append(node)
--- a/mercurial/localrepo.py Fri Feb 19 02:11:37 2010 +0100
+++ b/mercurial/localrepo.py Fri Feb 19 02:23:38 2010 +0100
@@ -1890,7 +1890,7 @@
lookup_filenode_link_func(fname))
for chnk in group:
self.ui.progress(
- 'bundle files', cnt, item=fname, unit='chunks')
+ _('bundle files'), cnt, item=fname, unit='chunks')
cnt += 1
yield chnk
if fname in msng_filenode_set:
@@ -1974,10 +1974,10 @@
lookup = lookuprevlink_func(filerevlog)
for chnk in filerevlog.group(nodeiter, lookup):
self.ui.progress(
- 'bundle files', cnt, item=fname, unit='chunks')
+ _('bundle files'), cnt, item=fname, unit='chunks')
cnt += 1
yield chnk
- self.ui.progress('bundle files', None, unit='chunks')
+ self.ui.progress(_('bundle files'), None, unit='chunks')
yield changegroup.closechunk()
--- a/mercurial/subrepo.py Fri Feb 19 02:11:37 2010 +0100
+++ b/mercurial/subrepo.py Fri Feb 19 02:23:38 2010 +0100
@@ -336,7 +336,7 @@
self._ui.warn(_('not removing repo %s because '
'it has changes.\n' % self._path))
return
- self._ui.note('removing subrepo %s\n' % self._path)
+ self._ui.note(_('removing subrepo %s\n') % self._path)
shutil.rmtree(self._ctx.repo.join(self._path))
def get(self, state):