Skip to content

Commit 8edb1b3

Browse files
committed
Merge branch 'ja/i18n-message-fixes'
Messages fix. * ja/i18n-message-fixes: i18n: fix mistakes in translated strings
2 parents aa5dc61 + 27c929e commit 8edb1b3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

builtin/submodule--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
542542
argv_array_pushv(&cpr.args, info->argv);
543543

544544
if (run_command(&cpr))
545-
die(_("run_command returned non-zero status while"
545+
die(_("run_command returned non-zero status while "
546546
"recursing in the nested submodules of %s\n."),
547547
displaypath);
548548
}

config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ static const char include_depth_advice[] = N_(
124124
" %s\n"
125125
"from\n"
126126
" %s\n"
127-
"Do you have circular includes?");
127+
"This might be due to circular includes.");
128128
static int handle_path_include(const char *path, struct config_include_data *inc)
129129
{
130130
int ret = 0;

sequencer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ static const char *read_author_ident(struct strbuf *buf)
720720
/* dequote values and construct ident line in-place */
721721
for (in = buf->buf; i < 3 && in - buf->buf < buf->len; i++) {
722722
if (!skip_prefix(in, keys[i], (const char **)&in)) {
723-
warning(_("could not parse '%s' (looking for '%s'"),
723+
warning(_("could not parse '%s' (looking for '%s')"),
724724
rebase_path_author_script(), keys[i]);
725725
return NULL;
726726
}

0 commit comments

Comments
 (0)