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 15/66] i18n: commit: mark parseopt strings for translation
Date: Mon, 20 Aug 2012 19:32:04 +0700	[thread overview]
Message-ID: <1345465975-16927-16-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/commit.c | 78 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 20cef95..33b78fe 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -30,7 +30,7 @@
 #include "column.h"
 
 static const char * const builtin_commit_usage[] = {
-	"git commit [options] [--] <filepattern>...",
+	N_("git commit [options] [--] <filepattern>..."),
 	NULL
 };
 
@@ -1188,7 +1188,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 		{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, "when",
 		  "ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)",
 		  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
-		OPT_COLUMN(0, "column", &s.colopts, "list untracked files in columns"),
+		OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
 		OPT_END(),
 	};
 
@@ -1369,53 +1369,53 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 {
 	static struct wt_status s;
 	static struct option builtin_commit_options[] = {
-		OPT__QUIET(&quiet, "suppress summary after successful commit"),
-		OPT__VERBOSE(&verbose, "show diff in commit message template"),
-
-		OPT_GROUP("Commit message options"),
-		OPT_FILENAME('F', "file", &logfile, "read message from file"),
-		OPT_STRING(0, "author", &force_author, "author", "override author for commit"),
-		OPT_STRING(0, "date", &force_date, "date", "override date for commit"),
-		OPT_CALLBACK('m', "message", &message, "message", "commit message", opt_parse_m),
-		OPT_STRING('c', "reedit-message", &edit_message, "commit", "reuse and edit message from specified commit"),
-		OPT_STRING('C', "reuse-message", &use_message, "commit", "reuse message from specified commit"),
-		OPT_STRING(0, "fixup", &fixup_message, "commit", "use autosquash formatted message to fixup specified commit"),
-		OPT_STRING(0, "squash", &squash_message, "commit", "use autosquash formatted message to squash specified commit"),
-		OPT_BOOLEAN(0, "reset-author", &renew_authorship, "the commit is authored by me now (used with -C/-c/--amend)"),
-		OPT_BOOLEAN('s', "signoff", &signoff, "add Signed-off-by:"),
-		OPT_FILENAME('t', "template", &template_file, "use specified template file"),
-		OPT_BOOL('e', "edit", &edit_flag, "force edit of commit"),
-		OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"),
-		OPT_BOOLEAN(0, "status", &include_status, "include status in commit message template"),
-		{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, "key id",
-		  "GPG sign commit", PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+		OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
+		OPT__VERBOSE(&verbose, N_("show diff in commit message template")),
+
+		OPT_GROUP(N_("Commit message options")),
+		OPT_FILENAME('F', "file", &logfile, N_("read message from file")),
+		OPT_STRING(0, "author", &force_author, N_("author"), N_("override author for commit")),
+		OPT_STRING(0, "date", &force_date, N_("date"), N_("override date for commit")),
+		OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m),
+		OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")),
+		OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")),
+		OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
+		OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
+		OPT_BOOLEAN(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
+		OPT_BOOLEAN('s', "signoff", &signoff, N_("add Signed-off-by:")),
+		OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
+		OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
+		OPT_STRING(0, "cleanup", &cleanup_arg, N_("default"), N_("how to strip spaces and #comments from message")),
+		OPT_BOOLEAN(0, "status", &include_status, N_("include status in commit message template")),
+		{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key id"),
+		  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 		/* end commit message options */
 
-		OPT_GROUP("Commit contents options"),
-		OPT_BOOLEAN('a', "all", &all, "commit all changed files"),
-		OPT_BOOLEAN('i', "include", &also, "add specified files to index for commit"),
-		OPT_BOOLEAN(0, "interactive", &interactive, "interactively add files"),
-		OPT_BOOLEAN('p', "patch", &patch_interactive, "interactively add changes"),
-		OPT_BOOLEAN('o', "only", &only, "commit only specified files"),
-		OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"),
-		OPT_BOOLEAN(0, "dry-run", &dry_run, "show what would be committed"),
-		OPT_SET_INT(0, "short", &status_format, "show status concisely",
+		OPT_GROUP(N_("Commit contents options")),
+		OPT_BOOLEAN('a', "all", &all, N_("commit all changed files")),
+		OPT_BOOLEAN('i', "include", &also, N_("add specified files to index for commit")),
+		OPT_BOOLEAN(0, "interactive", &interactive, N_("interactively add files")),
+		OPT_BOOLEAN('p', "patch", &patch_interactive, N_("interactively add changes")),
+		OPT_BOOLEAN('o', "only", &only, N_("commit only specified files")),
+		OPT_BOOLEAN('n', "no-verify", &no_verify, N_("bypass pre-commit hook")),
+		OPT_BOOLEAN(0, "dry-run", &dry_run, N_("show what would be committed")),
+		OPT_SET_INT(0, "short", &status_format, N_("show status concisely"),
 			    STATUS_FORMAT_SHORT),
-		OPT_BOOLEAN(0, "branch", &s.show_branch, "show branch information"),
+		OPT_BOOLEAN(0, "branch", &s.show_branch, N_("show branch information")),
 		OPT_SET_INT(0, "porcelain", &status_format,
-			    "machine-readable output", STATUS_FORMAT_PORCELAIN),
+			    N_("machine-readable output"), STATUS_FORMAT_PORCELAIN),
 		OPT_BOOLEAN('z', "null", &s.null_termination,
-			    "terminate entries with NUL"),
-		OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"),
-		OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, "bypass post-rewrite hook"),
-		{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
+			    N_("terminate entries with NUL")),
+		OPT_BOOLEAN(0, "amend", &amend, N_("amend previous commit")),
+		OPT_BOOLEAN(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
+		{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
 		/* end commit contents options */
 
 		{ OPTION_BOOLEAN, 0, "allow-empty", &allow_empty, NULL,
-		  "ok to record an empty change",
+		  N_("ok to record an empty change"),
 		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
 		{ OPTION_BOOLEAN, 0, "allow-empty-message", &allow_empty_message, NULL,
-		  "ok to record a change with an empty message",
+		  N_("ok to record a change with an empty message"),
 		  PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
 
 		OPT_END()
-- 
1.7.12.rc2.18.g61b472e

  parent reply	other threads:[~2012-08-20 12:40 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 ` Nguyễn Thái Ngọc Duy [this message]
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 ` [PATCH 23/66] i18n: format-patch: " Nguyễn Thái Ngọc Duy
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-16-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).