summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-12 15:12:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-12 15:12:47 (GMT)
commit5234b41f68ca1ab788513fdc059f9f2e01fd3f6e (patch)
treeae50a574a8bee32140e7efeaa784f7b3b176c73e /wt-status.c
parent3a51467b94306e77c1b69b374bac33b6672bc177 (diff)
parent62901179cfbb86e31a4bed098cee9734a701912b (diff)
downloadgit-5234b41f68ca1ab788513fdc059f9f2e01fd3f6e.zip
git-5234b41f68ca1ab788513fdc059f9f2e01fd3f6e.tar.gz
git-5234b41f68ca1ab788513fdc059f9f2e01fd3f6e.tar.bz2
Merge branch 'tb/document-status-u-tradeoff' into maint
* tb/document-status-u-tradeoff: i18n: make the translation of -u advice in one go
Diffstat (limited to 'wt-status.c')
-rw-r--r--wt-status.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/wt-status.c b/wt-status.c
index 54f4391..81e4fa5 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -1116,14 +1116,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"),