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 <>
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.

 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 
+                          the fourth %s will be "renamed" or "modified". These 
+                          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,

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to