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 26/66] i18n: grep: mark parseopt strings for translation
Date: Mon, 20 Aug 2012 19:32:15 +0700 [thread overview]
Message-ID: <1345465975-16927-27-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/grep.c | 90 +++++++++++++++++++++++++++++-----------------------------
1 file changed, 45 insertions(+), 45 deletions(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index 29adb0a..d73841c 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -19,7 +19,7 @@
#include "dir.h"
static char const * const grep_usage[] = {
- "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]",
+ N_("git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]"),
NULL
};
@@ -680,84 +680,84 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
struct option options[] = {
OPT_BOOLEAN(0, "cached", &cached,
- "search in index instead of in the work tree"),
+ N_("search in index instead of in the work tree")),
OPT_NEGBIT(0, "no-index", &use_index,
- "finds in contents not managed by git", 1),
+ N_("finds in contents not managed by git"), 1),
OPT_BOOLEAN(0, "untracked", &untracked,
- "search in both tracked and untracked files"),
+ N_("search in both tracked and untracked files")),
OPT_SET_INT(0, "exclude-standard", &opt_exclude,
- "search also in ignored files", 1),
+ N_("search also in ignored files"), 1),
OPT_GROUP(""),
OPT_BOOLEAN('v', "invert-match", &opt.invert,
- "show non-matching lines"),
+ N_("show non-matching lines")),
OPT_BOOLEAN('i', "ignore-case", &opt.ignore_case,
- "case insensitive matching"),
+ N_("case insensitive matching")),
OPT_BOOLEAN('w', "word-regexp", &opt.word_regexp,
- "match patterns only at word boundaries"),
+ N_("match patterns only at word boundaries")),
OPT_SET_INT('a', "text", &opt.binary,
- "process binary files as text", GREP_BINARY_TEXT),
+ N_("process binary files as text"), GREP_BINARY_TEXT),
OPT_SET_INT('I', NULL, &opt.binary,
- "don't match patterns in binary files",
+ N_("don't match patterns in binary files"),
GREP_BINARY_NOMATCH),
- { OPTION_INTEGER, 0, "max-depth", &opt.max_depth, "depth",
- "descend at most <depth> levels", PARSE_OPT_NONEG,
+ { OPTION_INTEGER, 0, "max-depth", &opt.max_depth, N_("depth"),
+ N_("descend at most <depth> levels"), PARSE_OPT_NONEG,
NULL, 1 },
OPT_GROUP(""),
OPT_SET_INT('E', "extended-regexp", &pattern_type,
- "use extended POSIX regular expressions",
+ N_("use extended POSIX regular expressions"),
pattern_type_ere),
OPT_SET_INT('G', "basic-regexp", &pattern_type,
- "use basic POSIX regular expressions (default)",
+ N_("use basic POSIX regular expressions (default)"),
pattern_type_bre),
OPT_SET_INT('F', "fixed-strings", &pattern_type,
- "interpret patterns as fixed strings",
+ N_("interpret patterns as fixed strings"),
pattern_type_fixed),
OPT_SET_INT('P', "perl-regexp", &pattern_type,
- "use Perl-compatible regular expressions",
+ N_("use Perl-compatible regular expressions"),
pattern_type_pcre),
OPT_GROUP(""),
- OPT_BOOLEAN('n', "line-number", &opt.linenum, "show line numbers"),
- OPT_NEGBIT('h', NULL, &opt.pathname, "don't show filenames", 1),
- OPT_BIT('H', NULL, &opt.pathname, "show filenames", 1),
+ OPT_BOOLEAN('n', "line-number", &opt.linenum, N_("show line numbers")),
+ OPT_NEGBIT('h', NULL, &opt.pathname, N_("don't show filenames"), 1),
+ OPT_BIT('H', NULL, &opt.pathname, N_("show filenames"), 1),
OPT_NEGBIT(0, "full-name", &opt.relative,
- "show filenames relative to top directory", 1),
+ N_("show filenames relative to top directory"), 1),
OPT_BOOLEAN('l', "files-with-matches", &opt.name_only,
- "show only filenames instead of matching lines"),
+ N_("show only filenames instead of matching lines")),
OPT_BOOLEAN(0, "name-only", &opt.name_only,
- "synonym for --files-with-matches"),
+ N_("synonym for --files-with-matches")),
OPT_BOOLEAN('L', "files-without-match",
&opt.unmatch_name_only,
- "show only the names of files without match"),
+ N_("show only the names of files without match")),
OPT_BOOLEAN('z', "null", &opt.null_following_name,
- "print NUL after filenames"),
+ N_("print NUL after filenames")),
OPT_BOOLEAN('c', "count", &opt.count,
- "show the number of matches instead of matching lines"),
- OPT__COLOR(&opt.color, "highlight matches"),
+ N_("show the number of matches instead of matching lines")),
+ OPT__COLOR(&opt.color, N_("highlight matches")),
OPT_BOOLEAN(0, "break", &opt.file_break,
- "print empty line between matches from different files"),
+ N_("print empty line between matches from different files")),
OPT_BOOLEAN(0, "heading", &opt.heading,
- "show filename only once above matches from same file"),
+ N_("show filename only once above matches from same file")),
OPT_GROUP(""),
- OPT_CALLBACK('C', "context", &opt, "n",
- "show <n> context lines before and after matches",
+ OPT_CALLBACK('C', "context", &opt, N_("n"),
+ N_("show <n> context lines before and after matches"),
context_callback),
OPT_INTEGER('B', "before-context", &opt.pre_context,
- "show <n> context lines before matches"),
+ N_("show <n> context lines before matches")),
OPT_INTEGER('A', "after-context", &opt.post_context,
- "show <n> context lines after matches"),
- OPT_NUMBER_CALLBACK(&opt, "shortcut for -C NUM",
+ N_("show <n> context lines after matches")),
+ OPT_NUMBER_CALLBACK(&opt, N_("shortcut for -C NUM"),
context_callback),
OPT_BOOLEAN('p', "show-function", &opt.funcname,
- "show a line with the function name before matches"),
+ N_("show a line with the function name before matches")),
OPT_BOOLEAN('W', "function-context", &opt.funcbody,
- "show the surrounding function"),
+ N_("show the surrounding function")),
OPT_GROUP(""),
- OPT_CALLBACK('f', NULL, &opt, "file",
- "read patterns from file", file_callback),
- { OPTION_CALLBACK, 'e', NULL, &opt, "pattern",
- "match <pattern>", PARSE_OPT_NONEG, pattern_callback },
+ OPT_CALLBACK('f', NULL, &opt, N_("file"),
+ N_("read patterns from file"), file_callback),
+ { OPTION_CALLBACK, 'e', NULL, &opt, N_("pattern"),
+ N_("match <pattern>"), PARSE_OPT_NONEG, pattern_callback },
{ OPTION_CALLBACK, 0, "and", &opt, NULL,
- "combine patterns specified with -e",
+ N_("combine patterns specified with -e"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback },
OPT_BOOLEAN(0, "or", &dummy, ""),
{ OPTION_CALLBACK, 0, "not", &opt, NULL, "",
@@ -769,16 +769,16 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
close_callback },
OPT__QUIET(&opt.status_only,
- "indicate hit with exit status without output"),
+ N_("indicate hit with exit status without output")),
OPT_BOOLEAN(0, "all-match", &opt.all_match,
- "show only matches from files that match all patterns"),
+ N_("show only matches from files that match all patterns")),
OPT_GROUP(""),
{ OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager,
- "pager", "show matching files in the pager",
+ N_("pager"), N_("show matching files in the pager"),
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
OPT_BOOLEAN(0, "ext-grep", &external_grep_allowed__ignored,
- "allow calling of grep(1) (ignored by this build)"),
- { OPTION_CALLBACK, 0, "help-all", &options, NULL, "show usage",
+ N_("allow calling of grep(1) (ignored by this build)")),
+ { OPTION_CALLBACK, 0, "help-all", &options, NULL, N_("show usage"),
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
OPT_END()
};
--
1.7.12.rc2.18.g61b472e
next prev parent reply other threads:[~2012-08-20 12:42 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 ` [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 ` Nguyễn Thái Ngọc Duy [this message]
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-27-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).