Re: [PATCH] merge-recursive: add hint for translators in handle_change_delete()
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:54:25
Ralf Thielow [off-list ref] writes:
The outputs in handle_change_delete() contain a lot of placeholders. This could end up in confusion to translators since two parts of them are translated separately. Add a hint for translators that they can easily understand it without study the code. Signed-off-by: Ralf Thielow <redacted> --- This patch is based on a confusion on my own of the values of the replacements. The first idea of Thomas was to remove the legos of the static replacements. After thinking about and trying, it would end up in a lot more of lines in this function mainly caused by the different outputs. It might be nicer to just add a hint for translators to describe the static replacements.
Annotating only the first and then the fourth without explaining
others did not help me when I tried to guess what the message was
trying to say without looking at the variable names (which are not
directly available to people who work on *.po files).
I wonder something along this line to annotate all placeholders in
the order they appear might be easier to read:
/*
* TRANSLATORS: this message has many placeholders.
*
* CONFLICT (
* %s=<translation of noun "rename" or "modify">/delete):
* %s=<name of the path being merged> deleted in
* %s=<name of a branch> and
* %s=<translation of verb pp "renamed" or "modified"> in
* %s=<name of a branch>. Version
* %s=<name of a branch> of
* %s=<name of the path being merged> left in tree.
*/
quoted hunk
merge-recursive.c | 3 +++ 1 file changed, 3 insertions(+)diff --git a/merge-recursive.c b/merge-recursive.c index 8903a73..7f661f2 100644 --- a/merge-recursive.c +++ b/merge-recursive.c@@ -1035,6 +1035,9 @@ static void handle_change_delete(struct merge_options *o, update_file(o, 0, o_sha, o_mode, renamed ? renamed : path); } else if (!a_sha) { if (!renamed) { + /* TRANSLATORS: The first %s will be "rename" or "modify", + the fourth %s will be "renamed" or "modified". These replacements + are translated separately. This counts for the next four messages. */ output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " "and %s in %s. Version %s of %s left in tree."), change, path, o->branch1, change_past,