Patchwork [3,of,3,stable] bookmarks: add i18n hints to bookmark sync states

login
register
mail settings
Submitter Wagner Bruna
Date April 22, 2015, 1:18 a.m.
Message ID <5947a68fa271250dde4d.1429665482@sirius.home>
Download mbox | patch
Permalink /patch/8758/
State Accepted
Headers show

Comments

Wagner Bruna - April 22, 2015, 1:18 a.m.
# HG changeset patch
# User Wagner Bruna <wbruna@yahoo.com>
# Date 1429660928 10800
#      Tue Apr 21 21:02:08 2015 -0300
# Branch stable
# Node ID 5947a68fa271250dde4dfcd57894bfea1c60d819
# Parent  2bb0e6cc39f6597d08b8b07cfad8915972c54258
bookmarks: add i18n hints to bookmark sync states
Matt Mackall - April 22, 2015, 3:57 p.m.
On Tue, 2015-04-21 at 22:18 -0300, Wagner Bruna wrote:
> # HG changeset patch
> # User Wagner Bruna <wbruna@yahoo.com>
> # Date 1429660928 10800
> #      Tue Apr 21 21:02:08 2015 -0300
> # Branch stable
> # Node ID 5947a68fa271250dde4dfcd57894bfea1c60d819
> # Parent  2bb0e6cc39f6597d08b8b07cfad8915972c54258
> bookmarks: add i18n hints to bookmark sync states

These are queued for default, thanks.

Patch

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -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: