From 8f3d6ad89f419a62eef3e3335237e679e531f256 Mon Sep 17 00:00:00 2001 From: Tanga Joris Date: Thu, 22 Oct 2026 03:48:34 +0300 Subject: [PATCH] checkout: use Q_() for messages with counts Two messages in builtin/checkout.c show a count but are marked with a plain _(), so translators can only give a single form for them: - " ... and %d more." at the end of the list of orphaned commits left behind when leaving a detached HEAD, and - "only one reference expected, %d given." when more than one reference is given before "--". Use Q_() for both. Translators of a language that phrases "2 more" and "3 more" the same way now have to translate these messages twice. At that cost, however, we help translators of languages that need to phrase "2 more", "3 more", and "5 more" differently. Helped-by: Junio C Hamano Signed-off-by: Tanga Joris Signed-off-by: Junio C Hamano --- builtin/checkout.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 2d575a4f57..91b7c52396 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1085,7 +1085,9 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs) if (more == 1) describe_one_orphan(&sb, last); else - strbuf_addf(&sb, _(" ... and %d more.\n"), more); + strbuf_addf(&sb, Q_(" ... and %d more.\n", + " ... and %d more.\n", + more), more); } fprintf(stderr, @@ -1489,7 +1491,9 @@ static int parse_branchname_arg(int argc, const char **argv, else if (dash_dash_pos == 1) has_dash_dash = 1; /* case (3) or (1) */ else if (dash_dash_pos >= 2) - die(_("only one reference expected, %d given."), dash_dash_pos); + die(Q_("only one reference expected, %d given.", + "only one reference expected, %d given.", + dash_dash_pos), dash_dash_pos); opts->count_checkout_paths = !opts->quiet && !has_dash_dash; if (!strcmp(arg, "-"))