From 27df178044e9f91ad0094e9b72e86960ad0a2056 Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Wed, 30 Dec 2009 17:09:34 +0000 Subject: [PATCH] main.c (main): Use ngettext for various messages --- src/ChangeLog | 5 +++++ src/main.c | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index d162f53..4a5fa29 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-12-30 Tim Retout + + * main.c (main): Use ngettext for messages about truncated lines, + missing characters and non-printable characters. + 2009-12-27 Tim Retout Apply patch from Debian Security Team for CAN-2004-1184. diff --git a/src/main.c b/src/main.c index 48c42fb..136b293 100644 --- a/src/main.c +++ b/src/main.c @@ -1782,7 +1782,11 @@ name width\theight\tllx\tlly\turx\tury\n\ if (num_truncated_lines) { retval |= 2; - MESSAGE (0, (stderr, _("%d lines were %s\n"), num_truncated_lines, + MESSAGE (0, (stderr, + ngettext("1 line was %s\n", + "%d lines were %s\n", + num_truncated_lines), + num_truncated_lines, line_end == LE_TRUNCATE ? _("truncated") : _("wrapped"))); } @@ -1790,7 +1794,10 @@ name width\theight\tllx\tlly\turx\tury\n\ if (num_missing_chars) { retval |= 4; - MESSAGE (0, (stderr, _("%d characters were missing\n"), + MESSAGE (0, (stderr, + ngettext("1 character was missing\n", + "%d characters were missing\n", + num_missing_chars), num_missing_chars)); if (list_missing_characters) { @@ -1802,7 +1809,10 @@ name width\theight\tllx\tlly\turx\tury\n\ if (num_non_printable_chars) { retval |= 8; - MESSAGE (0, (stderr, _("%d non-printable characters\n"), + MESSAGE (0, (stderr, + ngettext("1 non-printable character\n", + "%d non-printable characters\n", + num_non_printable_chars), num_non_printable_chars)); if (list_missing_characters) { -- 2.17.1