Às 20:33 de 08-04-2016, Junio C Hamano escreveu:
> Vasco Almeida <vascomalmeida@xxxxxxx> 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html