# HG changeset patch # User Benoit Boissinot # Date 2010-02-19 01:23:38 # Node ID f77f3383c66673cccce5683c6f48938e89a96792 # Parent 3e7e789d94941ed993a86d71896d4e88efb323f9 i18n: mark more strings for translation diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py --- a/hgext/bookmarks.py +++ b/hgext/bookmarks.py @@ -147,7 +147,7 @@ def bookmark(ui, repo, mark=None, rev=No 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'): diff --git a/hgext/gpg.py b/hgext/gpg.py --- a/hgext/gpg.py +++ b/hgext/gpg.py @@ -221,8 +221,8 @@ def sign(ui, repo, *revs, **opts): 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) diff --git a/hgext/mq.py b/hgext/mq.py --- a/hgext/mq.py +++ b/hgext/mq.py @@ -2199,7 +2199,7 @@ def header(ui, repo, patch=None): 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 @@ def rename(ui, repo, patch, name=None, * 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]) diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -393,13 +393,13 @@ def hasnode(repo, node): 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 @@ def browserevs(ui, repo, nodes, opts): 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) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -1890,7 +1890,7 @@ class localrepository(repo.repository): 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 @@ class localrepository(repo.repository): 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() diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py --- a/mercurial/subrepo.py +++ b/mercurial/subrepo.py @@ -336,7 +336,7 @@ class svnsubrepo(object): 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):