Skip to content

Commit a04194e

Browse files
committed
Merge branch 'tj/checkout-orphan-more-plural'
The messages 'git checkout' prints to describe orphaned commits and multiple references have been updated to use the Q_() macro, allowing translators to use the correct plural forms for numbers greater than one. * tj/checkout-orphan-more-plural: checkout: use Q_() for messages with counts
2 parents 96eb94a + 8f3d6ad commit a04194e

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

‎builtin/checkout.c‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,9 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
11271127
if (more == 1)
11281128
describe_one_orphan(&sb, last);
11291129
else
1130-
strbuf_addf(&sb, _(" ... and %d more.\n"), more);
1130+
strbuf_addf(&sb, Q_(" ... and %d more.\n",
1131+
" ... and %d more.\n",
1132+
more), more);
11311133
}
11321134

11331135
fprintf(stderr,
@@ -1533,7 +1535,9 @@ static int parse_branchname_arg(int argc, const char **argv,
15331535
else if (dash_dash_pos == 1)
15341536
has_dash_dash = 1; /* case (3) or (1) */
15351537
else if (dash_dash_pos >= 2)
1536-
die(_("only one reference expected, %d given."), dash_dash_pos);
1538+
die(Q_("only one reference expected, %d given.",
1539+
"only one reference expected, %d given.",
1540+
dash_dash_pos), dash_dash_pos);
15371541
opts->count_checkout_paths = !opts->quiet && !has_dash_dash;
15381542

15391543
if (!strcmp(arg, "-"))

0 commit comments

Comments
 (0)