Merge branch 'tb/document-status-u-tradeoff' into maint

* tb/document-status-u-tradeoff:
  i18n: make the translation of -u advice in one go

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."
+					 _("It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
-				   "  'status -uno'"),
+					   "may speed it up, but you have to be careful not to forget to add\n"
-				 s->untracked_in_ms / 1000.0);
+					   "new files yourself (see 'git help status')."),
-			status_printf_ln(s, GIT_COLOR_NORMAL,
+					 s->untracked_in_ms / 1000.0);
-				 _("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')."));
 		}
 	} else if (s->commitable)
 		status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"),