From: Philip Oakley <philipoakley@iee.email>
Date: Sat, 4 Jun 2022 11:17:49 +0000 (+0000)
Subject: rebase: translate a die(preserve-merges) message
X-Git-Tag: v2.37.0-rc1~14^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f007713cb101dba76491f18459ae45085b6267a2;p=thirdparty%2Fgit.git

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 142a40fa99..4a969dca06 100644
--- 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());