development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ja/i18n-message-fixes'

Browse source 
Messages fix.

* ja/i18n-message-fixes:
  i18n: fix mistakes in translated strings
This commit is contained in:
Junio C Hamano 2018-08-27 14:33:52 -07:00
parent aa5dc61161 27c929edd6
commit 8edb1b36b8
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin/submodule--helper.c
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);
}

2
config.c
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;

2
sequencer.c
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;
}