Oswald Buddenhagen <oswald.buddenhagen@xxxxxx> writes:
> N_() is meant to be used on strings that are subsequently _()'d, which
> isn't the case here.
Good eyes.
>
> The affected construct is a bit questionable from an i18n perspective,
> as it pieces together a sentence from separate strings. However, it
> doesn't appear to be that bad, as the "assembly instructions" are in a
> translatable message as well. Lacking specific complaints from
> translators, it doesn't seem worth changing this.
True that we frown upon sentence Legos like this. At least the
original message in C locale does not break the flow too badly, so
hpoefully all the supported languages are happy with the existing
composition.
Will queue.
Thanks.
>
> Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@xxxxxx>
> Cc: Junio C Hamano <gitster@xxxxxxxxx>
>
> ---
> v2:
> - mention the word puzzle in the commit message
> ---
> sequencer.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sequencer.c b/sequencer.c
> index 3be23d7ca2..0677c9ab09 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -3628,7 +3628,7 @@ static int do_exec(struct repository *r, const char *command_line)
> " git rebase --continue\n"
> "\n"),
> command_line,
> - dirty ? N_("and made changes to the index and/or the "
> + dirty ? _("and made changes to the index and/or the "
> "working tree\n") : "");
> if (status == 127)
> /* command not found */
