From 62901179cfbb86e31a4bed098cee9734a701912b Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Fri, 12 Apr 2013 11:53:01 +0800 Subject: [PATCH] i18n: make the translation of -u advice in one go The advice (consider use of -u when read_directory takes too long) is separated into 3 different status_printf_ln() calls, and which brings trouble for translators. Since status_vprintf() called by status_printf_ln() can handle eol in buffer, we could simply join these lines into one paragraph. Signed-off-by: Jiang Xin Reviewed-by: Eric Sunshine Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- wt-status.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/wt-status.c b/wt-status.c index 53c2222a4f..bd1da37807 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1027,14 +1027,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"),