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>

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 2bcc70fdfe2608ccbbab02b6f593dd81781ada41..b56028ba9d9717407c959e0cf0c6597f49779ab1 100644 (file)
--- 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))
                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);
        }
                                "recursing in the nested submodules of %s\n."),
                                displaypath);
        }

diff --git a/config.c b/config.c
index 9a0b10d4bc23fc0381ea61b492c1199e91ae5861..3461993f0af665d64b48d16915fc2cd017634377 100644 (file)
--- a/config.c
+++ b/config.c
@@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(
 "      %s\n"
 "from\n"
 "      %s\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;
 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 65d371c7461c1f8098e0334532ae7804c30f66d6..84bf598c3e2be8d378a72174239a076cf1eeaf8a 100644 (file)
--- 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)) {
        /* 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;
                }
                                rebase_path_author_script(), keys[i]);
                        return NULL;
                }