On Tue, May 03, 2016 at 07:20:27AM +0700, Duy Nguyen wrote: > > I think it needs to be max(ours, theirs) > > > > "Your branch and '%s' have diverged,\n" > > "and have 1 and 1 different commit each, " > > > > so singular for that too, no? > > I thought that would be "1 and 1 commits". English is complicated :-D > I don't think Q_() is prepared to deal with this, other languages may > have different interpretation of "x and y" too. But we can at least > make the English version right.
Yes, it should still be "1 and 1 commits", I think. An actual human would probably say something like "and each has %d commit(s)" when the two values are the same, though. Note that I do not think the singular case can ever trigger with your new code. We know that both "ours" and "theirs" are non-zero to get to this message, which means "ours + theirs" must be at least 2 (barring negative commit counts, of course :) ). So you could probably replace the Q_() with just a _(). -Peff -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
