undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort: split "distinct types" message into two translatable messages

Browse Source 
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>
This commit is contained in:
Alex Henrie 2021-05-09 15:52:50 -06:00 committed by Junio C Hamano
parent 48bf2fa8ba
commit 0e59f7ad67
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
merge-ort.c
View File

@ -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));