From 0e59f7ad67d9bf9153d405577a07b5c360c55f41 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Sun, 9 May 2021 15:52:50 -0600 Subject: [PATCH] merge-ort: split "distinct types" message into two translatable messages The word "renamed" has two possible translations in many European languages depending on whether one thing was renamed or two things were renamed. Give translators freedom to alter any part of the message to make it sound right in their language. Signed-off-by: Alex Henrie Acked-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-ort.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/merge-ort.c b/merge-ort.c index 92dea35e57..403f840e6e 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -2803,12 +2803,21 @@ static void process_entry(struct merge_options *opt, rename_b = 1; } - path_msg(opt, path, 0, - _("CONFLICT (distinct types): %s had different " - "types on each side; renamed %s of them so " - "each can be recorded somewhere."), - path, - (rename_a && rename_b) ? _("both") : _("one")); + if (rename_a && rename_b) { + path_msg(opt, path, 0, + _("CONFLICT (distinct types): %s had " + "different types on each side; " + "renamed both of them so each can " + "be recorded somewhere."), + path); + } else { + path_msg(opt, path, 0, + _("CONFLICT (distinct types): %s had " + "different types on each side; " + "renamed one of them so each can be " + "recorded somewhere."), + path); + } ci->merged.clean = 0; memcpy(new_ci, ci, sizeof(*new_ci));