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:
@ -9,7 +9,7 @@
|
||||
#include "dir.h"
|
||||
|
||||
static const char * const prune_usage[] = {
|
||||
"git prune [-n] [-v] [--expire <time>] [--] [<head>...]",
|
||||
N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
|
||||
NULL
|
||||
};
|
||||
static int show_only;
|
||||
@ -129,11 +129,11 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
|
||||
struct rev_info revs;
|
||||
struct progress *progress = NULL;
|
||||
const struct option options[] = {
|
||||
OPT__DRY_RUN(&show_only, "do not remove, show only"),
|
||||
OPT__VERBOSE(&verbose, "report pruned objects"),
|
||||
OPT_BOOL(0, "progress", &show_progress, "show progress"),
|
||||
OPT__DRY_RUN(&show_only, N_("do not remove, show only")),
|
||||
OPT__VERBOSE(&verbose, N_("report pruned objects")),
|
||||
OPT_BOOL(0, "progress", &show_progress, N_("show progress")),
|
||||
OPT_DATE(0, "expire", &expire,
|
||||
"expire objects older than <time>"),
|
||||
N_("expire objects older than <time>")),
|
||||
OPT_END()
|
||||
};
|
||||
char *s;
|
||||
|
Reference in New Issue
Block a user