From: Jiang Xin <worldhello.net@gmail.com>
Date: Sat, 12 Sep 2015 14:59:41 GMT
Subject: Re: [PATCH] pull: don't mark values for option "rebase" for translation
Message-ID: <CANYiYbGJCMBArD_DcCbDRqveUx99fvrstc4SXZXbF3dOC84mvQ@mail.gmail.com>
In-Reply-To: <1441986797-21734-1-git-send-email-ralf.thielow@gmail.com>

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