+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