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>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3e141fc1491949a2dbb47c59d7d156ae6fe4eb47..4aad49aaa1d984bb6852361118932db0c984491b 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -743,10 +743,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
 
        if (advice_detached_head)
                fprintf(stderr,
 
        if (advice_detached_head)
                fprintf(stderr,

-                       _(
+                       Q_(
+                       /* The singular version */
+                       "If you want to keep it by creating a new branch, "
+                       "this may be a good time\nto do so with:\n\n"
+                       " git branch <new-branch-name> %s\n\n",
+                       /* The plural version */

                        "If you want to keep them by creating a new branch, "
                        "this may be a good time\nto do so with:\n\n"
                        "If you want to keep them by creating a new branch, "
                        "this may be a good time\nto do so with:\n\n"

-                       " git branch <new-branch-name> %s\n\n"),
+                       " git branch <new-branch-name> %s\n\n",
+                       /* Give ngettext() the count */
+                       lost),

                        find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
 }
 
                        find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
 }