rebase: translate a die(preserve-merges) message

This is a user facing message for a situation seen in the wild.

Translate it.

Signed-off-by: Philip Oakley <philipoakley@iee.email>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 142a40fa9976c18db7dcaf6693867857f7160220..4a969dca066b1265a09b77e4415ed1f6b5053d83 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1183,9 +1183,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                strbuf_reset(&buf);
                strbuf_addf(&buf, "%s/rewritten", merge_dir());
                if (!(action == ACTION_ABORT) && is_directory(buf.buf)) {
-                       die("`rebase --preserve-merges` (-p) is no longer supported.\n"
+                       die(_("`rebase --preserve-merges` (-p) is no longer supported.\n"
                        "Use `git rebase --abort` to terminate current rebase.\n"
-                       "Or downgrade to v2.33, or earlier, to complete the rebase.");
+                       "Or downgrade to v2.33, or earlier, to complete the rebase."));
                } else {
                        strbuf_reset(&buf);
                        strbuf_addf(&buf, "%s/interactive", merge_dir());