git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Vasco Almeida <vascomalmeida@sapo.pt>
To: git@vger.kernel.org
Cc: "Vasco Almeida" <vascomalmeida@sapo.pt>,
	"Jiang Xin" <worldhello.net@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Jean-Noël AVILA" <jn.avila@free.fr>,
	"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v3 13/14] i18n: show-branch: mark plural strings for translation
Date: Thu, 15 Sep 2016 14:59:07 +0000	[thread overview]
Message-ID: <1473951548-31733-13-git-send-email-vascomalmeida@sapo.pt> (raw)
In-Reply-To: <1473951548-31733-1-git-send-email-vascomalmeida@sapo.pt>
In-Reply-To: <1473259758-11836-1-git-send-email-vascomalmeida@sapo.pt>

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 <vascomalmeida@sapo.pt>
---
 builtin/show-branch.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 5809371..623ca56 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,9 @@ 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))
 			die(_("'%s' is not a valid ref."), ref_name[num_rev]);
 		commit = lookup_commit_reference(revkey.hash);
-- 
2.7.4


  parent reply	other threads:[~2016-09-15 15:01 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-07 14:49 [PATCH 01/13] i18n: apply: mark plural string for translation Vasco Almeida
2016-09-07 14:49 ` [PATCH 02/13] i18n: apply: mark error messages " Vasco Almeida
2016-09-07 14:49 ` [PATCH 03/13] i18n: apply: mark info " Vasco Almeida
2016-09-07 14:49 ` [PATCH 04/13] i18n: blame: mark error " Vasco Almeida
2016-09-10  9:41   ` Jean-Noël AVILA
2016-09-12 15:40     ` Junio C Hamano
2016-09-07 14:49 ` [PATCH 05/13] i18n: branch: mark option description " Vasco Almeida
2016-09-07 14:49 ` [PATCH 06/13] i18n: config: mark error message " Vasco Almeida
2016-09-07 14:49 ` [PATCH 07/13] i18n: merge-recursive: mark error messages " Vasco Almeida
2016-09-09 19:23   ` Junio C Hamano
2016-09-07 14:49 ` [PATCH 08/13] i18n: merge-recursive: mark verbose message " Vasco Almeida
2016-09-07 14:49 ` [PATCH 09/13] i18n: notes: mark error messages " Vasco Almeida
2016-09-07 14:49 ` [PATCH 10/13] notes: lowercase first word of error messages Vasco Almeida
2016-09-07 14:49 ` [PATCH 11/13] i18n: receive-pack: mark messages for translation Vasco Almeida
2016-09-07 14:49 ` [PATCH 12/13] i18n: show-branch: mark error " Vasco Almeida
2016-09-07 14:49 ` [PATCH 13/13] i18n: update-index: mark warning " Vasco Almeida
2016-09-07 14:49 ` [PATCH 13/13] i18n: update-index: mark warnings " Vasco Almeida
2016-09-08 20:45 ` [PATCH 01/13] i18n: apply: mark plural string " Junio C Hamano
2016-09-12 11:29 ` [PATCH v2 01/14] " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 02/14] i18n: apply: mark error messages " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 03/14] i18n: apply: mark info " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 04/14] i18n: blame: mark error " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 05/14] i18n: branch: mark option description " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 06/14] i18n: config: mark error message " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 07/14] i18n: merge-recursive: mark error messages " Vasco Almeida
2016-09-12 11:47   ` Jean-Noël Avila
2016-09-12 17:01     ` Junio C Hamano
2016-09-12 16:04   ` Junio C Hamano
2016-09-13 16:54     ` Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 08/14] i18n: merge-recursive: mark verbose message " Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 09/14] i18n: notes: mark error messages " Vasco Almeida
2016-09-12 12:23   ` Jean-Noël Avila
2016-09-13 16:35     ` Vasco Almeida
2016-09-13 20:23       ` Jean-Noël AVILA
2016-09-13 22:01         ` Junio C Hamano
2016-09-12 11:29 ` [PATCH v2 10/14] notes: lowercase first word of error messages Vasco Almeida
2016-09-12 11:29 ` [PATCH v2 11/14] i18n: receive-pack: mark messages for translation Vasco Almeida
2016-09-12 11:30 ` [PATCH v2 12/14] i18n: show-branch: mark error " Vasco Almeida
2016-09-12 12:12   ` Jean-Noël Avila
2016-09-12 17:02     ` Junio C Hamano
2016-09-12 17:19       ` Jean-Noël AVILA
2016-09-12 20:46         ` Junio C Hamano
2016-09-12 11:30 ` [PATCH v2 13/14] i18n: update-index: mark warnings " Vasco Almeida
2016-09-12 11:30 ` [PATCH v2 14/14] i18n: show-branch: mark plural strings " Vasco Almeida
2016-09-15 14:58 ` [PATCH v3 01/14] i18n: apply: mark plural string " Vasco Almeida
2016-09-15 14:58 ` [PATCH v3 02/14] i18n: apply: mark error messages " Vasco Almeida
2016-09-15 14:58 ` [PATCH v3 03/14] i18n: apply: mark info " Vasco Almeida
2016-09-15 14:58 ` [PATCH v3 04/14] i18n: blame: mark error " Vasco Almeida
2016-09-15 20:14   ` Junio C Hamano
2016-09-15 14:58 ` [PATCH v3 05/14] i18n: branch: mark option description " Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 06/14] i18n: config: mark error message " Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 07/14] i18n: merge-recursive: mark error messages " Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 08/14] i18n: merge-recursive: mark verbose message " Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 09/14] i18n: notes: mark error messages " Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 10/14] notes: lowercase first word of error messages Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 11/14] i18n: receive-pack: mark messages for translation Vasco Almeida
2016-09-15 14:59 ` [PATCH v3 12/14] i18n: show-branch: mark error " Vasco Almeida
2016-09-15 14:59 ` Vasco Almeida [this message]
2016-09-15 20:19   ` [PATCH v3 13/14] i18n: show-branch: mark plural strings " Junio C Hamano
2016-09-15 14:59 ` [PATCH v3 14/14] i18n: update-index: mark warnings " Vasco Almeida

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473951548-31733-13-git-send-email-vascomalmeida@sapo.pt \
    --to=vascomalmeida@sapo.pt \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jn.avila@free.fr \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).