Subject: Re: [PATCH 07/10] i18n: apply: mark strings for translation

From: Junio C Hamano <[email-masked]>
Date: Wed, 25 Apr 2012 15:50:11 -0700

Nguyễn Thái Ngọc Duy  <[email-masked]> writes:

> @@ -886,17 +886,17 @@ static char *gitdiff_verify_name(const char *line, int isnull, char *orig_name,
> ...
>  		if (!another || memcmp(another, name, len + 1))
> -			die("git apply: bad git-diff - inconsistent %s filename on line %d", oldnew, linenr);
> +			die(_("git apply: bad git-diff - inconsistent %s filename on line %d"), oldnew, linenr);
>  		free(another);
>  		return orig_name;
>  	}

In this function, the parameter oldnew has "old" or "new" and the
callers (gitdiff_oldname() and gitdiff_newname()) do not have it marked
for translation.  Even if they did, it would result in a lego
composition, so you may have to switch between two translatable messages
here.