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 06/65] i18n: blame: mark parseopt strings for translation
Date: Mon, 28 May 2012 18:13:18 +0700 [thread overview]
Message-ID: <1338203657-26486-4-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/blame.c | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/builtin/blame.c b/builtin/blame.c
index 24d3dd5..fe8aa4d 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -22,12 +22,12 @@
#include "utf8.h"
#include "userdiff.h"
-static char blame_usage[] = "git blame [options] [rev-opts] [rev] [--] file";
+static char blame_usage[] = N_("git blame [options] [rev-opts] [rev] [--] file");
static const char *blame_opt_usage[] = {
blame_usage,
"",
- "[rev-opts] are documented in git-rev-list(1)",
+ N_("[rev-opts] are documented in git-rev-list(1)"),
NULL
};
@@ -2296,27 +2296,27 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
static const char *revs_file = NULL;
static const char *contents_from = NULL;
static const struct option options[] = {
- OPT_BOOLEAN(0, "incremental", &incremental, "Show blame entries as we find them, incrementally"),
- OPT_BOOLEAN('b', NULL, &blank_boundary, "Show blank SHA-1 for boundary commits (Default: off)"),
- OPT_BOOLEAN(0, "root", &show_root, "Do not treat root commits as boundaries (Default: off)"),
- OPT_BOOLEAN(0, "show-stats", &show_stats, "Show work cost statistics"),
- OPT_BIT(0, "score-debug", &output_option, "Show output score for blame entries", OUTPUT_SHOW_SCORE),
- OPT_BIT('f', "show-name", &output_option, "Show original filename (Default: auto)", OUTPUT_SHOW_NAME),
- OPT_BIT('n', "show-number", &output_option, "Show original linenumber (Default: off)", OUTPUT_SHOW_NUMBER),
- OPT_BIT('p', "porcelain", &output_option, "Show in a format designed for machine consumption", OUTPUT_PORCELAIN),
- OPT_BIT(0, "line-porcelain", &output_option, "Show porcelain format with per-line commit information", OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
- OPT_BIT('c', NULL, &output_option, "Use the same output mode as git-annotate (Default: off)", OUTPUT_ANNOTATE_COMPAT),
- OPT_BIT('t', NULL, &output_option, "Show raw timestamp (Default: off)", OUTPUT_RAW_TIMESTAMP),
- OPT_BIT('l', NULL, &output_option, "Show long commit SHA1 (Default: off)", OUTPUT_LONG_OBJECT_NAME),
- OPT_BIT('s', NULL, &output_option, "Suppress author name and timestamp (Default: off)", OUTPUT_NO_AUTHOR),
- OPT_BIT('e', "show-email", &output_option, "Show author email instead of name (Default: off)", OUTPUT_SHOW_EMAIL),
- OPT_BIT('w', NULL, &xdl_opts, "Ignore whitespace differences", XDF_IGNORE_WHITESPACE),
- OPT_BIT(0, "minimal", &xdl_opts, "Spend extra cycles to find better match", XDF_NEED_MINIMAL),
- OPT_STRING('S', NULL, &revs_file, "file", "Use revisions from <file> instead of calling git-rev-list"),
- OPT_STRING(0, "contents", &contents_from, "file", "Use <file>'s contents as the final image"),
- { OPTION_CALLBACK, 'C', NULL, &opt, "score", "Find line copies within and across files", PARSE_OPT_OPTARG, blame_copy_callback },
- { OPTION_CALLBACK, 'M', NULL, &opt, "score", "Find line movements within and across files", PARSE_OPT_OPTARG, blame_move_callback },
- OPT_CALLBACK('L', NULL, &bottomtop, "n,m", "Process only line range n,m, counting from 1", blame_bottomtop_callback),
+ OPT_BOOLEAN(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")),
+ OPT_BOOLEAN('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
+ OPT_BOOLEAN(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
+ OPT_BOOLEAN(0, "show-stats", &show_stats, N_("Show work cost statistics")),
+ OPT_BIT(0, "score-debug", &output_option, N_("Show output score for blame entries"), OUTPUT_SHOW_SCORE),
+ OPT_BIT('f', "show-name", &output_option, N_("Show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
+ OPT_BIT('n', "show-number", &output_option, N_("Show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
+ OPT_BIT('p', "porcelain", &output_option, N_("Show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
+ OPT_BIT(0, "line-porcelain", &output_option, N_("Show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
+ OPT_BIT('c', NULL, &output_option, N_("Use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
+ OPT_BIT('t', NULL, &output_option, N_("Show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
+ OPT_BIT('l', NULL, &output_option, N_("Show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
+ OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
+ OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
+ OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
+ OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
+ OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
+ OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")),
+ { OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback },
+ { OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback },
+ OPT_CALLBACK('L', NULL, &bottomtop, N_("n,m"), N_("Process only line range n,m, counting from 1"), blame_bottomtop_callback),
OPT__ABBREV(&abbrev),
OPT_END()
};
--
1.7.10.2.549.g9354186
next prev parent reply other threads:[~2012-05-28 11:19 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 ` Nguyễn Thái Ngọc Duy [this message]
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 ` [PATCH 46/65] i18n: read-tree: " Nguyễn Thái Ngọc Duy
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-4-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).