All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Philip Oakley via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
	"Philip Oakley" <philipoakley@iee.email>,
	"René Scharfe" <l.s.r@web.de>,
	"Philip Oakley" <philipoakley@iee.email>,
	"Philip Oakley" <philipoakley@iee.email>
Subject: [PATCH v2 4/4] rebase: translate a die(preserve-merges) message
Date: Sat, 04 Jun 2022 11:17:49 +0000	[thread overview]
Message-ID: <ae02c6d5a6e9ca3da8bdf2188da933a6b8ec33ed.1654341469.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1242.v2.git.1654341469.gitgitgadget@gmail.com>

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

      parent reply	other threads:[~2022-06-04 11:18 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-26  9:21 [PATCH 0/3] Die preserve ggg Philip Oakley via GitGitGadget
2022-05-26  9:21 ` [PATCH 1/3] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-05-26  9:40   ` Ævar Arnfjörð Bjarmason
2022-05-26 11:40     ` Philip Oakley
2022-05-26 13:02     ` René Scharfe
2022-05-26 20:33       ` Junio C Hamano
2022-05-26 21:27         ` René Scharfe
2022-05-26 23:23           ` Junio C Hamano
2022-05-27 12:35           ` Philip Oakley
2022-05-27 12:17         ` Philip Oakley
2022-05-27 15:45           ` Junio C Hamano
2022-05-27 12:12       ` Philip Oakley
2022-05-27 12:34       ` Ævar Arnfjörð Bjarmason
2022-05-26  9:21 ` [PATCH 2/3] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-05-26  9:43   ` Ævar Arnfjörð Bjarmason
2022-05-26 11:44     ` Philip Oakley
2022-05-26 20:42       ` Junio C Hamano
2022-05-27 12:58         ` Philip Oakley
2022-05-27 15:54           ` Junio C Hamano
2022-05-26  9:21 ` [PATCH 3/3] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-05-26  9:50   ` Ævar Arnfjörð Bjarmason
2022-05-26 12:01     ` Philip Oakley
2022-05-26 20:55   ` Junio C Hamano
2022-05-27 12:08     ` Philip Oakley
2022-05-26  9:54 ` [PATCH 0/3] Die preserve ggg Ævar Arnfjörð Bjarmason
2022-05-26 12:57   ` Philip Oakley
2022-06-04 11:17 ` [PATCH v2 0/4] " Philip Oakley via GitGitGadget
2022-06-04 11:17   ` [PATCH v2 1/4] rebase.c: state preserve-merges has been removed Philip Oakley via GitGitGadget
2022-06-04 11:17   ` [PATCH v2 2/4] rebase: help users when dying with `preserve-merges` Philip Oakley via GitGitGadget
2022-06-04 11:17   ` [PATCH v2 3/4] rebase: note `preserve` merges may be a pull config option Philip Oakley via GitGitGadget
2022-06-06 17:57     ` Junio C Hamano
2022-06-11 14:03       ` Philip Oakley
2022-06-11 15:38         ` Philip Oakley
2022-06-11 19:22           ` Junio C Hamano
2022-06-04 11:17   ` Philip Oakley via GitGitGadget [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ae02c6d5a6e9ca3da8bdf2188da933a6b8ec33ed.1654341469.git.gitgitgadget@gmail.com \
    --to=gitgitgadget@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=l.s.r@web.de \
    --cc=philipoakley@iee.email \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.