imain.c (main): Use ngettext for various messages - enscript - GNU Enscript Err thinkerwim.openbsd.amsterdam 70 hgit clone git://thinkerwim.org/enscript.git URL:git://thinkerwim.org/enscript.git thinkerwim.org 70 1Log /git/enscript/log.gph thinkerwim.org 70 1Files /git/enscript/files.gph thinkerwim.org 70 1Refs /git/enscript/refs.gph thinkerwim.org 70 1README /git/enscript/file/README.gph thinkerwim.org 70 1LICENSE /git/enscript/file/COPYING.gph thinkerwim.org 70 i--- Err thinkerwim.openbsd.amsterdam 70 1commit 27df178044e9f91ad0094e9b72e86960ad0a2056 /git/enscript/commit/27df178044e9f91ad0094e9b72e86960ad0a2056.gph thinkerwim.org 70 1parent da2e4790a132ad739c55ca8f9e9ee10a460e1c96 /git/enscript/commit/da2e4790a132ad739c55ca8f9e9ee10a460e1c96.gph thinkerwim.org 70 hAuthor: Tim Retout URL:mailto:diocles@gnu.org thinkerwim.org 70 iDate: Wed, 30 Dec 2009 17:09:34 +0000 Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 imain.c (main): Use ngettext for various messages Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 iDiffstat: Err thinkerwim.openbsd.amsterdam 70 i M src/ChangeLog | 5 +++++ Err thinkerwim.openbsd.amsterdam 70 i M src/main.c | 16 +++++++++++++--- Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i2 files changed, 18 insertions(+), 3 deletions(-) Err thinkerwim.openbsd.amsterdam 70 i--- Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/ChangeLog b/src/ChangeLog /git/enscript/file/src/ChangeLog.gph thinkerwim.org 70 i@@ -1,3 +1,8 @@ Err thinkerwim.openbsd.amsterdam 70 i+2009-12-30 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i+ * main.c (main): Use ngettext for messages about truncated lines, Err thinkerwim.openbsd.amsterdam 70 i+ missing characters and non-printable characters. Err thinkerwim.openbsd.amsterdam 70 i+ Err thinkerwim.openbsd.amsterdam 70 i 2009-12-27 Tim Retout Err thinkerwim.openbsd.amsterdam 70 i Err thinkerwim.openbsd.amsterdam 70 i Apply patch from Debian Security Team for CAN-2004-1184. Err thinkerwim.openbsd.amsterdam 70 1diff --git a/src/main.c b/src/main.c /git/enscript/file/src/main.c.gph thinkerwim.org 70 i@@ -1782,7 +1782,11 @@ name width\theight\tllx\tlly\turx\tury\n\ Err thinkerwim.openbsd.amsterdam 70 i if (num_truncated_lines) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i retval |= 2; Err thinkerwim.openbsd.amsterdam 70 i- MESSAGE (0, (stderr, _("%d lines were %s\n"), num_truncated_lines, Err thinkerwim.openbsd.amsterdam 70 i+ MESSAGE (0, (stderr, Err thinkerwim.openbsd.amsterdam 70 i+ ngettext("1 line was %s\n", Err thinkerwim.openbsd.amsterdam 70 i+ "%d lines were %s\n", Err thinkerwim.openbsd.amsterdam 70 i+ num_truncated_lines), Err thinkerwim.openbsd.amsterdam 70 i+ num_truncated_lines, Err thinkerwim.openbsd.amsterdam 70 i line_end == LE_TRUNCATE Err thinkerwim.openbsd.amsterdam 70 i ? _("truncated") : _("wrapped"))); Err thinkerwim.openbsd.amsterdam 70 i } Err thinkerwim.openbsd.amsterdam 70 i@@ -1790,7 +1794,10 @@ name width\theight\tllx\tlly\turx\tury\n\ Err thinkerwim.openbsd.amsterdam 70 i if (num_missing_chars) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i retval |= 4; Err thinkerwim.openbsd.amsterdam 70 i- MESSAGE (0, (stderr, _("%d characters were missing\n"), Err thinkerwim.openbsd.amsterdam 70 i+ MESSAGE (0, (stderr, Err thinkerwim.openbsd.amsterdam 70 i+ ngettext("1 character was missing\n", Err thinkerwim.openbsd.amsterdam 70 i+ "%d characters were missing\n", Err thinkerwim.openbsd.amsterdam 70 i+ num_missing_chars), Err thinkerwim.openbsd.amsterdam 70 i num_missing_chars)); Err thinkerwim.openbsd.amsterdam 70 i if (list_missing_characters) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i@@ -1802,7 +1809,10 @@ name width\theight\tllx\tlly\turx\tury\n\ Err thinkerwim.openbsd.amsterdam 70 i if (num_non_printable_chars) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 i retval |= 8; Err thinkerwim.openbsd.amsterdam 70 i- MESSAGE (0, (stderr, _("%d non-printable characters\n"), Err thinkerwim.openbsd.amsterdam 70 i+ MESSAGE (0, (stderr, Err thinkerwim.openbsd.amsterdam 70 i+ ngettext("1 non-printable character\n", Err thinkerwim.openbsd.amsterdam 70 i+ "%d non-printable characters\n", Err thinkerwim.openbsd.amsterdam 70 i+ num_non_printable_chars), Err thinkerwim.openbsd.amsterdam 70 i num_non_printable_chars)); Err thinkerwim.openbsd.amsterdam 70 i if (list_missing_characters) Err thinkerwim.openbsd.amsterdam 70 i { Err thinkerwim.openbsd.amsterdam 70 .