Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
i18n: reset: mark parseopt strings for translation
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Mon, 20 Aug 2012 12:32:39 +0000
(19:32 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 20 Aug 2012 19:23:19 +0000
(12:23 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/reset.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
0ff07f2
)
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 74442bd7663387ab9864927f9c0d511e04e6e379..915cc9f86f855d517abaa55d31c502899fb77220 100644
(file)
--- a/
builtin/reset.c
+++ b/
builtin/reset.c
@@
-22,9
+22,9
@@
#include "cache-tree.h"
static const char * const git_reset_usage[] = {
#include "cache-tree.h"
static const char * const git_reset_usage[] = {
-
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
,
-
"git reset [-q] <commit> [--] <paths>..."
,
-
"git reset --patch [<commit>] [--] [<paths>...]"
,
+
N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]")
,
+
N_("git reset [-q] <commit> [--] <paths>...")
,
+
N_("git reset --patch [<commit>] [--] [<paths>...]")
,
NULL
};
NULL
};
@@
-235,17
+235,17
@@
int cmd_reset(int argc, const char **argv, const char *prefix)
struct commit *commit;
struct strbuf msg = STRBUF_INIT;
const struct option options[] = {
struct commit *commit;
struct strbuf msg = STRBUF_INIT;
const struct option options[] = {
- OPT__QUIET(&quiet,
"be quiet, only report errors"
),
+ OPT__QUIET(&quiet,
N_("be quiet, only report errors")
),
OPT_SET_INT(0, "mixed", &reset_type,
OPT_SET_INT(0, "mixed", &reset_type,
-
"reset HEAD and index"
, MIXED),
- OPT_SET_INT(0, "soft", &reset_type,
"reset only HEAD"
, SOFT),
+
N_("reset HEAD and index")
, MIXED),
+ OPT_SET_INT(0, "soft", &reset_type,
N_("reset only HEAD")
, SOFT),
OPT_SET_INT(0, "hard", &reset_type,
OPT_SET_INT(0, "hard", &reset_type,
-
"reset HEAD, index and working tree"
, HARD),
+
N_("reset HEAD, index and working tree")
, HARD),
OPT_SET_INT(0, "merge", &reset_type,
OPT_SET_INT(0, "merge", &reset_type,
-
"reset HEAD, index and working tree"
, MERGE),
+
N_("reset HEAD, index and working tree")
, MERGE),
OPT_SET_INT(0, "keep", &reset_type,
OPT_SET_INT(0, "keep", &reset_type,
-
"reset HEAD but keep local changes"
, KEEP),
- OPT_BOOLEAN('p', "patch", &patch_mode,
"select hunks interactively"
),
+
N_("reset HEAD but keep local changes")
, KEEP),
+ OPT_BOOLEAN('p', "patch", &patch_mode,
N_("select hunks interactively")
),
OPT_END()
};
OPT_END()
};