Re: [PATCH 07/10] i18n: apply: mark strings for translation
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:40
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 07/10] i18n: apply: mark strings for translation · Nguyễn Thái Ngọc Duy <hidden>
Nguyễn Thái Ngọc Duy [off-list ref] writes:
quoted hunk
@@ -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.