All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jean-Noël Avila" <jn.avila@free.fr>
To: git@vger.kernel.org
Cc: "Jean-Noël Avila" <jn.avila@free.fr>
Subject: [PATCH] i18n: fix mistakes in translated strings
Date: Thu, 23 Aug 2018 23:00:56 +0200	[thread overview]
Message-ID: <20180823210056.27489-1-jn.avila@free.fr> (raw)

Fix typos and convert a question which does not expect to be replied
to a simple advice.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
---
 builtin/submodule--helper.c | 2 +-
 config.c                    | 2 +-
 sequencer.c                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 2bcc70fdfe..b56028ba9d 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 		argv_array_pushv(&cpr.args, info->argv);
 
 		if (run_command(&cpr))
-			die(_("run_command returned non-zero status while"
+			die(_("run_command returned non-zero status while "
 				"recursing in the nested submodules of %s\n."),
 				displaypath);
 	}
diff --git a/config.c b/config.c
index 9a0b10d4bc..3461993f0a 100644
--- a/config.c
+++ b/config.c
@@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(
 "	%s\n"
 "from\n"
 "	%s\n"
-"Do you have circular includes?");
+"This might be due to circular includes.");
 static int handle_path_include(const char *path, struct config_include_data *inc)
 {
 	int ret = 0;
diff --git a/sequencer.c b/sequencer.c
index 65d371c746..84bf598c3e 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -720,7 +720,7 @@ static const char *read_author_ident(struct strbuf *buf)
 	/* dequote values and construct ident line in-place */
 	for (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {
 		if (!skip_prefix(in, keys[i], (const char **)&in)) {
-			warning(_("could not parse '%s' (looking for '%s'"),
+			warning(_("could not parse '%s' (looking for '%s')"),
 				rebase_path_author_script(), keys[i]);
 			return NULL;
 		}
-- 
2.18.0


             reply	other threads:[~2018-08-23 21:01 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-23 21:00 Jean-Noël Avila [this message]
2018-08-23 21:28 ` [PATCH] i18n: fix mistakes in translated strings Junio C Hamano
2018-09-03 17:52   ` Jean-Noël AVILA
2018-09-04  1:01     ` [L10N] Kickoff for Git 2.19.0 round 2 Jiang Xin
2018-09-04  1:52 ` [PATCH] i18n: fix mistakes in translated strings Jiang Xin
2018-09-04 14:18   ` [PATCH] i18n: fix dangling dot in die() messages Jean-Noel Avila
2018-09-04 15:05     ` Ævar Arnfjörð Bjarmason
2018-09-04 15:13       ` Jean-Noël Avila
2018-09-04 19:47         ` Junio C Hamano
2018-09-04 15:16       ` Duy Nguyen
2018-09-04 19:32   ` [PATCH] i18n: fix mistakes in translated strings Junio C Hamano

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=20180823210056.27489-1-jn.avila@free.fr \
    --to=jn.avila@free.fr \
    --cc=git@vger.kernel.org \
    /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.