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>
Alex Henrie committed
May 9, 2021 at 15:52 UTC
0e59f7ad67d9bf9153d405577a07b5c360c55f41
1 file changed
+15
-6
merge-ort.c
+15
-6
@@ -2803,12 +2803,21 @@ static void process_entry(struct merge_options *opt,
2803
rename_b = 1;
2804
}
2805
2806
- path_msg(opt, path, 0,
2807
- _("CONFLICT (distinct types): %s had different "
2808
- "types on each side; renamed %s of them so "
2809
- "each can be recorded somewhere."),
2810
- path,
2811
- (rename_a && rename_b) ? _("both") : _("one"));
2806
+ if (rename_a && rename_b) {
2807
+ path_msg(opt, path, 0,
2808
+ _("CONFLICT (distinct types): %s had "
2809
+ "different types on each side; "
2810
+ "renamed both of them so each can "
2811
+ "be recorded somewhere."),
2812
+ path);
2813
+ } else {
2814
+ path_msg(opt, path, 0,
2815
+ _("CONFLICT (distinct types): %s had "
2816
+ "different types on each side; "
2817
+ "renamed one of them so each can be "
2818
+ "recorded somewhere."),
2819
+ path);
2820
+ }
2821
2822
ci->merged.clean = 0;
2823
memcpy(new_ci, ci, sizeof(*new_ci));