From: Vasco Almeida <vascomalmeida@sapo•pt>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, Jiang Xin <worldhello.net@gmail•com>
Subject: Re: [PATCH 4/7] l10n: builtin/pull.c: mark strings for translation
Date: Sat, 9 Apr 2016 12:34:48 +0000 [thread overview]
Message-ID: <5708F6E8.506@sapo.pt> (raw)
In-Reply-To: <xmqqd1pzvo0p.fsf@gitster.mtv.corp.google.com>
Às 20:33 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida <vascomalmeida@sapo•pt> writes:
>
>> Some translations might also translate "<remote>" and "<branch>".
>> ...
>> fprintf_ln(stderr, _("See git-pull(1) for details."));
>> fprintf(stderr, "\n");
>> - fprintf_ln(stderr, " git pull <remote> <branch>");
>> + fprintf_ln(stderr, _(" git pull <remote> <branch>"));
>
> But "git pull" itself must never be translated, and there is no hint
> given to those who are working on *.po files to prevent it.
>
> Wouldn't it make more sense to do it like this?
>
> fprintf_ln(stderr, " git pull <%s> <%s>", _("remote"), _("branch"));
>
Yes, I think the way you suggest is better, since it prevents
translation mistakes. I'll do the same to
eval_gettextln " git branch --set-upstream-to=\$remote/<branch>\$display_branch_name"
in git-parse-remote.sh ending.
next prev parent reply other threads:[~2016-04-09 12:35 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-08 20:02 [PATCH 1/7] l10n: index-pack: use plural string instead of normal one Vasco Almeida
2016-04-08 20:02 ` [PATCH 2/7] l10n: unpack-trees: mark strings for translation Vasco Almeida
2016-04-08 20:23 ` Junio C Hamano
2016-04-09 12:19 ` Vasco Almeida
2016-04-08 20:02 ` [PATCH 3/7] l10n: git-parse-remote.sh: " Vasco Almeida
2016-04-08 20:30 ` Junio C Hamano
2016-04-08 20:02 ` [PATCH 4/7] l10n: builtin/pull.c: " Vasco Almeida
2016-04-08 20:33 ` Junio C Hamano
2016-04-09 12:34 ` Vasco Almeida [this message]
2016-04-08 20:02 ` [PATCH 5/7] l10n: builtin/pull.c: split strings marked " Vasco Almeida
2016-04-08 20:02 ` [PATCH 6/7] l10n: mv.c: add a comma ',' to string Vasco Almeida
2016-04-08 20:35 ` Junio C Hamano
2016-04-08 20:02 ` [PATCH 7/7] l10n: builtin/branch.c: mark option for translation Vasco Almeida
2016-04-08 20:26 ` [PATCH 1/7] l10n: index-pack: use plural string instead of normal one Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5708F6E8.506@sapo.pt \
--to=vascomalmeida@sapo$(echo .)pt \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=worldhello.net@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox