From e0453cd8f09aa03f3752d994011963ced7dea3ee Mon Sep 17 00:00:00 2001 From: Ralf Thielow Date: Sun, 5 Aug 2012 19:56:38 +0200 Subject: [PATCH] merge-recursive: separate message for common ancestors The function "merge_recursive" prints the count of common ancestors as "found %u common ancestor(s):". We should use a singular and a plural form of this message to help translators. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano --- merge-recursive.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index 8903a731f..39b2e165e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1915,7 +1915,10 @@ int merge_recursive(struct merge_options *o, } if (show(o, 5)) { - output(o, 5, _("found %u common ancestor(s):"), commit_list_count(ca)); + unsigned cnt = commit_list_count(ca); + + output(o, 5, Q_("found %u common ancestor:", + "found %u common ancestors:", cnt), cnt); for (iter = ca; iter; iter = iter->next) output_commit_title(o, iter->item); } -- 2.26.2