From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-5.4 required=3.0 tests=AWL,BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id BFFF620984 for ; Mon, 12 Sep 2016 11:39:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758078AbcILLjA (ORCPT ); Mon, 12 Sep 2016 07:39:00 -0400 Received: from relay3.ptmail.sapo.pt ([212.55.154.23]:52143 "EHLO sapo.pt" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1758068AbcILLjA (ORCPT ); Mon, 12 Sep 2016 07:39:00 -0400 Received: (qmail 11740 invoked from network); 12 Sep 2016 11:38:58 -0000 Received: (qmail 29241 invoked from network); 12 Sep 2016 11:32:07 -0000 Received: from unknown (HELO catarina.localdomain) (vascomalmeida@sapo.pt@[85.246.157.91]) (envelope-sender ) by ptmail-mta-auth02 (qmail-ptmail-1.0.0) with ESMTPA for ; 12 Sep 2016 11:32:02 -0000 X-PTMail-RemoteIP: 85.246.157.91 X-PTMail-AllowedSender-Action: X-PTMail-Service: default From: Vasco Almeida To: git@vger.kernel.org Cc: Vasco Almeida , Jiang Xin , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= , =?UTF-8?q?Jean-No=C3=ABl=20AVILA?= , Junio C Hamano Subject: [PATCH v2 14/14] i18n: show-branch: mark plural strings for translation Date: Mon, 12 Sep 2016 11:30:02 +0000 Message-Id: <1473679802-31381-14-git-send-email-vascomalmeida@sapo.pt> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473679802-31381-1-git-send-email-vascomalmeida@sapo.pt> References: <1473679802-31381-1-git-send-email-vascomalmeida@sapo.pt> In-Reply-To: <1473259758-11836-1-git-send-email-vascomalmeida@sapo.pt> References: <1473259758-11836-1-git-send-email-vascomalmeida@sapo.pt> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Mark plural string for translation using Q_(). Although we already know that the plural sentence is always used in the English source, other languages have complex plural rules they must comply according to the value of MAX_REVS. Signed-off-by: Vasco Almeida --- builtin/show-branch.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/builtin/show-branch.c b/builtin/show-branch.c index 6bf82cd..5905ca1 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -373,8 +373,9 @@ static int append_ref(const char *refname, const struct object_id *oid, return 0; } if (MAX_REVS <= ref_name_cnt) { - warning("ignoring %s; cannot handle more than %d refs", - refname, MAX_REVS); + warning(Q_("ignoring %s; cannot handle more than %d ref", + "ignoring %s; cannot handle more than %d refs", + MAX_REVS), refname, MAX_REVS); return 0; } ref_name[ref_name_cnt++] = xstrdup(refname); @@ -731,8 +732,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) die(_("--reflog option needs one branch name")); if (MAX_REVS < reflog) - die("only %d entries can be shown at one time.", - MAX_REVS); + die(Q_("only %d entry can be shown at one time.", + "only %d entries can be shown at one time.", + MAX_REVS), MAX_REVS); if (!dwim_ref(*av, strlen(*av), oid.hash, &ref)) die(_("no such ref %s"), *av); @@ -826,7 +828,10 @@ int cmd_show_branch(int ac, const char **av, const char *prefix) unsigned int flag = 1u << (num_rev + REV_SHIFT); if (MAX_REVS <= num_rev) - die("cannot handle more than %d revs.", MAX_REVS); + die(Q_("cannot handle more than %d rev.", + "cannot handle more than %d revs.", + MAX_REVS), MAX_REVS); + if (get_sha1(ref_name[num_rev], revkey.hash)) if (get_sha1(ref_name[num_rev], revkey.hash)) die(_("'%s' is not a valid ref."), ref_name[num_rev]); commit = lookup_commit_reference(revkey.hash); -- 2.7.4