checkout: call a single commit "it" intead of "them"
When detached and checking out a branch again, git checkout warns about commit(s) that might get lost. It says "If you want to keep them ..." even for only one commit. Use Q_() to allow differentiating singular vs plural. Signed-off-by: Thomas Schneider <thosch97@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Schneider committed
Apr 1, 2015 at 19:38 UTC
fc792ca86049a85f9cf916d6bcdbbc1799ba91ec
1 file changed
+9
-2
builtin/checkout.c
+9
-2
@@ -743,10 +743,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
743
744
if (advice_detached_head)
745
fprintf(stderr,
746
- _(
746
+ Q_(
747
+ /* The singular version */
748
+ "If you want to keep it by creating a new branch, "
749
+ "this may be a good time\nto do so with:\n\n"
750
+ " git branch <new-branch-name> %s\n\n",
751
+ /* The plural version */
752
"If you want to keep them by creating a new branch, "
753
"this may be a good time\nto do so with:\n\n"
749
- " git branch <new-branch-name> %s\n\n"),
754
+ " git branch <new-branch-name> %s\n\n",
755
+ /* Give ngettext() the count */
756
+ lost),
757
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
758
}
759