{"thread":{"id":"42014","subject":"[PATCH 1/2] i18n: branch: unmark string for translation","startedAt":"2016-04-13T10:29:53Z","lastAt":"2016-04-14T16:13:23Z","messageCount":3,"participants":["Vasco Almeida","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"283309","messageId":"1460543394-11050-1-git-send-email-vascomalmeida@sapo.pt","threadId":"42014","inReplyTo":null,"subject":"[PATCH 1/2] i18n: branch: unmark string for translation","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-04-13T10:29:53Z","receivedAt":"2016-04-13T10:29:53Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Unmark strings for translation for command help/hint.\nThese strings can not be translated, just copied.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\nMoreover, prevent a possible translation mistake, e.g. wrong leading\nspacing.\n\n builtin/branch.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex 7b45b6b..b327cca 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -828,8 +828,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)\n \t\tif (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&\n \t\t    !branch_existed && remote_tracking) {\n \t\t\tfprintf(stderr, _(\"\\nIf you wanted to make '%s' track '%s', do this:\\n\\n\"), head, branch->name);\n-\t\t\tfprintf(stderr, _(\"    git branch -d %s\\n\"), branch->name);\n-\t\t\tfprintf(stderr, _(\"    git branch --set-upstream-to %s\\n\"), branch->name);\n+\t\t\tfprintf(stderr, \"    git branch -d %s\\n\", branch->name);\n+\t\t\tfprintf(stderr, \"    git branch --set-upstream-to %s\\n\", branch->name);\n \t\t}\n \n \t} else\n-- \n2.1.4\n"},{"id":"283310","messageId":"1460543394-11050-2-git-send-email-vascomalmeida@sapo.pt","threadId":"42014","inReplyTo":"1460543394-11050-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 2/2] i18n: branch: move comment for translators","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-04-13T10:29:54Z","receivedAt":"2016-04-13T10:29:54Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Move and split comment for translators (marked by TRANSLATORS) to be\nimmediately above the strings marked for translation.\n\nAs a result, the comment can now be extracted by xgettext.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n builtin/branch.c | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/builtin/branch.c b/builtin/branch.c\nindex b327cca..8a0a181 100644\n--- a/builtin/branch.c\n+++ b/builtin/branch.c\n@@ -369,12 +369,14 @@ static char *get_head_description(void)\n \t\tstrbuf_addf(&desc, _(\"(no branch, bisect started on %s)\"),\n \t\t\t    state.branch);\n \telse if (state.detached_from) {\n-\t\t/* TRANSLATORS: make sure these match _(\"HEAD detached at \")\n-\t\t   and _(\"HEAD detached from \") in wt-status.c */\n \t\tif (state.detached_at)\n+\t\t\t/* TRANSLATORS: make sure this matches\n+\t\t\t   \"HEAD detached at \" in wt-status.c */\n \t\t\tstrbuf_addf(&desc, _(\"(HEAD detached at %s)\"),\n \t\t\t\tstate.detached_from);\n \t\telse\n+\t\t\t/* TRANSLATORS: make sure this matches\n+\t\t\t   \"HEAD detached from \" in wt-status.c */\n \t\t\tstrbuf_addf(&desc, _(\"(HEAD detached from %s)\"),\n \t\t\t\tstate.detached_from);\n \t}\n-- \n2.1.4\n"},{"id":"283453","messageId":"xmqq7fg0i2xo.fsf@gitster.mtv.corp.google.com","threadId":"42014","inReplyTo":"1460543394-11050-1-git-send-email-vascomalmeida@sapo.pt","subject":"Re: [PATCH 1/2] i18n: branch: unmark string for translation","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-04-14T16:13:23Z","receivedAt":"2016-04-14T16:13:23Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, picked up and queued.\n"}]}