X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=enscript.git;a=blobdiff_plain;f=ChangeLog;h=743f26a3b15dd03eeaa07417253245f723950547;hp=ccd213b638d4bcdbb775ada89077d2d736f77114;hb=1571efb807e6575e83d674b453b5e4fb28b38c9c;hpb=c09b925450a5d3e26c8e63f4af79f7c666a12ebc

diff --git a/ChangeLog b/ChangeLog
index ccd213b..743f26a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2011-07-10  Tim Retout  <diocles@gnu.org>
+
+	* compat/gettext.h: New file.
+	* compat/Makefile.am (EXTRA_DIST): Add gettext.h.
+	* src/gsint.h: Use gettext.h instead of own libintl.h include.
+	* src/mkafmmap.c: Likewise.
+	* states/defs.h: Likewise.
+
+	* src/main.c (main): Join ENSCRIPT_LIBRARY error string together
+	for the benefit of translators.
+	Use ngettext when printing number of pages/copies.
+
+	* states/hl/mail.st: Support extended mail headers.
+	Savannah bug #25440.
+
+	* src/main.c (usage): Clarify documentation for short forms of
+	optional arguments.
+
 2011-07-09  Tim Retout  <diocles@gnu.org>
 
 	* src/main.c (handle_options): Add missing 'w' from