undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i18n: setup: mark error messages for translation

Browse Source 
Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vasco Almeida 2016-08-08 11:15:59 +00:00 committed by Junio C Hamano
parent 768ededa9c
commit 2ff30e67d9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
setup.c
View File

@ -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) static const char *setup_nongit(const char *cwd, int *nongit_ok)
{ {
if (!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; *nongit_ok = 1;
return NULL; return NULL;
} }
@ -842,7 +842,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)
*nongit_ok = 0; *nongit_ok = 0;
if (strbuf_getcwd(&cwd)) 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 (parent_device != current_device) {
if (nongit_ok) { if (nongit_ok) {
if (chdir(cwd.buf)) if (chdir(cwd.buf))
die_errno("Cannot come back to cwd"); die_errno(_("Cannot come back to cwd"));
*nongit_ok = 1; *nongit_ok = 1;
return NULL; return NULL;
} }
strbuf_setlen(&cwd, offset); strbuf_setlen(&cwd, offset);
die("Not a git repository (or any parent up to mount point %s)\n" die(_("Not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).", "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."),
cwd.buf); cwd.buf);
} }
} }
if (chdir("..")) { if (chdir("..")) {
strbuf_setlen(&cwd, offset); 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 */ /* A filemode value was given: 0xxx */
if ((i & 0600) != 0600) 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.