From ab86885a61cdbcae19d08697285957462593069d Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Fri, 8 Apr 2016 20:02:45 +0000 Subject: i18n: builtin/branch.c: mark option for translation Mark description and parameter for option "set-upstream-to" for translation. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'builtin/branch.c') diff --git a/builtin/branch.c b/builtin/branch.c index 7b45b6bd6b..5ab106bed2 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -620,7 +620,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) BRANCH_TRACK_EXPLICIT), OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"), BRANCH_TRACK_OVERRIDE), - OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"), + OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")), OPT_BOOL(0, "unset-upstream", &unset_upstream, "Unset the upstream info"), OPT__COLOR(&branch_use_color, N_("use colored output")), OPT_SET_INT('r', "remotes", &filter.kind, N_("act on remote-tracking branches"), -- cgit v1.2.3 From 2010aabd91eec0e8b074774e924e5264a522a923 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Wed, 13 Apr 2016 10:29:53 +0000 Subject: i18n: branch: unmark string for translation Unmark strings for translation for command help/hint. These strings can not be translated, just copied. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- builtin/branch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'builtin/branch.c') diff --git a/builtin/branch.c b/builtin/branch.c index 5ab106bed2..cfb523205f 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -828,8 +828,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && !branch_existed && remote_tracking) { fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); - fprintf(stderr, _(" git branch -d %s\n"), branch->name); - fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); + fprintf(stderr, " git branch -d %s\n", branch->name); + fprintf(stderr, " git branch --set-upstream-to %s\n", branch->name); } } else -- cgit v1.2.3 From 60ea78b8a1954a7f09c92d0b5625d927eb951263 Mon Sep 17 00:00:00 2001 From: Vasco Almeida Date: Wed, 13 Apr 2016 10:29:54 +0000 Subject: i18n: branch: move comment for translators Move and split comment for translators (marked by TRANSLATORS) to be immediately above the strings marked for translation. As a result, the comment can now be extracted by xgettext. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano --- builtin/branch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'builtin/branch.c') diff --git a/builtin/branch.c b/builtin/branch.c index cfb523205f..32be954cee 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -369,12 +369,14 @@ static char *get_head_description(void) strbuf_addf(&desc, _("(no branch, bisect started on %s)"), state.branch); else if (state.detached_from) { - /* TRANSLATORS: make sure these match _("HEAD detached at ") - and _("HEAD detached from ") in wt-status.c */ if (state.detached_at) + /* TRANSLATORS: make sure this matches + "HEAD detached at " in wt-status.c */ strbuf_addf(&desc, _("(HEAD detached at %s)"), state.detached_from); else + /* TRANSLATORS: make sure this matches + "HEAD detached from " in wt-status.c */ strbuf_addf(&desc, _("(HEAD detached from %s)"), state.detached_from); } -- cgit v1.2.3