undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: branch: mark parseopt strings for translation

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2012-08-20 19:31:55 +07:00 committed by Junio C Hamano
parent efd2a8bd38
commit 24a8521459
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
builtin/branch.c
View File

@ -19,10 +19,10 @@
#include "column.h" #include "column.h"
static const char * const builtin_branch_usage[] = { static const char * const builtin_branch_usage[] = {
"git branch [options] [-r | -a] [--merged | --no-merged]", N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
"git branch [options] [-l] [-f] <branchname> [<start-point>]", N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
"git branch [options] [-r] (-d | -D) <branchname>...", N_("git branch [options] [-r] (-d | -D) <branchname>..."),
"git branch [options] (-m | -M) [<oldbranch>] <newbranch>", N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
NULL NULL
}; };
@ -718,56 +718,56 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
struct commit_list *with_commit = NULL; struct commit_list *with_commit = NULL;
struct option options[] = { struct option options[] = {
OPT_GROUP("Generic options"), OPT_GROUP(N_("Generic options")),
OPT__VERBOSE(&verbose, OPT__VERBOSE(&verbose,
"show hash and subject, give twice for upstream branch"), N_("show hash and subject, give twice for upstream branch")),
OPT__QUIET(&quiet, "suppress informational messages"), OPT__QUIET(&quiet, N_("suppress informational messages")),
OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))", OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
BRANCH_TRACK_EXPLICIT), BRANCH_TRACK_EXPLICIT),
OPT_SET_INT( 0, "set-upstream", &track, "change upstream info", OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
BRANCH_TRACK_OVERRIDE), BRANCH_TRACK_OVERRIDE),
OPT__COLOR(&branch_use_color, "use colored output"), OPT__COLOR(&branch_use_color, N_("use colored output")),
OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches", OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"),
REF_REMOTE_BRANCH), REF_REMOTE_BRANCH),
{ {
OPTION_CALLBACK, 0, "contains", &with_commit, "commit", OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
"print only branches that contain the commit", N_("print only branches that contain the commit"),
PARSE_OPT_LASTARG_DEFAULT, PARSE_OPT_LASTARG_DEFAULT,
parse_opt_with_commit, (intptr_t)"HEAD", parse_opt_with_commit, (intptr_t)"HEAD",
}, },
{ {
OPTION_CALLBACK, 0, "with", &with_commit, "commit", OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
"print only branches that contain the commit", N_("print only branches that contain the commit"),
PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT, PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
parse_opt_with_commit, (intptr_t) "HEAD", parse_opt_with_commit, (intptr_t) "HEAD",
}, },
OPT__ABBREV(&abbrev), OPT__ABBREV(&abbrev),
OPT_GROUP("Specific git-branch actions:"), OPT_GROUP(N_("Specific git-branch actions:")),
OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches", OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"),
REF_REMOTE_BRANCH | REF_LOCAL_BRANCH), REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1), OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2), OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1), OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2), OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
OPT_BOOLEAN(0, "list", &list, "list branch names"), OPT_BOOLEAN(0, "list", &list, N_("list branch names")),
OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"), OPT_BOOLEAN('l', "create-reflog", &reflog, N_("create the branch's reflog")),
OPT_BOOLEAN(0, "edit-description", &edit_description, OPT_BOOLEAN(0, "edit-description", &edit_description,
"edit the description for the branch"), N_("edit the description for the branch")),
OPT__FORCE(&force_create, "force creation (when already exists)"), OPT__FORCE(&force_create, N_("force creation (when already exists)")),
{ {
OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref, OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
"commit", "print only not merged branches", N_("commit"), N_("print only not merged branches"),
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
opt_parse_merge_filter, (intptr_t) "HEAD", opt_parse_merge_filter, (intptr_t) "HEAD",
}, },
{ {
OPTION_CALLBACK, 0, "merged", &merge_filter_ref, OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
"commit", "print only merged branches", N_("commit"), N_("print only merged branches"),
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG, PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
opt_parse_merge_filter, (intptr_t) "HEAD", opt_parse_merge_filter, (intptr_t) "HEAD",
}, },
OPT_COLUMN(0, "column", &colopts, "list branches in columns"), OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
OPT_END(), OPT_END(),
}; };