diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
commit | caa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch) | |
tree | bbfbe6ac84575766b4752e48960d12288a8b6c42 /wt-status.c | |
parent | e2af9e361b1d7452492baa073790b19292f9c038 (diff) | |
parent | a46221e9adcf3deb88c4fc904859205bf87f784c (diff) | |
download | git-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.gz |
Sync with 'maint'
* maint:
Correct common spelling mistakes in comments and tests
kwset: fix spelling in comments
precompose-utf8: fix spelling of "want" in error message
compat/nedmalloc: fix spelling in comments
compat/regex: fix spelling and grammar in comments
obstack: fix spelling of similar
contrib/subtree: fix spelling of accidentally
git-remote-mediawiki: spelling fixes
doc: various spelling fixes
fast-export: fix argument name in error messages
Documentation: distinguish between ref and offset deltas in pack-format
i18n: make the translation of -u advice in one go
Diffstat (limited to 'wt-status.c')
-rw-r--r-- | wt-status.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/wt-status.c b/wt-status.c index 09416db348..ec5f27c599 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1225,14 +1225,10 @@ void wt_status_print(struct wt_status *s) if (advice_status_u_option && 2000 < s->untracked_in_ms) { status_printf_ln(s, GIT_COLOR_NORMAL, ""); status_printf_ln(s, GIT_COLOR_NORMAL, - _("It took %.2f seconds to enumerate untracked files." - " 'status -uno'"), - s->untracked_in_ms / 1000.0); - status_printf_ln(s, GIT_COLOR_NORMAL, - _("may speed it up, but you have to be careful not" - " to forget to add")); - status_printf_ln(s, GIT_COLOR_NORMAL, - _("new files yourself (see 'git help status').")); + _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n" + "may speed it up, but you have to be careful not to forget to add\n" + "new files yourself (see 'git help status')."), + s->untracked_in_ms / 1000.0); } } else if (s->commitable) status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"), |