[PATCH v2 4/4] rebase: translate a die(preserve-merges) message
From: Philip Oakley <philipoakley@iee.email>
This is a user facing message for a situation seen in the wild.
Translate it.
Signed-off-by: Philip Oakley <philipoakley@iee.email>
---
builtin/rebase.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 5f8921551e1..640b6046a5a 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());
--
gitgitgadget
Philip Oakley via GitGitGadget <gitgitgadget@gmail.com>