{"thread":{"id":"40329","subject":"[PATCH] pull: don't mark values for option \"rebase\" for translation","startedAt":"2015-09-11T15:53:17Z","lastAt":"2015-09-12T14:59:41Z","messageCount":2,"participants":["Ralf Thielow","Jiang Xin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"269775","messageId":"1441986797-21734-1-git-send-email-ralf.thielow@gmail.com","threadId":"40329","inReplyTo":null,"subject":"[PATCH] pull: don't mark values for option \"rebase\" for translation","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2015-09-11T15:53:17Z","receivedAt":"2015-09-11T15:53:17Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"\"false|true|preserve\" are actual values for option \"rebase\"\nof the \"git-pull\" command and should therefore not be marked\nfor translation.\n\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n builtin/pull.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/pull.c b/builtin/pull.c\nindex 7e3c11e..a39bb0a 100644\n--- a/builtin/pull.c\n+++ b/builtin/pull.c\n@@ -112,7 +112,7 @@ static struct option pull_options[] = {\n \t/* Options passed to git-merge or git-rebase */\n \tOPT_GROUP(N_(\"Options related to merging\")),\n \t{ OPTION_CALLBACK, 'r', \"rebase\", &opt_rebase,\n-\t  N_(\"false|true|preserve\"),\n+\t  \"false|true|preserve\",\n \t  N_(\"incorporate changes by rebasing rather than merging\"),\n \t  PARSE_OPT_OPTARG, parse_opt_rebase },\n \tOPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,\n-- \n2.6.0.rc1.199.g678474c\n"},{"id":"269828","messageId":"CANYiYbGJCMBArD_DcCbDRqveUx99fvrstc4SXZXbF3dOC84mvQ@mail.gmail.com","threadId":"40329","inReplyTo":"1441986797-21734-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] pull: don't mark values for option \"rebase\" for translation","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2015-09-12T14:59:41Z","receivedAt":"2015-09-12T14:59:41Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2015-09-11 23:53 GMT+08:00 Ralf Thielow <ralf.thielow@gmail.com>:\n> \"false|true|preserve\" are actual values for option \"rebase\"\n> of the \"git-pull\" command and should therefore not be marked\n> for translation.\n\nAgree, I see those who have already finished this round of l10n\n(including vi, fr, and zh_CN) not translate it and leave as it is.\n\n> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n> ---\n>  builtin/pull.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/pull.c b/builtin/pull.c\n> index 7e3c11e..a39bb0a 100644\n> --- a/builtin/pull.c\n> +++ b/builtin/pull.c\n> @@ -112,7 +112,7 @@ static struct option pull_options[] = {\n>         /* Options passed to git-merge or git-rebase */\n>         OPT_GROUP(N_(\"Options related to merging\")),\n>         { OPTION_CALLBACK, 'r', \"rebase\", &opt_rebase,\n> -         N_(\"false|true|preserve\"),\n> +         \"false|true|preserve\",\n>           N_(\"incorporate changes by rebasing rather than merging\"),\n>           PARSE_OPT_OPTARG, parse_opt_rebase },\n>         OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,\n> --\n> 2.6.0.rc1.199.g678474c\n>\n\n\n--\nJiang Xin\n"}]}