# [PATCH 1/2] i18n: branch: unmark string for translation 3 messages from 2016-04-13 to 2016-04-14. Participants: Vasco Almeida, Junio C Hamano. Thread: https://gitlist.dev/t/42014 ## Vasco Almeida, 2016-04-13 10:29 Subject: [PATCH 1/2] i18n: branch: unmark string for translation Message-ID: <1460543394-11050-1-git-send-email-vascomalmeida@sapo.pt> URL: https://gitlist.dev/e/1460543394-11050-1-git-send-email-vascomalmeida%40sapo.pt ``` Unmark strings for translation for command help/hint. These strings can not be translated, just copied. Signed-off-by: Vasco Almeida --- Moreover, prevent a possible translation mistake, e.g. wrong leading spacing. builtin/branch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index 7b45b6b..b327cca 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 -- 2.1.4 ``` ## Vasco Almeida, 2016-04-13 10:29 Subject: [PATCH 2/2] i18n: branch: move comment for translators Message-ID: <1460543394-11050-2-git-send-email-vascomalmeida@sapo.pt> URL: https://gitlist.dev/e/1460543394-11050-2-git-send-email-vascomalmeida%40sapo.pt In-Reply-To: <1460543394-11050-1-git-send-email-vascomalmeida@sapo.pt> ``` 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 --- builtin/branch.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index b327cca..8a0a181 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); } -- 2.1.4 ``` ## Junio C Hamano, 2016-04-14 16:13 Subject: Re: [PATCH 1/2] i18n: branch: unmark string for translation Message-ID: URL: https://gitlist.dev/e/xmqq7fg0i2xo.fsf%40gitster.mtv.corp.google.com In-Reply-To: <1460543394-11050-1-git-send-email-vascomalmeida@sapo.pt> ``` Thanks, picked up and queued. ```