threads / patch / 40329

patchpull: don't mark values for option "rebase" for translation

Subject: [PATCH] pull: don't mark values for option "rebase" for translation

## tl;dr

2 messages between Sep 11, 2015 and Sep 12, 2015. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Ralf Thielow· Sep 11, 2015, 15:53 UTC · lore

"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(-)

Show changes to builtin/pull.c +1 −1

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· Sep 12, 2015, 14:59 UTC · re: Ralf Thielow · lore

Re: [PATCH] pull: don't mark values for option "rebase" for translation

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.

Show 21 quoted lines

> 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