* [PATCH] pull: don't mark values for option "rebase" for translation
@ 2015-09-11 15:53 Ralf Thielow
2015-09-12 14:59 ` Jiang Xin
0 siblings, 1 reply; 2+ messages in thread
From: Ralf Thielow @ 2015-09-11 15:53 UTC (permalink / raw)
To: git; +Cc: gitster, pyokagan, worldhello.net, Ralf Thielow
"false|true|preserve" are actual values for option "rebase"
of the "git-pull" command and should therefore not be marked
for translation.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
builtin/pull.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 7e3c11e..a39bb0a 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -112,7 +112,7 @@ static struct option pull_options[] = {
/* Options passed to git-merge or git-rebase */
OPT_GROUP(N_("Options related to merging")),
{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
- N_("false|true|preserve"),
+ "false|true|preserve",
N_("incorporate changes by rebasing rather than merging"),
PARSE_OPT_OPTARG, parse_opt_rebase },
OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
--
2.6.0.rc1.199.g678474c
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] pull: don't mark values for option "rebase" for translation
2015-09-11 15:53 [PATCH] pull: don't mark values for option "rebase" for translation Ralf Thielow
@ 2015-09-12 14:59 ` Jiang Xin
0 siblings, 0 replies; 2+ messages in thread
From: Jiang Xin @ 2015-09-12 14:59 UTC (permalink / raw)
To: Ralf Thielow; +Cc: Git List, Junio C Hamano, Paul Tan
2015-09-11 23:53 GMT+08:00 Ralf Thielow <ralf.thielow@gmail.com>:
> "false|true|preserve" are actual values for option "rebase"
> of the "git-pull" command and should therefore not be marked
> for translation.
Agree, I see those who have already finished this round of l10n
(including vi, fr, and zh_CN) not translate it and leave as it is.
> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
> ---
> builtin/pull.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/pull.c b/builtin/pull.c
> index 7e3c11e..a39bb0a 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -112,7 +112,7 @@ static struct option pull_options[] = {
> /* Options passed to git-merge or git-rebase */
> OPT_GROUP(N_("Options related to merging")),
> { OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
> - N_("false|true|preserve"),
> + "false|true|preserve",
> N_("incorporate changes by rebasing rather than merging"),
> PARSE_OPT_OPTARG, parse_opt_rebase },
> OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
> --
> 2.6.0.rc1.199.g678474c
>
--
Jiang Xin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-12 14:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-11 15:53 [PATCH] pull: don't mark values for option "rebase" for translation Ralf Thielow
2015-09-12 14:59 ` Jiang Xin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).