Merge branch 'nd/i18n-parseopt-help'
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 ...
This commit is contained in:
@ -244,8 +244,8 @@ static int batch_objects(int print_contents)
|
||||
}
|
||||
|
||||
static const char * const cat_file_usage[] = {
|
||||
"git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>",
|
||||
"git cat-file (--batch|--batch-check) < <list_of_objects>",
|
||||
N_("git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>"),
|
||||
N_("git cat-file (--batch|--batch-check) < <list_of_objects>"),
|
||||
NULL
|
||||
};
|
||||
|
||||
@ -263,19 +263,19 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
|
||||
const char *exp_type = NULL, *obj_name = NULL;
|
||||
|
||||
const struct option options[] = {
|
||||
OPT_GROUP("<type> can be one of: blob, tree, commit, tag"),
|
||||
OPT_SET_INT('t', NULL, &opt, "show object type", 't'),
|
||||
OPT_SET_INT('s', NULL, &opt, "show object size", 's'),
|
||||
OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
|
||||
OPT_SET_INT('t', NULL, &opt, N_("show object type"), 't'),
|
||||
OPT_SET_INT('s', NULL, &opt, N_("show object size"), 's'),
|
||||
OPT_SET_INT('e', NULL, &opt,
|
||||
"exit with zero when there's no error", 'e'),
|
||||
OPT_SET_INT('p', NULL, &opt, "pretty-print object's content", 'p'),
|
||||
N_("exit with zero when there's no error"), 'e'),
|
||||
OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
|
||||
OPT_SET_INT(0, "textconv", &opt,
|
||||
"for blob objects, run textconv on object's content", 'c'),
|
||||
N_("for blob objects, run textconv on object's content"), 'c'),
|
||||
OPT_SET_INT(0, "batch", &batch,
|
||||
"show info and content of objects fed from the standard input",
|
||||
N_("show info and content of objects fed from the standard input"),
|
||||
BATCH),
|
||||
OPT_SET_INT(0, "batch-check", &batch,
|
||||
"show info about objects fed from the standard input",
|
||||
N_("show info about objects fed from the standard input"),
|
||||
BATCH_CHECK),
|
||||
OPT_END()
|
||||
};
|
||||
|
Reference in New Issue
Block a user