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 <alexhenrie24@gmail.com>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/merge-ort.c b/merge-ort.c
index 92dea35e57a856571882cb250d058f03554197c9..403f840e6e0da279b9e6c20525ccfdadc68342c9 100644 (file)
--- 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));