threads / patch / 52975

patchi18n: unmark a message in rebase.c

Subject: [PATCH] i18n: unmark a message in rebase.c

## tl;dr

3 messages between Mar 11, 2020 and Mar 11, 2020. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Jiang Xin· Mar 11, 2020, 06:55 UTC · lore

Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for translation, but this message should not be changed.

Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/builtin/rebase.c b/builtin/rebase.c
index cb7aeae597..bff53d5d16 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 				 "ignoring them"),
 			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
-		OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
+		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
 			       N_("how to handle commits that become empty"),
 			       PARSE_OPT_NONEG, parse_opt_empty),
 		{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,

-- 
2.26.0.rc0.1.g67b07ef6f6

Elijah Newren· Mar 11, 2020, 16:27 UTC · re: Jiang Xin · lore

Re: [PATCH] i18n: unmark a message in rebase.c

On Tue, Mar 10, 2020 at 11:55 PM Jiang Xin <worldhello.net@gmail.com> wrote:

Show 25 quoted lines

>
> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling
> of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for
> translation, but this message should not be changed.
>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
>  builtin/rebase.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index cb7aeae597..bff53d5d16 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>                                  "ignoring them"),
>                               REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
>                 OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> -               OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
> +               OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
>                                N_("how to handle commits that become empty"),
>                                PARSE_OPT_NONEG, parse_opt_empty),
>                 { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
> --
> 2.26.0.rc0.1.g67b07ef6f6

Thanks for the fix.

Junio C Hamano· Mar 11, 2020, 18:39 UTC · re: Jiang Xin · lore

Re: [PATCH] i18n: unmark a message in rebase.c

Jiang Xin <worldhello.net@gmail.com> writes:

> Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling
> of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for
> translation, but this message should not be changed.

Thanks.

Show 19 quoted lines

>
> Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
> ---
>  builtin/rebase.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index cb7aeae597..bff53d5d16 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -1543,7 +1543,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
>  				 "ignoring them"),
>  			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
>  		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
> -		OPT_CALLBACK_F(0, "empty", &options, N_("{drop,keep,ask}"),
> +		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
>  			       N_("how to handle commits that become empty"),
>  			       PARSE_OPT_NONEG, parse_opt_empty),
>  		{ OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,