From: Junio C Hamano Date: Mon, 16 Mar 2026 17:06:58 GMT Subject: Re: [PATCH] remote: use plural-only message for diverged branch status Message-ID: In-Reply-To: <75c85249-1cff-425a-8e77-98d55215c324@gmail.com> Phillip Wood writes: > On 15/03/2026 02:08, Junio C Hamano wrote: >> Phillip Wood writes: >> >>> There can be more than one form of the plural string though. The gettext >>> manual has the following example of the Polish translation of "file" for >>> different numbers of files [1] >>> >>> 1 plik >>> 2,3,4 pliki >>> 5-21 plików >>> 22-24 pliki >>> 25-31 plików >>> >>> ngettext() handles that correctly, translating a single string without >>> an associated count will not. >> >> That is a very interesting example, and a valid reason to have me >> retract the #leftoverbits that led to the patch being discussed. >> >> But wouldn't that lead to an awkward conclusion, i.e., hits from >> "git grep '[^Q]_("[^"]*%[id]' \*.c" are potential bugs that need to >> be updated to use ngettext(). > > I think it does - maybe we should suggest fixing these as a miroproject > for GSoC and Outreachy? It certainly looks like there are plenty of them. That would be great. It needs a bit of thinking, the required change for each of them is quite small, and there are tons of them. An ideal candidate for a microproject. Adding it to the list of microproject ideas is a good #leftoverbits as well. > > Thanks > > Phillip > >> Of course, we need to exclude messages like "the error code %d was >> returned" and "you have a bug on line %d", but there seem to be real >> errors in randomly selected hits from the "git grep" output, e.g., >> >> add-patch.c: _("Split into %d hunks."), >> archive-zip.c: return error(_("path too long (%d chars, SHA1: %s): %s"), >> builtin/checkout.c: die(_("'%s' matched multiple (%d) remote tracking branches"), >> builtin/credential-store.c: die_errno(_("unable to get credential storage lock in %d ms"), timeout_ms); >> builtin/describe.c: _("found %i tags; gave up search at %s\n"), >> builtin/fsck.c: fprintf_ln(stderr, _("Checking connectivity (%d objects)"), max); >> >> You can notice that I started from 'a' and stopped very early in 'b' >> ;-). >> >> Thanks.