git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Jonathan Niedier" <jrnieder@gmail.com>,
	"Junio C Hamano" <gitster@pobox.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Jiang Xin" <worldhello.net@gmail.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 46/65] i18n: read-tree: mark parseopt strings for translation
Date: Mon, 28 May 2012 18:13:58 +0700	[thread overview]
Message-ID: <1338203657-26486-44-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1338203657-26486-1-git-send-email-pclouds@gmail.com>

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

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index df6c4c8..042ac1b 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -33,7 +33,7 @@ static int list_tree(unsigned char *sha1)
 }
 
 static const char * const read_tree_usage[] = {
-	"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])",
+	N_("git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>] [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"),
 	NULL
 };
 
@@ -104,37 +104,37 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 	struct unpack_trees_options opts;
 	int prefix_set = 0;
 	const struct option read_tree_options[] = {
-		{ OPTION_CALLBACK, 0, "index-output", NULL, "file",
-		  "write resulting index to <file>",
+		{ OPTION_CALLBACK, 0, "index-output", NULL, N_("file"),
+		  N_("write resulting index to <file>"),
 		  PARSE_OPT_NONEG, index_output_cb },
 		OPT_SET_INT(0, "empty", &read_empty,
-			    "only empty the index", 1),
-		OPT__VERBOSE(&opts.verbose_update, "be verbose"),
-		OPT_GROUP("Merging"),
+			    N_("only empty the index"), 1),
+		OPT__VERBOSE(&opts.verbose_update, N_("be verbose")),
+		OPT_GROUP(N_("Merging")),
 		OPT_SET_INT('m', NULL, &opts.merge,
-			    "perform a merge in addition to a read", 1),
+			    N_("perform a merge in addition to a read"), 1),
 		OPT_SET_INT(0, "trivial", &opts.trivial_merges_only,
-			    "3-way merge if no file level merging required", 1),
+			    N_("3-way merge if no file level merging required"), 1),
 		OPT_SET_INT(0, "aggressive", &opts.aggressive,
-			    "3-way merge in presence of adds and removes", 1),
+			    N_("3-way merge in presence of adds and removes"), 1),
 		OPT_SET_INT(0, "reset", &opts.reset,
-			    "same as -m, but discard unmerged entries", 1),
-		{ OPTION_STRING, 0, "prefix", &opts.prefix, "<subdirectory>/",
-		  "read the tree into the index under <subdirectory>/",
+			    N_("same as -m, but discard unmerged entries"), 1),
+		{ OPTION_STRING, 0, "prefix", &opts.prefix, N_("<subdirectory>/"),
+		  N_("read the tree into the index under <subdirectory>/"),
 		  PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP },
 		OPT_SET_INT('u', NULL, &opts.update,
-			    "update working tree with merge result", 1),
+			    N_("update working tree with merge result"), 1),
 		{ OPTION_CALLBACK, 0, "exclude-per-directory", &opts,
-		  "gitignore",
-		  "allow explicitly ignored files to be overwritten",
+		  N_("gitignore"),
+		  N_("allow explicitly ignored files to be overwritten"),
 		  PARSE_OPT_NONEG, exclude_per_directory_cb },
 		OPT_SET_INT('i', NULL, &opts.index_only,
-			    "don't check the working tree after merging", 1),
-		OPT__DRY_RUN(&opts.dry_run, "don't update the index or the work tree"),
+			    N_("don't check the working tree after merging"), 1),
+		OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")),
 		OPT_SET_INT(0, "no-sparse-checkout", &opts.skip_sparse_checkout,
-			    "skip applying sparse checkout filter", 1),
+			    N_("skip applying sparse checkout filter"), 1),
 		OPT_SET_INT(0, "debug-unpack", &opts.debug_unpack,
-			    "debug unpack-trees", 1),
+			    N_("debug unpack-trees"), 1),
 		OPT_END()
 	};
 
-- 
1.7.10.2.549.g9354186

  parent reply	other threads:[~2012-05-28 11:25 UTC|newest]

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

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=1338203657-26486-44-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.
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).