From 27c929edd6cccfbbedf2fbb8a3175bc7e01bf6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= Date: Thu, 23 Aug 2018 23:00:56 +0200 Subject: [PATCH] i18n: fix mistakes in translated strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix typos and convert a question which does not expect to be replied to a simple advice. Signed-off-by: Jean-Noël Avila Signed-off-by: Junio C Hamano --- 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; }