Ralf Thielow <ralf.thie...@gmail.com> writes:

> The function "merge_recursive" prints the count of common
> ancestors as "found %u common ancestor(s):". At least for
> better translation, we should use a singular and a plural
> form of this message.
>
> Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com>
> ---

Thanks.

In your "At least" above, I am getting an impression that either (1)
you think the updated two-message solution is still not ideal for
some reason, or (2) you think the change not only helps translation,
it also helps something else.  But I cannot quite guess which.  If
it is (1) I am not sure what you are not exactly happy about, if it
is (2) I am not sure what other problem the change helps.

I am a bit puzzled by the log message, but the change makes sense to
me otherwise.

>  merge-recursive.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 8903a73..39b2e16 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);
>       }
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to