]> git.ipfire.org Git - thirdparty/git.git/commitdiff
sequencer: actually translate report in do_exec()
authorOswald Buddenhagen <oswald.buddenhagen@gmx.de>
Fri, 28 Apr 2023 12:56:48 +0000 (14:56 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Apr 2023 19:03:40 +0000 (12:03 -0700)
N_() is meant to be used on strings that are subsequently _()'d, which
isn't the case here.

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.

Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c

index 1c96a75b1e9f8bbe9a7a2e40a3d4dd7bb80a9335..155d0a22900decdf34488025a231cc666050df76 100644 (file)
@@ -3625,7 +3625,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 */