diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:52 -0700 |
| commit | 8edb1b36b81e11773442d6748fcedb16f134a445 (patch) | |
| tree | 9152fb8fa9e1494b56fd3ec70c30487d886e1b13 | |
| parent | Merge branch 'ds/commit-graph-fsck' (diff) | |
| parent | i18n: fix mistakes in translated strings (diff) | |
| download | tgif-8edb1b36b81e11773442d6748fcedb16f134a445.tar.xz | |
Merge branch 'ja/i18n-message-fixes'
Messages fix.
* ja/i18n-message-fixes:
i18n: fix mistakes in translated strings
| -rw-r--r-- | builtin/submodule--helper.c | 2 | ||||
| -rw-r--r-- | config.c | 2 | ||||
| -rw-r--r-- | sequencer.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 2bcc70fdfe..b56028ba9d 100644 --- 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)) - 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); } @@ -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; diff --git a/sequencer.c b/sequencer.c index 65d371c746..84bf598c3e 100644 --- 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)) { - warning(_("could not parse '%s' (looking for '%s'"), + warning(_("could not parse '%s' (looking for '%s')"), rebase_path_author_script(), keys[i]); return NULL; } |