Mercurial > hg-stable

changeset 24832:5947a68fa271 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: add i18n hints to bookmark sync states
author Wagner Bruna <wbruna@yahoo.com>
date Tue, 21 Apr 2015 21:02:08 -0300
parents 2bb0e6cc39f6
children cb981009d697
files mercurial/bookmarks.py
diffstat 1 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/bookmarks.py	Tue Apr 21 21:01:17 2015 -0300
+++ b/mercurial/bookmarks.py	Tue Apr 21 21:02:08 2015 -0300
@@ -463,12 +463,16 @@
         def add(b, id, st):
             incomings.append("   %-25s %s\n" % (b, getid(id)))
     for b, scid, dcid in addsrc:
+        # i18n: "added" refers to a bookmark
         add(b, scid, _('added'))
     for b, scid, dcid in advsrc:
+        # i18n: "advanced" refers to a bookmark
         add(b, scid, _('advanced'))
     for b, scid, dcid in diverge:
+        # i18n: "diverged" refers to a bookmark
         add(b, scid, _('diverged'))
     for b, scid, dcid in differ:
+        # i18n: "changed" refers to a bookmark
         add(b, scid, _('changed'))
 
     if not incomings:
@@ -501,14 +505,19 @@
         def add(b, id, st):
             outgoings.append("   %-25s %s\n" % (b, getid(id)))
     for b, scid, dcid in addsrc:
+        # i18n: "added refers to a bookmark
         add(b, scid, _('added'))
     for b, scid, dcid in adddst:
+        # i18n: "deleted" refers to a bookmark
         add(b, ' ' * 40, _('deleted'))
     for b, scid, dcid in advsrc:
+        # i18n: "advanced" refers to a bookmark
         add(b, scid, _('advanced'))
     for b, scid, dcid in diverge:
+        # i18n: "diverged" refers to a bookmark
         add(b, scid, _('diverged'))
     for b, scid, dcid in differ:
+        # i18n: "changed" refers to a bookmark
         add(b, scid, _('changed'))
 
     if not outgoings: