Mercurial > hg
changeset 17892:ba0a1701c81a stable
i18n: add "i18n" comment to column positioning messages of "hg summary"
This comment makes it easier to distinguish such messages from others
for message translators.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 31 Oct 2012 03:59:28 +0900 |
parents | 8f85151ce201 |
children | 4d1da97aa7e7 |
files | hgext/largefiles/overrides.py hgext/mq.py mercurial/commands.py |
diffstat | 3 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py Wed Oct 31 03:59:27 2012 +0900 +++ b/hgext/largefiles/overrides.py Wed Oct 31 03:59:28 2012 +0900 @@ -1022,10 +1022,13 @@ if opts.pop('large', None): toupload = getoutgoinglfiles(ui, repo, None, **opts) if toupload is None: + # i18n: column positioning for "hg summary" ui.status(_('largefiles: No remote repo\n')) elif not toupload: + # i18n: column positioning for "hg summary" ui.status(_('largefiles: (no files to upload)\n')) else: + # i18n: column positioning for "hg summary" ui.status(_('largefiles: %d to upload\n') % len(toupload)) def scmutiladdremove(orig, repo, pats=[], opts={}, dry_run=None,
--- a/hgext/mq.py Wed Oct 31 03:59:27 2012 +0900 +++ b/hgext/mq.py Wed Oct 31 03:59:28 2012 +0900 @@ -3563,6 +3563,7 @@ if m: ui.write("mq: %s\n" % ', '.join(m)) else: + # i18n: column positioning for "hg summary" ui.note(_("mq: (empty queue)\n")) return r
--- a/mercurial/commands.py Wed Oct 31 03:59:27 2012 +0900 +++ b/mercurial/commands.py Wed Oct 31 03:59:28 2012 +0900 @@ -5464,6 +5464,7 @@ for p in parents: # label with log.changeset (instead of log.parent) since this # shows a working directory parent *changeset*: + # i18n: column positioning for "hg summary" ui.write(_('parent: %d:%s ') % (p.rev(), str(p)), label='log.changeset changeset.%s' % p.phasestr()) ui.write(' '.join(p.tags()), label='log.tag') @@ -5481,6 +5482,7 @@ branch = ctx.branch() bheads = repo.branchheads(branch) + # i18n: column positioning for "hg summary" m = _('branch: %s\n') % branch if branch != 'default': ui.write(m, label='log.branch') @@ -5489,6 +5491,7 @@ if marks: current = repo._bookmarkcurrent + # i18n: column positioning for "hg summary" ui.write(_('bookmarks:'), label='log.bookmark') if current is not None: try: @@ -5554,8 +5557,10 @@ t += _(' (new branch head)') if cleanworkdir: + # i18n: column positioning for "hg summary" ui.status(_('commit: %s\n') % t.strip()) else: + # i18n: column positioning for "hg summary" ui.write(_('commit: %s\n') % t.strip()) # all ancestors of branch heads - all ancestors of parent = new csets @@ -5573,10 +5578,13 @@ new = sum(new) if new == 0: + # i18n: column positioning for "hg summary" ui.status(_('update: (current)\n')) elif pnode not in bheads: + # i18n: column positioning for "hg summary" ui.write(_('update: %d new changesets (update)\n') % new) else: + # i18n: column positioning for "hg summary" ui.write(_('update: %d new changesets, %d branch heads (merge)\n') % (new, len(bheads))) @@ -5618,8 +5626,10 @@ t.append(_('%d outgoing bookmarks') % len(diff)) if t: + # i18n: column positioning for "hg summary" ui.write(_('remote: %s\n') % (', '.join(t))) else: + # i18n: column positioning for "hg summary" ui.status(_('remote: (synced)\n')) @command('tag',