git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Jonathan Niedier" <jrnieder@gmail.com>,
	"Jiang Xin" <worldhello.net@gmail.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 23/66] i18n: format-patch: mark parseopt strings for translation
Date: Mon, 20 Aug 2012 19:32:12 +0700	[thread overview]
Message-ID: <1345465975-16927-24-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1345465975-16927-1-git-send-email-pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/log.c | 66 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/builtin/log.c b/builtin/log.c
index dcd3e13..ba59110 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -890,7 +890,7 @@ static const char *set_outdir(const char *prefix, const char *output_directory)
 }
 
 static const char * const builtin_format_patch_usage[] = {
-	"git format-patch [options] [<since> | <revision range>]",
+	N_("git format-patch [options] [<since> | <revision range>]"),
 	NULL
 };
 
@@ -1063,61 +1063,61 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	char *branch_name = NULL;
 	const struct option builtin_format_patch_options[] = {
 		{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
-			    "use [PATCH n/m] even with a single patch",
+			    N_("use [PATCH n/m] even with a single patch"),
 			    PARSE_OPT_NOARG, numbered_callback },
 		{ OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
-			    "use [PATCH] even with multiple patches",
+			    N_("use [PATCH] even with multiple patches"),
 			    PARSE_OPT_NOARG, no_numbered_callback },
-		OPT_BOOLEAN('s', "signoff", &do_signoff, "add Signed-off-by:"),
+		OPT_BOOLEAN('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
 		OPT_BOOLEAN(0, "stdout", &use_stdout,
-			    "print patches to standard out"),
+			    N_("print patches to standard out")),
 		OPT_BOOLEAN(0, "cover-letter", &cover_letter,
-			    "generate a cover letter"),
+			    N_("generate a cover letter")),
 		OPT_BOOLEAN(0, "numbered-files", &numbered_files,
-			    "use simple number sequence for output file names"),
-		OPT_STRING(0, "suffix", &fmt_patch_suffix, "sfx",
-			    "use <sfx> instead of '.patch'"),
+			    N_("use simple number sequence for output file names")),
+		OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"),
+			    N_("use <sfx> instead of '.patch'")),
 		OPT_INTEGER(0, "start-number", &start_number,
-			    "start numbering patches at <n> instead of 1"),
-		{ OPTION_CALLBACK, 0, "subject-prefix", &rev, "prefix",
-			    "Use [<prefix>] instead of [PATCH]",
+			    N_("start numbering patches at <n> instead of 1")),
+		{ OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
+			    N_("Use [<prefix>] instead of [PATCH]"),
 			    PARSE_OPT_NONEG, subject_prefix_callback },
 		{ OPTION_CALLBACK, 'o', "output-directory", &output_directory,
-			    "dir", "store resulting files in <dir>",
+			    N_("dir"), N_("store resulting files in <dir>"),
 			    PARSE_OPT_NONEG, output_directory_callback },
 		{ OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
-			    "don't strip/add [PATCH]",
+			    N_("don't strip/add [PATCH]"),
 			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
 		OPT_BOOLEAN(0, "no-binary", &no_binary_diff,
-			    "don't output binary diffs"),
+			    N_("don't output binary diffs")),
 		OPT_BOOLEAN(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
-			    "don't include a patch matching a commit upstream"),
+			    N_("don't include a patch matching a commit upstream")),
 		{ OPTION_BOOLEAN, 'p', "no-stat", &use_patch_format, NULL,
-		  "show patch format instead of default (patch + stat)",
+		  N_("show patch format instead of default (patch + stat)"),
 		  PARSE_OPT_NONEG | PARSE_OPT_NOARG },
-		OPT_GROUP("Messaging"),
-		{ OPTION_CALLBACK, 0, "add-header", NULL, "header",
-			    "add email header", 0, header_callback },
-		{ OPTION_CALLBACK, 0, "to", NULL, "email", "add To: header",
+		OPT_GROUP(N_("Messaging")),
+		{ OPTION_CALLBACK, 0, "add-header", NULL, N_("header"),
+			    N_("add email header"), 0, header_callback },
+		{ OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"),
 			    0, to_callback },
-		{ OPTION_CALLBACK, 0, "cc", NULL, "email", "add Cc: header",
+		{ OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"),
 			    0, cc_callback },
-		OPT_STRING(0, "in-reply-to", &in_reply_to, "message-id",
-			    "make first mail a reply to <message-id>"),
-		{ OPTION_CALLBACK, 0, "attach", &rev, "boundary",
-			    "attach the patch", PARSE_OPT_OPTARG,
+		OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"),
+			    N_("make first mail a reply to <message-id>")),
+		{ OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"),
+			    N_("attach the patch"), PARSE_OPT_OPTARG,
 			    attach_callback },
-		{ OPTION_CALLBACK, 0, "inline", &rev, "boundary",
-			    "inline the patch",
+		{ OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"),
+			    N_("inline the patch"),
 			    PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
 			    inline_callback },
-		{ OPTION_CALLBACK, 0, "thread", &thread, "style",
-			    "enable message threading, styles: shallow, deep",
+		{ OPTION_CALLBACK, 0, "thread", &thread, N_("style"),
+			    N_("enable message threading, styles: shallow, deep"),
 			    PARSE_OPT_OPTARG, thread_callback },
-		OPT_STRING(0, "signature", &signature, "signature",
-			    "add a signature"),
+		OPT_STRING(0, "signature", &signature, N_("signature"),
+			    N_("add a signature")),
 		OPT_BOOLEAN(0, "quiet", &quiet,
-			    "don't print the patch filenames"),
+			    N_("don't print the patch filenames")),
 		OPT_END()
 	};
 
-- 
1.7.12.rc2.18.g61b472e

  parent reply	other threads:[~2012-08-20 12:41 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-20 12:31 [PATCH 00/66] parseopt i18n marking (again) Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 01/66] i18n: mark "style" in OPT_COLUMN() for translation Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 02/66] i18n: archive: mark parseopt strings " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 03/66] i18n: add: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 04/66] i18n: bisect--helper: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 05/66] i18n: blame: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 06/66] i18n: branch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 07/66] i18n: cat-file: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 08/66] i18n: check-attr: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 09/66] i18n: checkout-index: " Nguyễn Thái Ngọc Duy
2012-08-20 12:31 ` [PATCH 10/66] i18n: checkout: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 11/66] i18n: cherry: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 12/66] i18n: clean: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 13/66] i18n: clone: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 14/66] i18n: column: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 15/66] i18n: commit: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 16/66] i18n: config: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 17/66] i18n: count-objects: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 18/66] i18n: describe: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 19/66] i18n: fast-export: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 20/66] i18n: fetch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 21/66] i18n: fmt-merge-msg: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 22/66] i18n: for-each-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` Nguyễn Thái Ngọc Duy [this message]
2012-08-20 12:32 ` [PATCH 24/66] i18n: fsck: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 25/66] i18n: gc: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 26/66] i18n: grep: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 27/66] i18n: hash-object: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 28/66] i18n: help: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 29/66] i18n: init-db: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 30/66] i18n: log: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 31/66] i18n: ls-files: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 32/66] i18n: ls-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 33/66] i18n: merge-base: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 34/66] i18n: merge-file: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 35/66] i18n: merge: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 36/66] i18n: mktree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 37/66] i18n: mv: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 38/66] i18n: name-rev: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 39/66] i18n: notes: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 40/66] i18n: pack-objects: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 41/66] i18n: pack-refs: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 42/66] i18n: prune-packed: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 43/66] i18n: prune: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 44/66] i18n: push: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 45/66] i18n: read-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 46/66] i18n: remote: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 47/66] i18n: replace: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 48/66] i18n: status: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 49/66] i18n: rerere: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 50/66] i18n: reset: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 51/66] i18n: rev-parse: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 52/66] i18n: revert, cherry-pick: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 53/66] i18n: rm: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 54/66] i18n: shortlog: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 55/66] i18n: show-branch: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 56/66] i18n: show-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 57/66] i18n: symbolic-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 58/66] i18n: tag: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 59/66] i18n: update-index: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 60/66] i18n: update-ref: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 61/66] i18n: update-server-info: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 62/66] i18n: verify-pack: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 63/66] i18n: verify-tag: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 64/66] i18n: write-tree: " Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 65/66] Reduce translations by using same terminologies Nguyễn Thái Ngọc Duy
2012-08-20 12:32 ` [PATCH 66/66] Use imperative form in help usage to describe an action Nguyễn Thái Ngọc Duy
2012-08-22 18:32   ` Drew Northup
2012-08-20 22:55 ` [PATCH 00/66] parseopt i18n marking (again) Junio C Hamano

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=1345465975-16927-24-git-send-email-pclouds@gmail.com \
    --to=pclouds@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --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.
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).