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 <worldhello....@gmail.com>
Reviewed-by: Eric Sunshine <sunsh...@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnie...@gmail.com>
---
 wt-status.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/wt-status.c b/wt-status.c
index 09416..ec5f2 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"),
-- 
1.8.2.1.347.g1003b3a.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to