From: Jiang Xin <worldhello.net@gmail.com>
To: Ralf Thielow <ralf.thielow@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>, Paul Tan <pyokagan@gmail.com>
Subject: Re: [PATCH] pull: don't mark values for option "rebase" for translation
Date: Sat, 12 Sep 2015 22:59:41 +0800 [thread overview]
Message-ID: <CANYiYbGJCMBArD_DcCbDRqveUx99fvrstc4SXZXbF3dOC84mvQ@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2015-09-12 14:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANYiYbGJCMBArD_DcCbDRqveUx99fvrstc4SXZXbF3dOC84mvQ@mail.gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
--cc=ralf.thielow@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).