On Mon, Apr 11, 2016 at 5:43 PM, Vasco Almeida <vascomalme...@sapo.pt> wrote:
>>> @@ -458,13 +458,13 @@ static void NORETURN die_no_merge_candidates(const
>>> char *repo, const char **refs
>>> fprintf_ln(stderr, _("Please specify which branch you
>>> want to merge with."));
>>> fprintf_ln(stderr, _("See git-pull(1) for details."));
>>> fprintf(stderr, "\n");
>>> - fprintf_ln(stderr, " git pull <remote> <branch>");
>>> + fprintf_ln(stderr, " git pull <%s> <%s>", _("remote"),
>>> _("branch"));
>>
>> I know this hunk follows I suggested, i.e. "quotes around a
>> placeholder is universal and locale independent". However, ...
>>
>>> fprintf(stderr, "\n");
>>> } else if (!curr_branch->merge_nr) {
>>> const char *remote_name = NULL;
>>>
>>> if (for_each_remote(get_only_remote, &remote_name) ||
>>> !remote_name)
>>> - remote_name = "<remote>";
>>> + remote_name = _("<remote>");
>>>
>> ... this does not. It allows to translate the "quote around a
>> placeholder". And where this phony "remote_name" string is used,
>> there is also this reference to <branch>:
>>
>> fprintf_ln(stderr, _("If you wish to set tracking information for ..."
>> "\n"
>> " git branch --set-upstream-to=%s/<branch> %s\n"),
>> remote_name, curr_branch->name);
>>
>> which also does.
>>
>> Perhaps the first hunk at around ll.458 would want to do
>>
>>> + fprintf_ln(stderr, " git pull %s %s", _("<remote>"), _("<branch>"));
>>
>> to be consistent and more flexible for the translator's needs? The
>> quoting convention may be locale dependent after all.
>>
> If we think placeholders quoting is important for localization,
Ex-translator speaking. Context is important. If it's me, I would even
go as far as marking the whole line translatable just to give more
context (it's mostly just copy and translate a few words then). But
then again, I was half developer half translator and may see things a
bit differently. Maybe _("<remote>") is a good balance.
--
Duy
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
