mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-19 03:13:52 +02:00
Code

Merge branch 'ah/merge-ort-i18n' into next 

an i18n fix.

* ah/merge-ort-i18n:
  merge-ort: split "distinct types" message into two translatable messages
This commit is contained in:
Junio C Hamano 2021-05-12 08:20:30 +09:00
parent a4bcfd18b9 0e59f7ad67
commit bda497af01
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

@ -3050,12 +3050,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));