From: Jiang Xin <worldhello.net@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.co>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Jonathan Nieder" <jrnieder@gmail.com>
Cc: Git List <git@vger.kernel.org>, Jiang Xin <worldhello.net@gmail.com>
Subject: [PATCH v2] i18n: make the translation of -u advice in one go
Date: Fri, 12 Apr 2013 11:53:01 +0800 [thread overview]
Message-ID: <7df2833fe51c614bf9a2a6208df2e09d913a046e.1365738420.git.worldhello.net@gmail.com> (raw)
In-Reply-To: <20130412025501.GB3266@elie.Belkin>
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.net@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Jonathan Nieder <jrnieder@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
prev parent reply other threads:[~2013-04-12 3:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-12 2:46 [PATCH] i18n: make the translation of -u advise in one go Jiang Xin
2013-04-12 2:53 ` Eric Sunshine
2013-04-12 2:55 ` Jonathan Nieder
2013-04-12 3:53 ` Jiang Xin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7df2833fe51c614bf9a2a6208df2e09d913a046e.1365738420.git.worldhello.net@gmail.com \
--to=worldhello.net@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.co \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).