i18n: fix mistakes in translated strings

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jean-Noël Avila 2018-08-23 23:00:56 +02:00 committed by Junio C Hamano
parent 29d9e3e2c4
commit 27c929edd6
3 changed files with 3 additions and 3 deletions

View File

@ -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);
}

View File

@ -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;

View File

@ -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;
}