OSDN Git Service

Merge branch 'nd/i18n-parseopt-help'
authorJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:09:09 +0000 (11:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Sep 2012 18:09:09 +0000 (11:09 -0700)
A lot of i18n mark-up for the help text from "git <cmd> -h".

* nd/i18n-parseopt-help: (66 commits)
  Use imperative form in help usage to describe an action
  Reduce translations by using same terminologies
  i18n: write-tree: mark parseopt strings for translation
  i18n: verify-tag: mark parseopt strings for translation
  i18n: verify-pack: mark parseopt strings for translation
  i18n: update-server-info: mark parseopt strings for translation
  i18n: update-ref: mark parseopt strings for translation
  i18n: update-index: mark parseopt strings for translation
  i18n: tag: mark parseopt strings for translation
  i18n: symbolic-ref: mark parseopt strings for translation
  i18n: show-ref: mark parseopt strings for translation
  i18n: show-branch: mark parseopt strings for translation
  i18n: shortlog: mark parseopt strings for translation
  i18n: rm: mark parseopt strings for translation
  i18n: revert, cherry-pick: mark parseopt strings for translation
  i18n: rev-parse: mark parseopt strings for translation
  i18n: reset: mark parseopt strings for translation
  i18n: rerere: mark parseopt strings for translation
  i18n: status: mark parseopt strings for translation
  i18n: replace: mark parseopt strings for translation
  ...

12 files changed:
1  2 
builtin/apply.c
builtin/blame.c
builtin/cat-file.c
builtin/checkout.c
builtin/config.c
builtin/for-each-ref.c
builtin/grep.c
builtin/log.c
builtin/merge.c
builtin/prune.c
builtin/push.c
builtin/revert.c

diff --cc builtin/apply.c
Simple merge
diff --cc builtin/blame.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc builtin/grep.c
@@@ -725,84 -680,84 +725,84 @@@ int cmd_grep(int argc, const char **arg
  
        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_("find 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,
 +              OPT_SET_INT('E', "extended-regexp", &pattern_type_arg,
-                           "use extended POSIX regular expressions",
+                           N_("use extended POSIX regular expressions"),
 -                          pattern_type_ere),
 -              OPT_SET_INT('G', "basic-regexp", &pattern_type,
 +                          GREP_PATTERN_TYPE_ERE),
 +              OPT_SET_INT('G', "basic-regexp", &pattern_type_arg,
-                           "use basic POSIX regular expressions (default)",
+                           N_("use basic POSIX regular expressions (default)"),
 -                          pattern_type_bre),
 -              OPT_SET_INT('F', "fixed-strings", &pattern_type,
 +                          GREP_PATTERN_TYPE_BRE),
 +              OPT_SET_INT('F', "fixed-strings", &pattern_type_arg,
-                           "interpret patterns as fixed strings",
+                           N_("interpret patterns as fixed strings"),
 -                          pattern_type_fixed),
 -              OPT_SET_INT('P', "perl-regexp", &pattern_type,
 +                          GREP_PATTERN_TYPE_FIXED),
 +              OPT_SET_INT('P', "perl-regexp", &pattern_type_arg,
-                           "use Perl-compatible regular expressions",
+                           N_("use Perl-compatible regular expressions"),
 -                          pattern_type_pcre),
 +                          GREP_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, "",
diff --cc builtin/log.c
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc builtin/prune.c
Simple merge
diff --cc builtin/push.c
Simple merge
@@@ -122,11 -121,10 +122,11 @@@ static void parse_args(int argc, const 
  
        if (opts->action == REPLAY_PICK) {
                struct option cp_extra[] = {
-                       OPT_BOOLEAN('x', NULL, &opts->record_origin, "append commit name"),
-                       OPT_BOOLEAN(0, "ff", &opts->allow_ff, "allow fast-forward"),
-                       OPT_BOOLEAN(0, "allow-empty", &opts->allow_empty, "preserve initially empty commits"),
-                       OPT_BOOLEAN(0, "allow-empty-message", &opts->allow_empty_message, "allow commits with empty messages"),
-                       OPT_BOOLEAN(0, "keep-redundant-commits", &opts->keep_redundant_commits, "keep redundant, empty commits"),
+                       OPT_BOOLEAN('x', NULL, &opts->record_origin, N_("append commit name")),
+                       OPT_BOOLEAN(0, "ff", &opts->allow_ff, N_("allow fast-forward")),
+                       OPT_BOOLEAN(0, "allow-empty", &opts->allow_empty, N_("preserve initially empty commits")),
++                      OPT_BOOLEAN(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")),
+                       OPT_BOOLEAN(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")),
                        OPT_END(),
                };
                if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra))