i18n: setup: mark error messages for translation

Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/setup.c b/setup.c
index 6d0e0c93d5f562c3c20351b76e8c93cc549c8252..fe572b82c355390e6101aea15d2d53ec5b3b1e15 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -759,9 +759,9 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
 static const char *setup_nongit(const char *cwd, int *nongit_ok)
 {
        if (!nongit_ok)
 static const char *setup_nongit(const char *cwd, int *nongit_ok)
 {
        if (!nongit_ok)

-               die("Not a git repository (or any of the parent directories): %s", DEFAULT_GIT_DIR_ENVIRONMENT);
+               die(_("Not a git repository (or any of the parent directories): %s"), DEFAULT_GIT_DIR_ENVIRONMENT);

        if (chdir(cwd))
        if (chdir(cwd))

-               die_errno("Cannot come back to cwd");
+               die_errno(_("Cannot come back to cwd"));

        *nongit_ok = 1;
        return NULL;
 }
        *nongit_ok = 1;
        return NULL;
 }


@@ -842,7 +842,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
                *nongit_ok = 0;
 
        if (strbuf_getcwd(&cwd))
                *nongit_ok = 0;
 
        if (strbuf_getcwd(&cwd))

-               die_errno("Unable to read current working directory");
+               die_errno(_("Unable to read current working directory"));

        offset = cwd.len;
 
        /*
        offset = cwd.len;
 
        /*


@@ -912,19 +912,19 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
                        if (parent_device != current_device) {
                                if (nongit_ok) {
                                        if (chdir(cwd.buf))
                        if (parent_device != current_device) {
                                if (nongit_ok) {
                                        if (chdir(cwd.buf))

-                                               die_errno("Cannot come back to cwd");
+                                               die_errno(_("Cannot come back to cwd"));

                                        *nongit_ok = 1;
                                        return NULL;
                                }
                                strbuf_setlen(&cwd, offset);
                                        *nongit_ok = 1;
                                        return NULL;
                                }
                                strbuf_setlen(&cwd, offset);

-                               die("Not a git repository (or any parent up to mount point %s)\n"
-                               "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).",
+                               die(_("Not a git repository (or any parent up to mount point %s)\n"
+                               "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),

                                    cwd.buf);
                        }
                }
                if (chdir("..")) {
                        strbuf_setlen(&cwd, offset);
                                    cwd.buf);
                        }
                }
                if (chdir("..")) {
                        strbuf_setlen(&cwd, offset);

-                       die_errno("Cannot change to '%s/..'", cwd.buf);
+                       die_errno(_("Cannot change to '%s/..'"), cwd.buf);

                }
                offset = offset_parent;
        }
                }
                offset = offset_parent;
        }


@@ -986,9 +986,9 @@ int git_config_perm(const char *var, const char *value)
        /* A filemode value was given: 0xxx */
 
        if ((i & 0600) != 0600)
        /* A filemode value was given: 0xxx */
 
        if ((i & 0600) != 0600)

-               die("Problem with core.sharedRepository filemode value "
+               die(_("Problem with core.sharedRepository filemode value "

                    "(0%.3o).\nThe owner of files must always have "
                    "(0%.3o).\nThe owner of files must always have "

-                   "read and write permissions.", i);
+                   "read and write permissions."), i);

 
        /*
         * Mask filemode value. Others can not get write permission.
 
        /*
         * Mask filemode value. Others can not get write permission.