git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jan Krüger" <jk@jk.gs>,
	"Ramkumar Ramachandra" <artagnon@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 10/15] gettextize: git-notes "Refusing to %s notes in %s" message
Date: Mon,  6 Sep 2010 12:21:39 +0000	[thread overview]
Message-ID: <1283775704-29440-11-git-send-email-avarab@gmail.com> (raw)
In-Reply-To: <1283638229-14199-1-git-send-email-avarab@gmail.com>

The first %s in "Refusing to %s notes in %s" is one of "git notes
ACTION". So we need to mark those actions for translation and later
use _().

Also add a TRANSLATORS comment explaining to translators what the
first %s means.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/notes.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/builtin/notes.c b/builtin/notes.c
index fe58a41..2b417d7 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -476,8 +476,10 @@ static struct notes_tree *init_notes_check(const char *subcommand)
 	t = &default_notes_tree;
 
 	if (prefixcmp(t->ref, "refs/notes/"))
-		die("Refusing to %s notes in %s (outside of refs/notes/)",
-		    subcommand, t->ref);
+		/* TRANSLATORS: The first %s is one of "git notes ACTION",
+		   e.g. "add", "copy", "append" etc. */
+		die(_("Refusing to %s notes in %s (outside of refs/notes/)"),
+		    _(subcommand), t->ref);
 	return t;
 }
 
@@ -500,7 +502,7 @@ static int list(int argc, const char **argv, const char *prefix)
 		usage_with_options(git_notes_list_usage, options);
 	}
 
-	t = init_notes_check("list");
+	t = init_notes_check(N_("list"));
 	if (argc) {
 		if (get_sha1(argv[0], object))
 			die(_("Failed to resolve '%s' as a valid ref."), argv[0]);
@@ -557,7 +559,7 @@ static int add(int argc, const char **argv, const char *prefix)
 	if (get_sha1(object_ref, object))
 		die(_("Failed to resolve '%s' as a valid ref."), object_ref);
 
-	t = init_notes_check("add");
+	t = init_notes_check(N_("add"));
 	note = get_note(t, object);
 
 	if (note) {
@@ -633,7 +635,7 @@ static int copy(int argc, const char **argv, const char *prefix)
 	if (get_sha1(object_ref, object))
 		die(_("Failed to resolve '%s' as a valid ref."), object_ref);
 
-	t = init_notes_check("copy");
+	t = init_notes_check(N_("copy"));
 	note = get_note(t, object);
 
 	if (note) {
@@ -749,7 +751,7 @@ static int show(int argc, const char **argv, const char *prefix)
 	if (get_sha1(object_ref, object))
 		die(_("Failed to resolve '%s' as a valid ref."), object_ref);
 
-	t = init_notes_check("show");
+	t = init_notes_check(N_("show"));
 	note = get_note(t, object);
 
 	if (!note)
@@ -785,7 +787,7 @@ static int remove_cmd(int argc, const char **argv, const char *prefix)
 	if (get_sha1(object_ref, object))
 		die(_("Failed to resolve '%s' as a valid ref."), object_ref);
 
-	t = init_notes_check("remove");
+	t = init_notes_check(N_("remove"));
 
 	fprintf(stderr, _("Removing note for object %s\n"), sha1_to_hex(object));
 	remove_note(t, object);
@@ -814,7 +816,7 @@ static int prune(int argc, const char **argv, const char *prefix)
 		usage_with_options(git_notes_prune_usage, options);
 	}
 
-	t = init_notes_check("prune");
+	t = init_notes_check(N_("prune"));
 
 	prune_notes(t, (verbose ? NOTES_PRUNE_VERBOSE : 0) |
 		(show_only ? NOTES_PRUNE_VERBOSE|NOTES_PRUNE_DRYRUN : 0) );
-- 
1.7.2.3.313.gcd15

  parent reply	other threads:[~2010-09-06 12:22 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-04 22:10 [PATCH 00/63] [REDO] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 01/63] builtin: use builtin.h for all builtin commands Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 02/63] Add infrastructure for translating Git with gettext Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 05/63] tests: locate i18n lib&data correctly under --valgrind Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 21/63] po/is.po: add Icelandic translation Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 26/63] gettext tests: add GETTEXT_POISON=YesPlease Makefile parameter Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 27/63] gettext tests: skip lib-gettext.sh tests under GETTEXT_POISON Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 28/63] gettext tests: skip breaking " Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 51/63] gettextize: git-merge basic messages Ævar Arnfjörð Bjarmason
2010-09-04 22:10 ` [PATCH 63/63] po/en_GB.po: add British English Translation Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 00/15] [REDO CONTINUE] Add gettext support to Git Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 01/15] gettextize: git-archive basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 02/15] gettextize: git-bundle " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 03/15] gettextize: git-clean " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 04/15] gettextize: git-clean clean.requireForce messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 05/15] gettextize: git-describe basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 06/15] gettextize: git-gc " Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 07/15] gettextize: git-gc "Auto packing the repository" message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 08/15] gettextize: git-notes basic commands Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 09/15] gettextize: git-notes GIT_NOTES_REWRITE_MODE error message Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` Ævar Arnfjörð Bjarmason [this message]
2010-09-06 12:21 ` [PATCH 11/15] gettextize: git-revert basic messages Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 12/15] gettextize: git-revert mark the "me" variable for translation Ævar Arnfjörð Bjarmason
2010-09-06 18:45   ` Jonathan Nieder
2010-09-06 20:06     ` Ævar Arnfjörð Bjarmason
2010-09-06 20:08       ` Jonathan Nieder
2010-09-06 12:21 ` [PATCH 13/15] gettextize: git-revert messages using the "me" variable Ævar Arnfjörð Bjarmason
2010-09-06 18:50   ` Jonathan Nieder
2010-09-06 20:12     ` Ævar Arnfjörð Bjarmason
2010-09-07  5:39       ` Jonathan Nieder
2010-09-07  8:51         ` Ævar Arnfjörð Bjarmason
2010-09-10  0:26           ` Junio C Hamano
2010-09-06 12:21 ` [PATCH 14/15] gettextize: git-revert split up "could not revert/apply" message Ævar Arnfjörð Bjarmason
2010-09-06 18:55   ` Jonathan Nieder
2010-09-06 20:25     ` Ævar Arnfjörð Bjarmason
2010-09-07  5:34       ` Jonathan Nieder
2010-09-07  8:47         ` Ævar Arnfjörð Bjarmason
2010-09-06 12:21 ` [PATCH 15/15] gettextize: git-shortlog basic messages Ævar Arnfjörð Bjarmason
2010-09-06 18:41   ` Jonathan Nieder

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

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

  git send-email \
    --in-reply-to=1283775704-29440-11-git-send-email-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jk@jk.gs \
    /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.
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 NNTP newsgroup(s).