i18n: branch: mark parseopt strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Aug 20, 2012 at 19:31 UTC
24a85214596c58e95cffb9db621dadc9a78305ff
1 file changed
+28
-28
builtin/branch.c
+28
-28
@@ -19,10 +19,10 @@
19
#include "column.h"
20
21
static const char * const builtin_branch_usage[] = {
22
- "git branch [options] [-r | -a] [--merged | --no-merged]",
23
- "git branch [options] [-l] [-f] <branchname> [<start-point>]",
24
- "git branch [options] [-r] (-d | -D) <branchname>...",
25
- "git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
22
+ N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
23
+ N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
24
+ N_("git branch [options] [-r] (-d | -D) <branchname>..."),
25
+ N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
26
NULL
27
};
28
@@ -718,56 +718,56 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
718
struct commit_list *with_commit = NULL;
719
720
struct option options[] = {
721
- OPT_GROUP("Generic options"),
721
+ OPT_GROUP(N_("Generic options")),
722
OPT__VERBOSE(&verbose,
723
- "show hash and subject, give twice for upstream branch"),
724
- OPT__QUIET(&quiet, "suppress informational messages"),
725
- OPT_SET_INT('t', "track", &track, "set up tracking mode (see git-pull(1))",
723
+ N_("show hash and subject, give twice for upstream branch")),
724
+ OPT__QUIET(&quiet, N_("suppress informational messages")),
725
+ OPT_SET_INT('t', "track", &track, N_("set up tracking mode (see git-pull(1))"),
726
BRANCH_TRACK_EXPLICIT),
727
- OPT_SET_INT( 0, "set-upstream", &track, "change upstream info",
727
+ OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
728
BRANCH_TRACK_OVERRIDE),
729
- OPT__COLOR(&branch_use_color, "use colored output"),
730
- OPT_SET_INT('r', "remotes", &kinds, "act on remote-tracking branches",
729
+ OPT__COLOR(&branch_use_color, N_("use colored output")),
730
+ OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"),
731
REF_REMOTE_BRANCH),
732
{
733
- OPTION_CALLBACK, 0, "contains", &with_commit, "commit",
734
- "print only branches that contain the commit",
733
+ OPTION_CALLBACK, 0, "contains", &with_commit, N_("commit"),
734
+ N_("print only branches that contain the commit"),
735
PARSE_OPT_LASTARG_DEFAULT,
736
parse_opt_with_commit, (intptr_t)"HEAD",
737
},
738
{
739
- OPTION_CALLBACK, 0, "with", &with_commit, "commit",
740
- "print only branches that contain the commit",
739
+ OPTION_CALLBACK, 0, "with", &with_commit, N_("commit"),
740
+ N_("print only branches that contain the commit"),
741
PARSE_OPT_HIDDEN | PARSE_OPT_LASTARG_DEFAULT,
742
parse_opt_with_commit, (intptr_t) "HEAD",
743
},
744
OPT__ABBREV(&abbrev),
745
746
- OPT_GROUP("Specific git-branch actions:"),
747
- OPT_SET_INT('a', "all", &kinds, "list both remote-tracking and local branches",
746
+ OPT_GROUP(N_("Specific git-branch actions:")),
747
+ OPT_SET_INT('a', "all", &kinds, N_("list both remote-tracking and local branches"),
748
REF_REMOTE_BRANCH | REF_LOCAL_BRANCH),
749
- OPT_BIT('d', "delete", &delete, "delete fully merged branch", 1),
750
- OPT_BIT('D', NULL, &delete, "delete branch (even if not merged)", 2),
751
- OPT_BIT('m', "move", &rename, "move/rename a branch and its reflog", 1),
752
- OPT_BIT('M', NULL, &rename, "move/rename a branch, even if target exists", 2),
753
- OPT_BOOLEAN(0, "list", &list, "list branch names"),
754
- OPT_BOOLEAN('l', "create-reflog", &reflog, "create the branch's reflog"),
749
+ OPT_BIT('d', "delete", &delete, N_("delete fully merged branch"), 1),
750
+ OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
751
+ OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
752
+ OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
753
+ OPT_BOOLEAN(0, "list", &list, N_("list branch names")),
754
+ OPT_BOOLEAN('l', "create-reflog", &reflog, N_("create the branch's reflog")),
755
OPT_BOOLEAN(0, "edit-description", &edit_description,
756
- "edit the description for the branch"),
757
- OPT__FORCE(&force_create, "force creation (when already exists)"),
756
+ N_("edit the description for the branch")),
757
+ OPT__FORCE(&force_create, N_("force creation (when already exists)")),
758
{
759
OPTION_CALLBACK, 0, "no-merged", &merge_filter_ref,
760
- "commit", "print only not merged branches",
760
+ N_("commit"), N_("print only not merged branches"),
761
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
762
opt_parse_merge_filter, (intptr_t) "HEAD",
763
},
764
{
765
OPTION_CALLBACK, 0, "merged", &merge_filter_ref,
766
- "commit", "print only merged branches",
766
+ N_("commit"), N_("print only merged branches"),
767
PARSE_OPT_LASTARG_DEFAULT | PARSE_OPT_NONEG,
768
opt_parse_merge_filter, (intptr_t) "HEAD",
769
},
770
- OPT_COLUMN(0, "column", &colopts, "list branches in columns"),
770
+ OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")),
771
OPT_END(),
772
};
773