gettext-0.19.7gettext-0.19.7

author: Lorry Tar Creator <lorry-tar-importer@lorry> 2015-12-28 00:06:36 +0000
committer: Lorry Tar Creator <lorry-tar-importer@lorry> 2015-12-28 00:06:36 +0000
commit: 6eb5949dd99d174393465069c2fd0bab32deddcc (patch)
tree: d104f72ac2dcb0f592b1c8e06a5af6790bd4080c /gettext-tools/doc
parent: 482840e61f86ca321838a91e902c41d40c098bbb (diff)
download: gettext-tarball-6eb5949dd99d174393465069c2fd0bab32deddcc.tar.gz
41 files changed, 4940 insertions, 3116 deletions
diff --git a/gettext-tools/doc/ChangeLog b/gettext-tools/doc/ChangeLog.1
index 8f1c725..ed80a4a 100644
--- a/gettext-tools/doc/ChangeLog
+++ b/gettext-tools/doc/ChangeLog.1
@@ -1,3 +1,82 @@
+2015-10-06  Daiki Ueno  <ueno@gnu.org>
+
+	doc: Don't expose generated version
+	* Makefile.am ($(srcdir)/stamp-vti): Set ARCHIVE-VERSION, derived
+	from $(ARCHIVE_VERSION) in version.texi.
+	* gettext.texi (Files under Version Control): Refer to
+	ARCHIVE-VERSION, instead of VERSION.
+	* autopoint.texi: Refer to ARCHIVE-VERSION, instead of VERSION.
+
+2015-09-11  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext 0.19.6 released.
+
+2015-07-28  Daiki Ueno  <ueno@gnu.org>
+
+	* autopoint.texi: Mention AM_GNU_GETTEXT_REQUIRE_VERSION.
+
+2015-07-10  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext 0.19.5 released.
+
+2015-06-22  Daiki Ueno  <ueno@gnu.org>
+
+	* msginit.texi: More explanations about "meta information".
+	* gettext.texi (Plural forms): Mention Unicode CLDR support in
+	msginit.
+
+2015-06-01  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext.texi (gawk): Mention new file extensions ".gawk" and
+	".twjr".
+
+2015-06-01  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext.texi (Adjusting Files): Update link to GNU hello
+	distribution.  Suggested by Karl Berry in:
+	<https://lists.gnu.org/archive/html/bug-gettext/2015-05/msg00031.html>.
+
+2015-05-08  Matthew Behrens  <askedrelic@gmail.com>  (tiny change)
+
+	* gettext.texi (python-format): Update link to Python Library
+	Reference.
+
+2015-03-15  Benno Schulenberg <bensberg@justemail.net>  (tiny change)
+
+	* xgettext.texi: Fix a word and a punctuation.
+
+2015-03-06  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext.texi (kde-kuit-format): New subsection.
+
+2015-03-03  Daiki Ueno  <ueno@gnu.org>
+
+	* xgettext.texi: Document options --check and --sentence-end.
+
+2015-02-09  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext.texi (Plural forms): Add Arabic, Bahasa Indonesian, and
+	Thai.
+	Reported by Maryam Aly in:
+	<https://lists.gnu.org/archive/html/bug-gettext/2015-02/msg00012.html>.
+
+2015-02-03  Daiki Ueno  <ueno@gnu.org>
+
+	* msgexec.texi, msgfilter.texi: Fix markup error caused by commit
+	96dde0b8 and a4d132f7.
+
+2015-01-29  Daiki Ueno  <ueno@gnu.org>
+
+	* msgexec.texi: Document --newline option.
+
+2015-01-28  Daiki Ueno  <ueno@gnu.org>
+
+	* msgfilter.texi: Document --newline option.
+
+2015-01-05  Daiki Ueno  <ueno@gnu.org>
+
+	* gettext.texi (Vala): New section.
+
 2014-12-24  Daiki Ueno  <ueno@gnu.org>
 
 	* gettext 0.19.4 released.
diff --git a/gettext-tools/doc/Makefile.am b/gettext-tools/doc/Makefile.am
index 708b1cc..904ebe4 100644
--- a/gettext-tools/doc/Makefile.am
+++ b/gettext-tools/doc/Makefile.am
@@ -1,5 +1,6 @@
 ## Makefile for the gettext-tools/doc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2007, 2009 Free Software Foundation, Inc.
+## Copyright (C) 1995-1997, 2001-2007, 2009, 2015 Free Software
+## Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -50,8 +51,7 @@ EXTRA_DIST += $(doc_DATA)
 EXTRA_DIST += \
   iso-639.sed iso-639-2.sed iso-3166.sed \
   ISO_639 ISO_639-2 ISO_3166 ISO_3166_de \
-  texi2html \
-  ChangeLog.0
+  texi2html
 
 iso-639.texi: ISO_639 iso-639.sed
 	$(SED) -f $(srcdir)/iso-639.sed $(srcdir)/ISO_639 > iso-639.tmp
@@ -77,7 +77,8 @@ $(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.vers
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
-	echo "@set VERSION $(VERSION)") > vti.tmp
+	echo "@set VERSION $(VERSION)"; \
+	echo "@set ARCHIVE-VERSION $(ARCHIVE_VERSION)") > vti.tmp
 	cmp -s vti.tmp version.texi \
 	  || (echo "Updating version.texi"; \
 	      cp vti.tmp version.texi)
diff --git a/gettext-tools/doc/Makefile.in b/gettext-tools/doc/Makefile.in
index 1a73133..8c821e0 100644
--- a/gettext-tools/doc/Makefile.in
+++ b/gettext-tools/doc/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,16 +88,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/../build-aux/mkinstalldirs $(gettext_TEXINFOS) \
-	$(top_srcdir)/../build-aux/mdate-sh $(srcdir)/version.texi \
-	$(srcdir)/stamp-vti $(top_srcdir)/../build-aux/texinfo.tex \
-	ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/libgettextpo/gnulib-m4/gnulib-comp.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/gnulib-comp.m4 \
-	$(top_srcdir)/libgrep/gnulib-m4/langinfo_h.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/localeconv.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/mbrlen.m4 \
 	$(top_srcdir)/libgrep/gnulib-m4/nl_langinfo.m4 \
@@ -104,6 +108,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/btowc.m4 \
 	$(top_srcdir)/gnulib-m4/byteswap.m4 \
 	$(top_srcdir)/gnulib-m4/canonicalize.m4 \
+	$(top_srcdir)/gnulib-m4/check-math-lib.m4 \
 	$(top_srcdir)/gnulib-m4/close.m4 \
 	$(top_srcdir)/gnulib-m4/closedir.m4 \
 	$(top_srcdir)/gnulib-m4/configmake.m4 \
@@ -111,6 +116,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/csharp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpcomp.m4 \
 	$(top_srcdir)/gnulib-m4/csharpexec.m4 \
+	$(top_srcdir)/gnulib-m4/ctype.m4 \
 	$(top_srcdir)/gnulib-m4/curses.m4 \
 	$(top_srcdir)/gnulib-m4/dirent_h.m4 \
 	$(top_srcdir)/gnulib-m4/double-slash-root.m4 \
@@ -122,7 +128,10 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/error.m4 \
 	$(top_srcdir)/gnulib-m4/execute.m4 \
 	$(top_srcdir)/gnulib-m4/exponentd.m4 \
+	$(top_srcdir)/gnulib-m4/exponentf.m4 \
+	$(top_srcdir)/gnulib-m4/exponentl.m4 \
 	$(top_srcdir)/gnulib-m4/extensions.m4 \
+	$(top_srcdir)/gnulib-m4/fabs.m4 \
 	$(top_srcdir)/gnulib-m4/fatal-signal.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl.m4 \
 	$(top_srcdir)/gnulib-m4/fcntl_h.m4 \
@@ -152,10 +161,16 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/inline.m4 \
 	$(top_srcdir)/gnulib-m4/intmax_t.m4 \
 	$(top_srcdir)/gnulib-m4/inttypes.m4 \
+	$(top_srcdir)/gnulib-m4/isinf.m4 \
+	$(top_srcdir)/gnulib-m4/isnan.m4 \
+	$(top_srcdir)/gnulib-m4/isnand.m4 \
+	$(top_srcdir)/gnulib-m4/isnanf.m4 \
+	$(top_srcdir)/gnulib-m4/isnanl.m4 \
 	$(top_srcdir)/gnulib-m4/iswblank.m4 \
 	$(top_srcdir)/gnulib-m4/java.m4 \
 	$(top_srcdir)/gnulib-m4/javacomp.m4 \
 	$(top_srcdir)/gnulib-m4/javaexec.m4 \
+	$(top_srcdir)/gnulib-m4/langinfo_h.m4 \
 	$(top_srcdir)/gnulib-m4/largefile.m4 \
 	$(top_srcdir)/gnulib-m4/lib-ld.m4 \
 	$(top_srcdir)/gnulib-m4/lib-link.m4 \
@@ -173,10 +188,13 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/locale-zh.m4 \
 	$(top_srcdir)/gnulib-m4/locale_h.m4 \
 	$(top_srcdir)/gnulib-m4/localename.m4 \
+	$(top_srcdir)/gnulib-m4/log10.m4 \
 	$(top_srcdir)/gnulib-m4/lseek.m4 \
 	$(top_srcdir)/gnulib-m4/lstat.m4 \
 	$(top_srcdir)/gnulib-m4/malloc.m4 \
 	$(top_srcdir)/gnulib-m4/malloca.m4 \
+	$(top_srcdir)/gnulib-m4/math_h.m4 \
+	$(top_srcdir)/gnulib-m4/mathfunc.m4 \
 	$(top_srcdir)/gnulib-m4/mbchar.m4 \
 	$(top_srcdir)/gnulib-m4/mbiter.m4 \
 	$(top_srcdir)/gnulib-m4/mbrtowc.m4 \
@@ -206,6 +224,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/pathmax.m4 \
 	$(top_srcdir)/gnulib-m4/pipe2.m4 \
 	$(top_srcdir)/gnulib-m4/posix_spawn.m4 \
+	$(top_srcdir)/gnulib-m4/pow.m4 \
 	$(top_srcdir)/gnulib-m4/printf.m4 \
 	$(top_srcdir)/gnulib-m4/putenv.m4 \
 	$(top_srcdir)/gnulib-m4/quote.m4 \
@@ -230,6 +249,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/sigaction.m4 \
 	$(top_srcdir)/gnulib-m4/signal_h.m4 \
 	$(top_srcdir)/gnulib-m4/signalblocking.m4 \
+	$(top_srcdir)/gnulib-m4/signbit.m4 \
 	$(top_srcdir)/gnulib-m4/sigpipe.m4 \
 	$(top_srcdir)/gnulib-m4/sleep.m4 \
 	$(top_srcdir)/gnulib-m4/snprintf.m4 \
@@ -237,6 +257,7 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/gnulib-m4/spawn_h.m4 \
 	$(top_srcdir)/gnulib-m4/ssize_t.m4 \
 	$(top_srcdir)/gnulib-m4/stat.m4 \
+	$(top_srcdir)/gnulib-m4/stdalign.m4 \
 	$(top_srcdir)/gnulib-m4/stdarg.m4 \
 	$(top_srcdir)/gnulib-m4/stdbool.m4 \
 	$(top_srcdir)/gnulib-m4/stddef_h.m4 \
@@ -328,6 +349,8 @@ am__aclocal_m4_deps =  \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/version.texi \
+	$(srcdir)/stamp-vti $(am__DIST_COMMON)
 mkinstalldirs = $(SHELL) $(top_srcdir)/../build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -419,6 +442,10 @@ am__uninstall_files_from_dir = { \
   }
 DATA = $(doc_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(gettext_TEXINFOS) $(srcdir)/Makefile.in \
+	$(top_srcdir)/../build-aux/mdate-sh \
+	$(top_srcdir)/../build-aux/mkinstalldirs \
+	$(top_srcdir)/../build-aux/texinfo.tex
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 pkglibexecdir = @pkglibexecdir@
 ACLOCAL = @ACLOCAL@
@@ -429,6 +456,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 APPLE_UNIVERSAL_BUILD = @APPLE_UNIVERSAL_BUILD@
 AR = @AR@
 ARCHIVE_FORMAT = @ARCHIVE_FORMAT@
+ARCHIVE_VERSION = @ARCHIVE_VERSION@
 ARFLAGS = @ARFLAGS@
 AS = @AS@
 ASM_SYMBOL_PREFIX = @ASM_SYMBOL_PREFIX@
@@ -495,6 +523,7 @@ EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@
 EOVERFLOW_VALUE = @EOVERFLOW_VALUE@
 ERRNO_H = @ERRNO_H@
 EXEEXT = @EXEEXT@
+FABS_LIBM = @FABS_LIBM@
 FGREP = @FGREP@
 FLOAT_H = @FLOAT_H@
 FNMATCH_H = @FNMATCH_H@
@@ -509,15 +538,34 @@ GLIBC21 = @GLIBC21@
 GLOBAL_SYMBOL_PIPE = @GLOBAL_SYMBOL_PIPE@
 GMSGFMT = @GMSGFMT@
 GMSGFMT_015 = @GMSGFMT_015@
+GNULIB_ACOSF = @GNULIB_ACOSF@
+GNULIB_ACOSL = @GNULIB_ACOSL@
 GNULIB_ALPHASORT = @GNULIB_ALPHASORT@
+GNULIB_ASINF = @GNULIB_ASINF@
+GNULIB_ASINL = @GNULIB_ASINL@
+GNULIB_ATAN2F = @GNULIB_ATAN2F@
+GNULIB_ATANF = @GNULIB_ATANF@
+GNULIB_ATANL = @GNULIB_ATANL@
 GNULIB_ATOLL = @GNULIB_ATOLL@
 GNULIB_BTOWC = @GNULIB_BTOWC@
 GNULIB_CALLOC_POSIX = @GNULIB_CALLOC_POSIX@
 GNULIB_CANONICALIZE_FILE_NAME = @GNULIB_CANONICALIZE_FILE_NAME@
+GNULIB_CBRT = @GNULIB_CBRT@
+GNULIB_CBRTF = @GNULIB_CBRTF@
+GNULIB_CBRTL = @GNULIB_CBRTL@
+GNULIB_CEIL = @GNULIB_CEIL@
+GNULIB_CEILF = @GNULIB_CEILF@
+GNULIB_CEILL = @GNULIB_CEILL@
 GNULIB_CHDIR = @GNULIB_CHDIR@
 GNULIB_CHOWN = @GNULIB_CHOWN@
 GNULIB_CLOSE = @GNULIB_CLOSE@
 GNULIB_CLOSEDIR = @GNULIB_CLOSEDIR@
+GNULIB_COPYSIGN = @GNULIB_COPYSIGN@
+GNULIB_COPYSIGNF = @GNULIB_COPYSIGNF@
+GNULIB_COPYSIGNL = @GNULIB_COPYSIGNL@
+GNULIB_COSF = @GNULIB_COSF@
+GNULIB_COSHF = @GNULIB_COSHF@
+GNULIB_COSL = @GNULIB_COSL@
 GNULIB_DIRFD = @GNULIB_DIRFD@
 GNULIB_DPRINTF = @GNULIB_DPRINTF@
 GNULIB_DUP = @GNULIB_DUP@
@@ -526,6 +574,16 @@ GNULIB_DUP3 = @GNULIB_DUP3@
 GNULIB_DUPLOCALE = @GNULIB_DUPLOCALE@
 GNULIB_ENVIRON = @GNULIB_ENVIRON@
 GNULIB_EUIDACCESS = @GNULIB_EUIDACCESS@
+GNULIB_EXP2 = @GNULIB_EXP2@
+GNULIB_EXP2F = @GNULIB_EXP2F@
+GNULIB_EXP2L = @GNULIB_EXP2L@
+GNULIB_EXPF = @GNULIB_EXPF@
+GNULIB_EXPL = @GNULIB_EXPL@
+GNULIB_EXPM1 = @GNULIB_EXPM1@
+GNULIB_EXPM1F = @GNULIB_EXPM1F@
+GNULIB_EXPM1L = @GNULIB_EXPM1L@
+GNULIB_FABSF = @GNULIB_FABSF@
+GNULIB_FABSL = @GNULIB_FABSL@
 GNULIB_FACCESSAT = @GNULIB_FACCESSAT@
 GNULIB_FCHDIR = @GNULIB_FCHDIR@
 GNULIB_FCHMODAT = @GNULIB_FCHMODAT@
@@ -540,6 +598,15 @@ GNULIB_FFSL = @GNULIB_FFSL@
 GNULIB_FFSLL = @GNULIB_FFSLL@
 GNULIB_FGETC = @GNULIB_FGETC@
 GNULIB_FGETS = @GNULIB_FGETS@
+GNULIB_FLOOR = @GNULIB_FLOOR@
+GNULIB_FLOORF = @GNULIB_FLOORF@
+GNULIB_FLOORL = @GNULIB_FLOORL@
+GNULIB_FMA = @GNULIB_FMA@
+GNULIB_FMAF = @GNULIB_FMAF@
+GNULIB_FMAL = @GNULIB_FMAL@
+GNULIB_FMOD = @GNULIB_FMOD@
+GNULIB_FMODF = @GNULIB_FMODF@
+GNULIB_FMODL = @GNULIB_FMODL@
 GNULIB_FOPEN = @GNULIB_FOPEN@
 GNULIB_FPRINTF = @GNULIB_FPRINTF@
 GNULIB_FPRINTF_POSIX = @GNULIB_FPRINTF_POSIX@
@@ -548,6 +615,9 @@ GNULIB_FPUTC = @GNULIB_FPUTC@
 GNULIB_FPUTS = @GNULIB_FPUTS@
 GNULIB_FREAD = @GNULIB_FREAD@
 GNULIB_FREOPEN = @GNULIB_FREOPEN@
+GNULIB_FREXP = @GNULIB_FREXP@
+GNULIB_FREXPF = @GNULIB_FREXPF@
+GNULIB_FREXPL = @GNULIB_FREXPL@
 GNULIB_FSCANF = @GNULIB_FSCANF@
 GNULIB_FSEEK = @GNULIB_FSEEK@
 GNULIB_FSEEKO = @GNULIB_FSEEKO@
@@ -578,17 +648,47 @@ GNULIB_GETUSERSHELL = @GNULIB_GETUSERSHELL@
 GNULIB_GL_UNISTD_H_GETOPT = @GNULIB_GL_UNISTD_H_GETOPT@
 GNULIB_GRANTPT = @GNULIB_GRANTPT@
 GNULIB_GROUP_MEMBER = @GNULIB_GROUP_MEMBER@
+GNULIB_HYPOT = @GNULIB_HYPOT@
+GNULIB_HYPOTF = @GNULIB_HYPOTF@
+GNULIB_HYPOTL = @GNULIB_HYPOTL@
 GNULIB_ICONV = @GNULIB_ICONV@
+GNULIB_ILOGB = @GNULIB_ILOGB@
+GNULIB_ILOGBF = @GNULIB_ILOGBF@
+GNULIB_ILOGBL = @GNULIB_ILOGBL@
 GNULIB_IMAXABS = @GNULIB_IMAXABS@
 GNULIB_IMAXDIV = @GNULIB_IMAXDIV@
 GNULIB_ISATTY = @GNULIB_ISATTY@
+GNULIB_ISBLANK = @GNULIB_ISBLANK@
+GNULIB_ISFINITE = @GNULIB_ISFINITE@
+GNULIB_ISINF = @GNULIB_ISINF@
+GNULIB_ISNAN = @GNULIB_ISNAN@
+GNULIB_ISNAND = @GNULIB_ISNAND@
+GNULIB_ISNANF = @GNULIB_ISNANF@
+GNULIB_ISNANL = @GNULIB_ISNANL@
 GNULIB_ISWBLANK = @GNULIB_ISWBLANK@
 GNULIB_ISWCTYPE = @GNULIB_ISWCTYPE@
 GNULIB_LCHMOD = @GNULIB_LCHMOD@
 GNULIB_LCHOWN = @GNULIB_LCHOWN@
+GNULIB_LDEXPF = @GNULIB_LDEXPF@
+GNULIB_LDEXPL = @GNULIB_LDEXPL@
 GNULIB_LINK = @GNULIB_LINK@
 GNULIB_LINKAT = @GNULIB_LINKAT@
 GNULIB_LOCALECONV = @GNULIB_LOCALECONV@
+GNULIB_LOG = @GNULIB_LOG@
+GNULIB_LOG10 = @GNULIB_LOG10@
+GNULIB_LOG10F = @GNULIB_LOG10F@
+GNULIB_LOG10L = @GNULIB_LOG10L@
+GNULIB_LOG1P = @GNULIB_LOG1P@
+GNULIB_LOG1PF = @GNULIB_LOG1PF@
+GNULIB_LOG1PL = @GNULIB_LOG1PL@
+GNULIB_LOG2 = @GNULIB_LOG2@
+GNULIB_LOG2F = @GNULIB_LOG2F@
+GNULIB_LOG2L = @GNULIB_LOG2L@
+GNULIB_LOGB = @GNULIB_LOGB@
+GNULIB_LOGBF = @GNULIB_LOGBF@
+GNULIB_LOGBL = @GNULIB_LOGBL@
+GNULIB_LOGF = @GNULIB_LOGF@
+GNULIB_LOGL = @GNULIB_LOGL@
 GNULIB_LSEEK = @GNULIB_LSEEK@
 GNULIB_LSTAT = @GNULIB_LSTAT@
 GNULIB_MALLOC_POSIX = @GNULIB_MALLOC_POSIX@
@@ -627,6 +727,9 @@ GNULIB_MKOSTEMPS = @GNULIB_MKOSTEMPS@
 GNULIB_MKSTEMP = @GNULIB_MKSTEMP@
 GNULIB_MKSTEMPS = @GNULIB_MKSTEMPS@
 GNULIB_MKTIME = @GNULIB_MKTIME@
+GNULIB_MODF = @GNULIB_MODF@
+GNULIB_MODFF = @GNULIB_MODFF@
+GNULIB_MODFL = @GNULIB_MODFL@
 GNULIB_NANOSLEEP = @GNULIB_NANOSLEEP@
 GNULIB_NL_LANGINFO = @GNULIB_NL_LANGINFO@
 GNULIB_NONBLOCKING = @GNULIB_NONBLOCKING@
@@ -662,6 +765,7 @@ GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDDU
 GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN@
 GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_DESTROY@
 GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT = @GNULIB_POSIX_SPAWN_FILE_ACTIONS_INIT@
+GNULIB_POWF = @GNULIB_POWF@
 GNULIB_PREAD = @GNULIB_PREAD@
 GNULIB_PRINTF = @GNULIB_PRINTF@
 GNULIB_PRINTF_POSIX = @GNULIB_PRINTF_POSIX@
@@ -685,11 +789,20 @@ GNULIB_READLINK = @GNULIB_READLINK@
 GNULIB_READLINKAT = @GNULIB_READLINKAT@
 GNULIB_REALLOC_POSIX = @GNULIB_REALLOC_POSIX@
 GNULIB_REALPATH = @GNULIB_REALPATH@
+GNULIB_REMAINDER = @GNULIB_REMAINDER@
+GNULIB_REMAINDERF = @GNULIB_REMAINDERF@
+GNULIB_REMAINDERL = @GNULIB_REMAINDERL@
 GNULIB_REMOVE = @GNULIB_REMOVE@
 GNULIB_RENAME = @GNULIB_RENAME@
 GNULIB_RENAMEAT = @GNULIB_RENAMEAT@
 GNULIB_REWINDDIR = @GNULIB_REWINDDIR@
+GNULIB_RINT = @GNULIB_RINT@
+GNULIB_RINTF = @GNULIB_RINTF@
+GNULIB_RINTL = @GNULIB_RINTL@
 GNULIB_RMDIR = @GNULIB_RMDIR@
+GNULIB_ROUND = @GNULIB_ROUND@
+GNULIB_ROUNDF = @GNULIB_ROUNDF@
+GNULIB_ROUNDL = @GNULIB_ROUNDL@
 GNULIB_RPMATCH = @GNULIB_RPMATCH@
 GNULIB_SCANDIR = @GNULIB_SCANDIR@
 GNULIB_SCANF = @GNULIB_SCANF@
@@ -700,10 +813,16 @@ GNULIB_SETHOSTNAME = @GNULIB_SETHOSTNAME@
 GNULIB_SETLOCALE = @GNULIB_SETLOCALE@
 GNULIB_SIGACTION = @GNULIB_SIGACTION@
 GNULIB_SIGNAL_H_SIGPIPE = @GNULIB_SIGNAL_H_SIGPIPE@
+GNULIB_SIGNBIT = @GNULIB_SIGNBIT@
 GNULIB_SIGPROCMASK = @GNULIB_SIGPROCMASK@
+GNULIB_SINF = @GNULIB_SINF@
+GNULIB_SINHF = @GNULIB_SINHF@
+GNULIB_SINL = @GNULIB_SINL@
 GNULIB_SLEEP = @GNULIB_SLEEP@
 GNULIB_SNPRINTF = @GNULIB_SNPRINTF@
 GNULIB_SPRINTF_POSIX = @GNULIB_SPRINTF_POSIX@
+GNULIB_SQRTF = @GNULIB_SQRTF@
+GNULIB_SQRTL = @GNULIB_SQRTL@
 GNULIB_STAT = @GNULIB_STAT@
 GNULIB_STDIO_H_NONBLOCKING = @GNULIB_STDIO_H_NONBLOCKING@
 GNULIB_STDIO_H_SIGPIPE = @GNULIB_STDIO_H_SIGPIPE@
@@ -732,10 +851,17 @@ GNULIB_STRVERSCMP = @GNULIB_STRVERSCMP@
 GNULIB_SYMLINK = @GNULIB_SYMLINK@
 GNULIB_SYMLINKAT = @GNULIB_SYMLINKAT@
 GNULIB_SYSTEM_POSIX = @GNULIB_SYSTEM_POSIX@
+GNULIB_TANF = @GNULIB_TANF@
+GNULIB_TANHF = @GNULIB_TANHF@
+GNULIB_TANL = @GNULIB_TANL@
 GNULIB_TIMEGM = @GNULIB_TIMEGM@
 GNULIB_TIME_R = @GNULIB_TIME_R@
+GNULIB_TIME_RZ = @GNULIB_TIME_RZ@
 GNULIB_TMPFILE = @GNULIB_TMPFILE@
 GNULIB_TOWCTRANS = @GNULIB_TOWCTRANS@
+GNULIB_TRUNC = @GNULIB_TRUNC@
+GNULIB_TRUNCF = @GNULIB_TRUNCF@
+GNULIB_TRUNCL = @GNULIB_TRUNCL@
 GNULIB_TTYNAME_R = @GNULIB_TTYNAME_R@
 GNULIB_UNISTD_H_NONBLOCKING = @GNULIB_UNISTD_H_NONBLOCKING@
 GNULIB_UNISTD_H_SIGPIPE = @GNULIB_UNISTD_H_SIGPIPE@
@@ -795,25 +921,57 @@ GNULIB_WMEMSET = @GNULIB_WMEMSET@
 GNULIB_WRITE = @GNULIB_WRITE@
 GNULIB__EXIT = @GNULIB__EXIT@
 GREP = @GREP@
+HAVE_ACOSF = @HAVE_ACOSF@
+HAVE_ACOSL = @HAVE_ACOSL@
 HAVE_ALPHASORT = @HAVE_ALPHASORT@
+HAVE_ASINF = @HAVE_ASINF@
+HAVE_ASINL = @HAVE_ASINL@
 HAVE_ASPRINTF = @HAVE_ASPRINTF@
+HAVE_ATAN2F = @HAVE_ATAN2F@
+HAVE_ATANF = @HAVE_ATANF@
+HAVE_ATANL = @HAVE_ATANL@
 HAVE_ATOLL = @HAVE_ATOLL@
 HAVE_BTOWC = @HAVE_BTOWC@
 HAVE_CANONICALIZE_FILE_NAME = @HAVE_CANONICALIZE_FILE_NAME@
+HAVE_CBRT = @HAVE_CBRT@
+HAVE_CBRTF = @HAVE_CBRTF@
+HAVE_CBRTL = @HAVE_CBRTL@
 HAVE_CHOWN = @HAVE_CHOWN@
 HAVE_CLIX = @HAVE_CLIX@
 HAVE_CLIX_IN_PATH = @HAVE_CLIX_IN_PATH@
 HAVE_CLOSEDIR = @HAVE_CLOSEDIR@
+HAVE_COPYSIGN = @HAVE_COPYSIGN@
+HAVE_COPYSIGNL = @HAVE_COPYSIGNL@
+HAVE_COSF = @HAVE_COSF@
+HAVE_COSHF = @HAVE_COSHF@
+HAVE_COSL = @HAVE_COSL@
 HAVE_CSC = @HAVE_CSC@
 HAVE_CSCC = @HAVE_CSCC@
 HAVE_CSCC_IN_PATH = @HAVE_CSCC_IN_PATH@
 HAVE_CSC_IN_PATH = @HAVE_CSC_IN_PATH@
+HAVE_DECL_ACOSL = @HAVE_DECL_ACOSL@
+HAVE_DECL_ASINL = @HAVE_DECL_ASINL@
+HAVE_DECL_ATANL = @HAVE_DECL_ATANL@
+HAVE_DECL_CBRTF = @HAVE_DECL_CBRTF@
+HAVE_DECL_CBRTL = @HAVE_DECL_CBRTL@
+HAVE_DECL_CEILF = @HAVE_DECL_CEILF@
+HAVE_DECL_CEILL = @HAVE_DECL_CEILL@
+HAVE_DECL_COPYSIGNF = @HAVE_DECL_COPYSIGNF@
+HAVE_DECL_COSL = @HAVE_DECL_COSL@
 HAVE_DECL_DIRFD = @HAVE_DECL_DIRFD@
 HAVE_DECL_ENVIRON = @HAVE_DECL_ENVIRON@
+HAVE_DECL_EXP2 = @HAVE_DECL_EXP2@
+HAVE_DECL_EXP2F = @HAVE_DECL_EXP2F@
+HAVE_DECL_EXP2L = @HAVE_DECL_EXP2L@
+HAVE_DECL_EXPL = @HAVE_DECL_EXPL@
+HAVE_DECL_EXPM1L = @HAVE_DECL_EXPM1L@
 HAVE_DECL_FCHDIR = @HAVE_DECL_FCHDIR@
 HAVE_DECL_FDATASYNC = @HAVE_DECL_FDATASYNC@
 HAVE_DECL_FDOPENDIR = @HAVE_DECL_FDOPENDIR@
+HAVE_DECL_FLOORF = @HAVE_DECL_FLOORF@
+HAVE_DECL_FLOORL = @HAVE_DECL_FLOORL@
 HAVE_DECL_FPURGE = @HAVE_DECL_FPURGE@
+HAVE_DECL_FREXPL = @HAVE_DECL_FREXPL@
 HAVE_DECL_FSEEKO = @HAVE_DECL_FSEEKO@
 HAVE_DECL_FTELLO = @HAVE_DECL_FTELLO@
 HAVE_DECL_GETDELIM = @HAVE_DECL_GETDELIM@
@@ -825,13 +983,28 @@ HAVE_DECL_GETPAGESIZE = @HAVE_DECL_GETPAGESIZE@
 HAVE_DECL_GETUSERSHELL = @HAVE_DECL_GETUSERSHELL@
 HAVE_DECL_IMAXABS = @HAVE_DECL_IMAXABS@
 HAVE_DECL_IMAXDIV = @HAVE_DECL_IMAXDIV@
+HAVE_DECL_LDEXPL = @HAVE_DECL_LDEXPL@
 HAVE_DECL_LOCALTIME_R = @HAVE_DECL_LOCALTIME_R@
+HAVE_DECL_LOG10L = @HAVE_DECL_LOG10L@
+HAVE_DECL_LOG2 = @HAVE_DECL_LOG2@
+HAVE_DECL_LOG2F = @HAVE_DECL_LOG2F@
+HAVE_DECL_LOG2L = @HAVE_DECL_LOG2L@
+HAVE_DECL_LOGB = @HAVE_DECL_LOGB@
+HAVE_DECL_LOGL = @HAVE_DECL_LOGL@
 HAVE_DECL_MEMMEM = @HAVE_DECL_MEMMEM@
 HAVE_DECL_MEMRCHR = @HAVE_DECL_MEMRCHR@
 HAVE_DECL_OBSTACK_PRINTF = @HAVE_DECL_OBSTACK_PRINTF@
+HAVE_DECL_REMAINDER = @HAVE_DECL_REMAINDER@
+HAVE_DECL_REMAINDERL = @HAVE_DECL_REMAINDERL@
+HAVE_DECL_RINTF = @HAVE_DECL_RINTF@
+HAVE_DECL_ROUND = @HAVE_DECL_ROUND@
+HAVE_DECL_ROUNDF = @HAVE_DECL_ROUNDF@
+HAVE_DECL_ROUNDL = @HAVE_DECL_ROUNDL@
 HAVE_DECL_SETENV = @HAVE_DECL_SETENV@
 HAVE_DECL_SETHOSTNAME = @HAVE_DECL_SETHOSTNAME@
+HAVE_DECL_SINL = @HAVE_DECL_SINL@
 HAVE_DECL_SNPRINTF = @HAVE_DECL_SNPRINTF@
+HAVE_DECL_SQRTL = @HAVE_DECL_SQRTL@
 HAVE_DECL_STRDUP = @HAVE_DECL_STRDUP@
 HAVE_DECL_STRERROR_R = @HAVE_DECL_STRERROR_R@
 HAVE_DECL_STRNDUP = @HAVE_DECL_STRNDUP@
@@ -840,6 +1013,10 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@
 HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@
 HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@
 HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@
+HAVE_DECL_TANL = @HAVE_DECL_TANL@
+HAVE_DECL_TRUNC = @HAVE_DECL_TRUNC@
+HAVE_DECL_TRUNCF = @HAVE_DECL_TRUNCF@
+HAVE_DECL_TRUNCL = @HAVE_DECL_TRUNCL@
 HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@
 HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@
 HAVE_DECL_VSNPRINTF = @HAVE_DECL_VSNPRINTF@
@@ -851,6 +1028,12 @@ HAVE_DUP2 = @HAVE_DUP2@
 HAVE_DUP3 = @HAVE_DUP3@
 HAVE_DUPLOCALE = @HAVE_DUPLOCALE@
 HAVE_EUIDACCESS = @HAVE_EUIDACCESS@
+HAVE_EXPF = @HAVE_EXPF@
+HAVE_EXPL = @HAVE_EXPL@
+HAVE_EXPM1 = @HAVE_EXPM1@
+HAVE_EXPM1F = @HAVE_EXPM1F@
+HAVE_FABSF = @HAVE_FABSF@
+HAVE_FABSL = @HAVE_FABSL@
 HAVE_FACCESSAT = @HAVE_FACCESSAT@
 HAVE_FCHDIR = @HAVE_FCHDIR@
 HAVE_FCHMODAT = @HAVE_FCHMODAT@
@@ -861,6 +1044,12 @@ HAVE_FDOPENDIR = @HAVE_FDOPENDIR@
 HAVE_FEATURES_H = @HAVE_FEATURES_H@
 HAVE_FFSL = @HAVE_FFSL@
 HAVE_FFSLL = @HAVE_FFSLL@
+HAVE_FMA = @HAVE_FMA@
+HAVE_FMAF = @HAVE_FMAF@
+HAVE_FMAL = @HAVE_FMAL@
+HAVE_FMODF = @HAVE_FMODF@
+HAVE_FMODL = @HAVE_FMODL@
+HAVE_FREXPF = @HAVE_FREXPF@
 HAVE_FSEEKO = @HAVE_FSEEKO@
 HAVE_FSTATAT = @HAVE_FSTATAT@
 HAVE_FSYNC = @HAVE_FSYNC@
@@ -883,9 +1072,18 @@ HAVE_GIJ_IN_PATH = @HAVE_GIJ_IN_PATH@
 HAVE_GLOBAL_SYMBOL_PIPE = @HAVE_GLOBAL_SYMBOL_PIPE@
 HAVE_GRANTPT = @HAVE_GRANTPT@
 HAVE_GROUP_MEMBER = @HAVE_GROUP_MEMBER@
+HAVE_HYPOTF = @HAVE_HYPOTF@
+HAVE_HYPOTL = @HAVE_HYPOTL@
+HAVE_ILOGB = @HAVE_ILOGB@
+HAVE_ILOGBF = @HAVE_ILOGBF@
+HAVE_ILOGBL = @HAVE_ILOGBL@
 HAVE_ILRUN = @HAVE_ILRUN@
 HAVE_ILRUN_IN_PATH = @HAVE_ILRUN_IN_PATH@
 HAVE_INTTYPES_H = @HAVE_INTTYPES_H@
+HAVE_ISBLANK = @HAVE_ISBLANK@
+HAVE_ISNAND = @HAVE_ISNAND@
+HAVE_ISNANF = @HAVE_ISNANF@
+HAVE_ISNANL = @HAVE_ISNANL@
 HAVE_ISWBLANK = @HAVE_ISWBLANK@
 HAVE_ISWCNTRL = @HAVE_ISWCNTRL@
 HAVE_JAVA = @HAVE_JAVA@
@@ -907,12 +1105,22 @@ HAVE_LANGINFO_T_FMT_AMPM = @HAVE_LANGINFO_T_FMT_AMPM@
 HAVE_LANGINFO_YESEXPR = @HAVE_LANGINFO_YESEXPR@
 HAVE_LCHMOD = @HAVE_LCHMOD@
 HAVE_LCHOWN = @HAVE_LCHOWN@
-HAVE_LIBEXPAT = @HAVE_LIBEXPAT@
+HAVE_LDEXPF = @HAVE_LDEXPF@
 HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@
 HAVE_LINK = @HAVE_LINK@
 HAVE_LINKAT = @HAVE_LINKAT@
+HAVE_LOG10F = @HAVE_LOG10F@
+HAVE_LOG10L = @HAVE_LOG10L@
+HAVE_LOG1P = @HAVE_LOG1P@
+HAVE_LOG1PF = @HAVE_LOG1PF@
+HAVE_LOG1PL = @HAVE_LOG1PL@
+HAVE_LOGBF = @HAVE_LOGBF@
+HAVE_LOGBL = @HAVE_LOGBL@
+HAVE_LOGF = @HAVE_LOGF@
+HAVE_LOGL = @HAVE_LOGL@
 HAVE_LONG_LONG_INT = @HAVE_LONG_LONG_INT@
 HAVE_LSTAT = @HAVE_LSTAT@
+HAVE_MAX_ALIGN_T = @HAVE_MAX_ALIGN_T@
 HAVE_MBRLEN = @HAVE_MBRLEN@
 HAVE_MBRTOWC = @HAVE_MBRTOWC@
 HAVE_MBSINIT = @HAVE_MBSINIT@
@@ -933,6 +1141,8 @@ HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
 HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
 HAVE_MKSTEMP = @HAVE_MKSTEMP@
 HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_MODFF = @HAVE_MODFF@
+HAVE_MODFL = @HAVE_MODFL@
 HAVE_MONO = @HAVE_MONO@
 HAVE_MONO_IN_PATH = @HAVE_MONO_IN_PATH@
 HAVE_MSVC_INVALID_PARAMETER_HANDLER = @HAVE_MSVC_INVALID_PARAMETER_HANDLER@
@@ -952,6 +1162,7 @@ HAVE_POSIX_SIGNALBLOCKING = @HAVE_POSIX_SIGNALBLOCKING@
 HAVE_POSIX_SPAWN = @HAVE_POSIX_SPAWN@
 HAVE_POSIX_SPAWNATTR_T = @HAVE_POSIX_SPAWNATTR_T@
 HAVE_POSIX_SPAWN_FILE_ACTIONS_T = @HAVE_POSIX_SPAWN_FILE_ACTIONS_T@
+HAVE_POWF = @HAVE_POWF@
 HAVE_PREAD = @HAVE_PREAD@
 HAVE_PSELECT = @HAVE_PSELECT@
 HAVE_PTHREAD_SIGMASK = @HAVE_PTHREAD_SIGMASK@
@@ -967,9 +1178,14 @@ HAVE_READDIR = @HAVE_READDIR@
 HAVE_READLINK = @HAVE_READLINK@
 HAVE_READLINKAT = @HAVE_READLINKAT@
 HAVE_REALPATH = @HAVE_REALPATH@
+HAVE_REMAINDER = @HAVE_REMAINDER@
+HAVE_REMAINDERF = @HAVE_REMAINDERF@
 HAVE_RENAMEAT = @HAVE_RENAMEAT@
 HAVE_REWINDDIR = @HAVE_REWINDDIR@
+HAVE_RINT = @HAVE_RINT@
+HAVE_RINTL = @HAVE_RINTL@
 HAVE_RPMATCH = @HAVE_RPMATCH@
+HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = @HAVE_SAME_LONG_DOUBLE_AS_DOUBLE@
 HAVE_SCANDIR = @HAVE_SCANDIR@
 HAVE_SCHED_H = @HAVE_SCHED_H@
 HAVE_SECURE_GETENV = @HAVE_SECURE_GETENV@
@@ -982,9 +1198,14 @@ HAVE_SIGNED_SIG_ATOMIC_T = @HAVE_SIGNED_SIG_ATOMIC_T@
 HAVE_SIGNED_WCHAR_T = @HAVE_SIGNED_WCHAR_T@
 HAVE_SIGNED_WINT_T = @HAVE_SIGNED_WINT_T@
 HAVE_SIGSET_T = @HAVE_SIGSET_T@
+HAVE_SINF = @HAVE_SINF@
+HAVE_SINHF = @HAVE_SINHF@
+HAVE_SINL = @HAVE_SINL@
 HAVE_SLEEP = @HAVE_SLEEP@
 HAVE_SNPRINTF = @HAVE_SNPRINTF@
 HAVE_SPAWN_H = @HAVE_SPAWN_H@
+HAVE_SQRTF = @HAVE_SQRTF@
+HAVE_SQRTL = @HAVE_SQRTL@
 HAVE_STDINT_H = @HAVE_STDINT_H@
 HAVE_STPCPY = @HAVE_STPCPY@
 HAVE_STPNCPY = @HAVE_STPNCPY@
@@ -1010,7 +1231,11 @@ HAVE_SYS_PARAM_H = @HAVE_SYS_PARAM_H@
 HAVE_SYS_SELECT_H = @HAVE_SYS_SELECT_H@
 HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@
 HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@
+HAVE_TANF = @HAVE_TANF@
+HAVE_TANHF = @HAVE_TANHF@
+HAVE_TANL = @HAVE_TANL@
 HAVE_TIMEGM = @HAVE_TIMEGM@
+HAVE_TIMEZONE_T = @HAVE_TIMEZONE_T@
 HAVE_TYPE_VOLATILE_SIG_ATOMIC_T = @HAVE_TYPE_VOLATILE_SIG_ATOMIC_T@
 HAVE_UNISTD_H = @HAVE_UNISTD_H@
 HAVE_UNLINKAT = @HAVE_UNLINKAT@
@@ -1086,13 +1311,16 @@ INTLOBJS = @INTLOBJS@
 INTL_DEFAULT_VERBOSITY = @INTL_DEFAULT_VERBOSITY@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
 INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ISINF_LIBM = @ISINF_LIBM@
+ISNAND_LIBM = @ISNAND_LIBM@
+ISNANF_LIBM = @ISNANF_LIBM@
+ISNANL_LIBM = @ISNANL_LIBM@
+ISNAN_LIBM = @ISNAN_LIBM@
 JAR = @JAR@
 JAVA_CHOICE = @JAVA_CHOICE@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBCROCO = @LIBCROCO@
-LIBEXPAT = @LIBEXPAT@
-LIBEXPAT_PREFIX = @LIBEXPAT_PREFIX@
 LIBGLIB = @LIBGLIB@
 LIBGLIB_H = @LIBGLIB_H@
 LIBGREP_LIBDEPS = @LIBGREP_LIBDEPS@
@@ -1111,6 +1339,7 @@ LIBTOOL = @LIBTOOL@
 LIBUNISTRING = @LIBUNISTRING@
 LIBUNISTRING_PREFIX = @LIBUNISTRING_PREFIX@
 LIBUNISTRING_UNICONV_H = @LIBUNISTRING_UNICONV_H@
+LIBUNISTRING_UNICTYPE_H = @LIBUNISTRING_UNICTYPE_H@
 LIBUNISTRING_UNILBRK_H = @LIBUNISTRING_UNILBRK_H@
 LIBUNISTRING_UNINAME_H = @LIBUNISTRING_UNINAME_H@
 LIBUNISTRING_UNISTR_H = @LIBUNISTRING_UNISTR_H@
@@ -1119,6 +1348,7 @@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@
 LIBXML = @LIBXML@
 LIBXML_H = @LIBXML_H@
 LIB_ACL = @LIB_ACL@
+LIB_HAS_ACL = @LIB_HAS_ACL@
 LIB_POSIX_SPAWN = @LIB_POSIX_SPAWN@
 LIPO = @LIPO@
 LN_S = @LN_S@
@@ -1128,9 +1358,9 @@ LOCALE_FR_UTF8 = @LOCALE_FR_UTF8@
 LOCALE_JA = @LOCALE_JA@
 LOCALE_TR_UTF8 = @LOCALE_TR_UTF8@
 LOCALE_ZH_CN = @LOCALE_ZH_CN@
+LOG10_LIBM = @LOG10_LIBM@
 LTLIBC = @LTLIBC@
 LTLIBCROCO = @LTLIBCROCO@
-LTLIBEXPAT = @LTLIBEXPAT@
 LTLIBGLIB = @LTLIBGLIB@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
@@ -1141,6 +1371,7 @@ LTLIBTERMINFO = @LTLIBTERMINFO@
 LTLIBTHREAD = @LTLIBTHREAD@
 LTLIBUNISTRING = @LTLIBUNISTRING@
 LTLIBXML = @LTLIBXML@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = env LANG= LC_MESSAGES= LC_ALL= LANGUAGE= @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -1150,6 +1381,7 @@ MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MSGMERGE_LIBM = @MSGMERGE_LIBM@
+NEXT_AS_FIRST_DIRECTIVE_CTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_CTYPE_H@
 NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
 NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
 NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
@@ -1159,6 +1391,7 @@ NEXT_AS_FIRST_DIRECTIVE_ICONV_H = @NEXT_AS_FIRST_DIRECTIVE_ICONV_H@
 NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@
 NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H = @NEXT_AS_FIRST_DIRECTIVE_LANGINFO_H@
 NEXT_AS_FIRST_DIRECTIVE_LOCALE_H = @NEXT_AS_FIRST_DIRECTIVE_LOCALE_H@
+NEXT_AS_FIRST_DIRECTIVE_MATH_H = @NEXT_AS_FIRST_DIRECTIVE_MATH_H@
 NEXT_AS_FIRST_DIRECTIVE_SCHED_H = @NEXT_AS_FIRST_DIRECTIVE_SCHED_H@
 NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H = @NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H@
 NEXT_AS_FIRST_DIRECTIVE_SPAWN_H = @NEXT_AS_FIRST_DIRECTIVE_SPAWN_H@
@@ -1177,6 +1410,7 @@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@
 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@
 NEXT_AS_FIRST_DIRECTIVE_WCHAR_H = @NEXT_AS_FIRST_DIRECTIVE_WCHAR_H@
 NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H = @NEXT_AS_FIRST_DIRECTIVE_WCTYPE_H@
+NEXT_CTYPE_H = @NEXT_CTYPE_H@
 NEXT_DIRENT_H = @NEXT_DIRENT_H@
 NEXT_ERRNO_H = @NEXT_ERRNO_H@
 NEXT_FCNTL_H = @NEXT_FCNTL_H@
@@ -1186,6 +1420,7 @@ NEXT_ICONV_H = @NEXT_ICONV_H@
 NEXT_INTTYPES_H = @NEXT_INTTYPES_H@
 NEXT_LANGINFO_H = @NEXT_LANGINFO_H@
 NEXT_LOCALE_H = @NEXT_LOCALE_H@
+NEXT_MATH_H = @NEXT_MATH_H@
 NEXT_SCHED_H = @NEXT_SCHED_H@
 NEXT_SIGNAL_H = @NEXT_SIGNAL_H@
 NEXT_SPAWN_H = @NEXT_SPAWN_H@
@@ -1216,12 +1451,14 @@ PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_SUFFIX = @PACKAGE_SUFFIX@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 POSUB = @POSUB@
+POW_LIBM = @POW_LIBM@
 PRAGMA_COLUMNS = @PRAGMA_COLUMNS@
 PRAGMA_SYSTEM_HEADER = @PRAGMA_SYSTEM_HEADER@
 PRIPTR_PREFIX = @PRIPTR_PREFIX@
@@ -1240,6 +1477,11 @@ RELOCATABLE_STRIP = @RELOCATABLE_STRIP@
 REPLACE_BTOWC = @REPLACE_BTOWC@
 REPLACE_CALLOC = @REPLACE_CALLOC@
 REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@
+REPLACE_CBRTF = @REPLACE_CBRTF@
+REPLACE_CBRTL = @REPLACE_CBRTL@
+REPLACE_CEIL = @REPLACE_CEIL@
+REPLACE_CEILF = @REPLACE_CEILF@
+REPLACE_CEILL = @REPLACE_CEILL@
 REPLACE_CHOWN = @REPLACE_CHOWN@
 REPLACE_CLOSE = @REPLACE_CLOSE@
 REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@
@@ -1248,16 +1490,33 @@ REPLACE_DPRINTF = @REPLACE_DPRINTF@
 REPLACE_DUP = @REPLACE_DUP@
 REPLACE_DUP2 = @REPLACE_DUP2@
 REPLACE_DUPLOCALE = @REPLACE_DUPLOCALE@
+REPLACE_EXP2 = @REPLACE_EXP2@
+REPLACE_EXP2L = @REPLACE_EXP2L@
+REPLACE_EXPM1 = @REPLACE_EXPM1@
+REPLACE_EXPM1F = @REPLACE_EXPM1F@
+REPLACE_FABSL = @REPLACE_FABSL@
 REPLACE_FCHOWNAT = @REPLACE_FCHOWNAT@
 REPLACE_FCLOSE = @REPLACE_FCLOSE@
 REPLACE_FCNTL = @REPLACE_FCNTL@
 REPLACE_FDOPEN = @REPLACE_FDOPEN@
 REPLACE_FDOPENDIR = @REPLACE_FDOPENDIR@
 REPLACE_FFLUSH = @REPLACE_FFLUSH@
+REPLACE_FLOOR = @REPLACE_FLOOR@
+REPLACE_FLOORF = @REPLACE_FLOORF@
+REPLACE_FLOORL = @REPLACE_FLOORL@
+REPLACE_FMA = @REPLACE_FMA@
+REPLACE_FMAF = @REPLACE_FMAF@
+REPLACE_FMAL = @REPLACE_FMAL@
+REPLACE_FMOD = @REPLACE_FMOD@
+REPLACE_FMODF = @REPLACE_FMODF@
+REPLACE_FMODL = @REPLACE_FMODL@
 REPLACE_FOPEN = @REPLACE_FOPEN@
 REPLACE_FPRINTF = @REPLACE_FPRINTF@
 REPLACE_FPURGE = @REPLACE_FPURGE@
 REPLACE_FREOPEN = @REPLACE_FREOPEN@
+REPLACE_FREXP = @REPLACE_FREXP@
+REPLACE_FREXPF = @REPLACE_FREXPF@
+REPLACE_FREXPL = @REPLACE_FREXPL@
 REPLACE_FSEEK = @REPLACE_FSEEK@
 REPLACE_FSEEKO = @REPLACE_FSEEKO@
 REPLACE_FSTAT = @REPLACE_FSTAT@
@@ -1276,19 +1535,44 @@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@
 REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@
 REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@
 REPLACE_GMTIME = @REPLACE_GMTIME@
+REPLACE_HUGE_VAL = @REPLACE_HUGE_VAL@
+REPLACE_HYPOT = @REPLACE_HYPOT@
+REPLACE_HYPOTF = @REPLACE_HYPOTF@
+REPLACE_HYPOTL = @REPLACE_HYPOTL@
 REPLACE_ICONV = @REPLACE_ICONV@
 REPLACE_ICONV_OPEN = @REPLACE_ICONV_OPEN@
 REPLACE_ICONV_UTF = @REPLACE_ICONV_UTF@
+REPLACE_ILOGB = @REPLACE_ILOGB@
+REPLACE_ILOGBF = @REPLACE_ILOGBF@
 REPLACE_ISATTY = @REPLACE_ISATTY@
+REPLACE_ISFINITE = @REPLACE_ISFINITE@
+REPLACE_ISINF = @REPLACE_ISINF@
+REPLACE_ISNAN = @REPLACE_ISNAN@
 REPLACE_ISWBLANK = @REPLACE_ISWBLANK@
 REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@
 REPLACE_ITOLD = @REPLACE_ITOLD@
 REPLACE_LCHOWN = @REPLACE_LCHOWN@
+REPLACE_LDEXPL = @REPLACE_LDEXPL@
 REPLACE_LINK = @REPLACE_LINK@
 REPLACE_LINKAT = @REPLACE_LINKAT@
 REPLACE_LOCALECONV = @REPLACE_LOCALECONV@
 REPLACE_LOCALTIME = @REPLACE_LOCALTIME@
 REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@
+REPLACE_LOG = @REPLACE_LOG@
+REPLACE_LOG10 = @REPLACE_LOG10@
+REPLACE_LOG10F = @REPLACE_LOG10F@
+REPLACE_LOG10L = @REPLACE_LOG10L@
+REPLACE_LOG1P = @REPLACE_LOG1P@
+REPLACE_LOG1PF = @REPLACE_LOG1PF@
+REPLACE_LOG1PL = @REPLACE_LOG1PL@
+REPLACE_LOG2 = @REPLACE_LOG2@
+REPLACE_LOG2F = @REPLACE_LOG2F@
+REPLACE_LOG2L = @REPLACE_LOG2L@
+REPLACE_LOGB = @REPLACE_LOGB@
+REPLACE_LOGBF = @REPLACE_LOGBF@
+REPLACE_LOGBL = @REPLACE_LOGBL@
+REPLACE_LOGF = @REPLACE_LOGF@
+REPLACE_LOGL = @REPLACE_LOGL@
 REPLACE_LSEEK = @REPLACE_LSEEK@
 REPLACE_LSTAT = @REPLACE_LSTAT@
 REPLACE_MALLOC = @REPLACE_MALLOC@
@@ -1306,6 +1590,10 @@ REPLACE_MKFIFO = @REPLACE_MKFIFO@
 REPLACE_MKNOD = @REPLACE_MKNOD@
 REPLACE_MKSTEMP = @REPLACE_MKSTEMP@
 REPLACE_MKTIME = @REPLACE_MKTIME@
+REPLACE_MODF = @REPLACE_MODF@
+REPLACE_MODFF = @REPLACE_MODFF@
+REPLACE_MODFL = @REPLACE_MODFL@
+REPLACE_NAN = @REPLACE_NAN@
 REPLACE_NANOSLEEP = @REPLACE_NANOSLEEP@
 REPLACE_NL_LANGINFO = @REPLACE_NL_LANGINFO@
 REPLACE_NULL = @REPLACE_NULL@
@@ -1335,16 +1623,25 @@ REPLACE_READLINK = @REPLACE_READLINK@
 REPLACE_READLINKAT = @REPLACE_READLINKAT@
 REPLACE_REALLOC = @REPLACE_REALLOC@
 REPLACE_REALPATH = @REPLACE_REALPATH@
+REPLACE_REMAINDER = @REPLACE_REMAINDER@
+REPLACE_REMAINDERF = @REPLACE_REMAINDERF@
+REPLACE_REMAINDERL = @REPLACE_REMAINDERL@
 REPLACE_REMOVE = @REPLACE_REMOVE@
 REPLACE_RENAME = @REPLACE_RENAME@
 REPLACE_RENAMEAT = @REPLACE_RENAMEAT@
 REPLACE_RMDIR = @REPLACE_RMDIR@
+REPLACE_ROUND = @REPLACE_ROUND@
+REPLACE_ROUNDF = @REPLACE_ROUNDF@
+REPLACE_ROUNDL = @REPLACE_ROUNDL@
 REPLACE_SELECT = @REPLACE_SELECT@
 REPLACE_SETENV = @REPLACE_SETENV@
 REPLACE_SETLOCALE = @REPLACE_SETLOCALE@
+REPLACE_SIGNBIT = @REPLACE_SIGNBIT@
+REPLACE_SIGNBIT_USING_GCC = @REPLACE_SIGNBIT_USING_GCC@
 REPLACE_SLEEP = @REPLACE_SLEEP@
 REPLACE_SNPRINTF = @REPLACE_SNPRINTF@
 REPLACE_SPRINTF = @REPLACE_SPRINTF@
+REPLACE_SQRTL = @REPLACE_SQRTL@
 REPLACE_STAT = @REPLACE_STAT@
 REPLACE_STDIO_READ_FUNCS = @REPLACE_STDIO_READ_FUNCS@
 REPLACE_STDIO_WRITE_FUNCS = @REPLACE_STDIO_WRITE_FUNCS@
@@ -1370,6 +1667,9 @@ REPLACE_SYMLINKAT = @REPLACE_SYMLINKAT@
 REPLACE_TIMEGM = @REPLACE_TIMEGM@
 REPLACE_TMPFILE = @REPLACE_TMPFILE@
 REPLACE_TOWLOWER = @REPLACE_TOWLOWER@
+REPLACE_TRUNC = @REPLACE_TRUNC@
+REPLACE_TRUNCF = @REPLACE_TRUNCF@
+REPLACE_TRUNCL = @REPLACE_TRUNCL@
 REPLACE_TTYNAME_R = @REPLACE_TTYNAME_R@
 REPLACE_UNLINK = @REPLACE_UNLINK@
 REPLACE_UNLINKAT = @REPLACE_UNLINKAT@
@@ -1396,6 +1696,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@
 SIZE_T_SUFFIX = @SIZE_T_SUFFIX@
+STDALIGN_H = @STDALIGN_H@
 STDARG_H = @STDARG_H@
 STDBOOL_H = @STDBOOL_H@
 STDDEF_H = @STDDEF_H@
@@ -1415,6 +1716,7 @@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@
 UINT32_MAX_LT_UINTMAX_MAX = @UINT32_MAX_LT_UINTMAX_MAX@
 UINT64_MAX_EQ_ULONG_MAX = @UINT64_MAX_EQ_ULONG_MAX@
 UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@
+UNISTD_H_DEFINES_STRUCT_TIMESPEC = @UNISTD_H_DEFINES_STRUCT_TIMESPEC@
 UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@
 UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
 USE_ACL = @USE_ACL@
@@ -1508,7 +1810,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = 1.2 gnits
 EXTRA_DIST = $(doc_DATA) iso-639.sed iso-639-2.sed iso-3166.sed \
-	ISO_639 ISO_639-2 ISO_3166 ISO_3166_de texi2html ChangeLog.0
+	ISO_639 ISO_639-2 ISO_3166 ISO_3166_de texi2html
 
 # Temporary index files. automake removes only the predefined ones by itself.
 MOSTLYCLEANFILES = gettext.am gettext.ams gettext.cp gettext.cps \
@@ -1566,7 +1868,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnits doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --gnits doc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -1640,7 +1941,7 @@ gettext.pdf: gettext.texi $(srcdir)/version.texi $(gettext_TEXINFOS)
 $(srcdir)/version.texi:  $(srcdir)/stamp-vti
 
 mostlyclean-vti:
-	-rm -f vti.tmp
+	-rm -f vti.tmp* $(srcdir)/version.texi.tmp*
 
 maintainer-clean-vti:
 	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
@@ -2016,6 +2317,8 @@ uninstall-am: uninstall-docDATA uninstall-dvi-am uninstall-html-am \
 	uninstall-html-am uninstall-info-am uninstall-local \
 	uninstall-pdf-am uninstall-ps-am
 
+.PRECIOUS: Makefile
+
 
 iso-639.texi: ISO_639 iso-639.sed
 	$(SED) -f $(srcdir)/iso-639.sed $(srcdir)/ISO_639 > iso-639.tmp
@@ -2041,7 +2344,8 @@ $(srcdir)/stamp-vti: $(info_TEXINFOS) $(gettext_TEXINFOS) $(top_srcdir)/../.vers
 	echo "@set UPDATED $$1 $$2 $$3"; \
 	echo "@set UPDATED-MONTH $$2 $$3"; \
 	echo "@set EDITION $(VERSION)"; \
-	echo "@set VERSION $(VERSION)") > vti.tmp
+	echo "@set VERSION $(VERSION)"; \
+	echo "@set ARCHIVE-VERSION $(ARCHIVE_VERSION)") > vti.tmp
 	cmp -s vti.tmp version.texi \
 	  || (echo "Updating version.texi"; \
 	      cp vti.tmp version.texi)
diff --git a/gettext-tools/doc/autopoint.texi b/gettext-tools/doc/autopoint.texi
index a2827ed..264bd78 100644
--- a/gettext-tools/doc/autopoint.texi
+++ b/gettext-tools/doc/autopoint.texi
@@ -11,6 +11,13 @@ into a source package.  It extracts from a macro call of the form
 used by the package, and copies the infrastructure files belonging to
 this version into the package.
 
+To extract the latest available infrastructure which satisfies a version
+requirement, then you can use the form
+@code{AM_GNU_GETTEXT_REQUIRE_VERSION(@var{version})} instead.  For
+example, if gettext @value{ARCHIVE-VERSION} is installed on your system
+and @code{0.19.1} is requested, then the infrastructure files of version
+@value{ARCHIVE-VERSION} will be copied into a source package.
+
 @subsubsection Options
 
 @table @samp
@@ -43,10 +50,11 @@ Output version information and exit.
 
 @end table
 
-@code{autopoint} supports the GNU @code{gettext} versions from 0.10.35 to
-the current one, @value{VERSION}.  In order to apply @code{autopoint} to
-a package using a @code{gettext} version newer than @value{VERSION}, you
-need to install this same version of GNU @code{gettext} at least.
+@code{autopoint} supports the GNU @code{gettext} versions from 0.10.35
+to the current one, @value{ARCHIVE-VERSION}.  In order to apply
+@code{autopoint} to a package using a @code{gettext} version newer than
+@value{ARCHIVE-VERSION}, you need to install this same version of GNU
+@code{gettext} at least.
 
 In packages using GNU @code{automake}, an invocation of @code{autopoint}
 should be followed by invocations of @code{aclocal} and then @code{autoconf}
diff --git a/gettext-tools/doc/gettext.info b/gettext-tools/doc/gettext.info
index 61424c1..e742da7 100644
--- a/gettext-tools/doc/gettext.info
+++ b/gettext-tools/doc/gettext.info
@@ -1,7 +1,7 @@
 This is gettext.info, produced by makeinfo version 5.2 from
 gettext.texi.
 
-   Copyright (C) 1995-1998, 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 1995-1998, 2001-2015 Free Software Foundation, Inc.
 
    This manual is free documentation.  It is dually licensed under the
 GNU FDL and the GNU GPL. This means that you can redistribute this
@@ -55,7 +55,7 @@ GNU ‘gettext’ utilities
 ***********************
 
    This manual documents the GNU gettext tools and the GNU libintl
-library, version 0.19.4.
+library, version 0.19.7.
 
 * Menu:
 
@@ -350,6 +350,7 @@ Individual Programming Languages
 * GCC-source::                  GNU Compiler Collection sources
 * Lua::                         Lua
 * JavaScript::                  JavaScript
+* Vala::                        Vala
 
 sh - Shell Script
 
@@ -379,6 +380,8 @@ Internationalizable Data
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
 * GSettings::                   GSettings - GNOME user configuration schema
+* AppData::                     AppData - freedesktop.org application description
+* Preparing ITS Rules::         Preparing Rules for XML Internationalization
 
 Concluding Remarks
 
@@ -2215,7 +2218,7 @@ along with the following one:
 
      {
        static const char *messages[] = {
-         gettext_noop ("some very meaningful message",
+         gettext_noop ("some very meaningful message"),
          gettext_noop ("and another one")
        };
        const char *string;
@@ -2582,6 +2585,48 @@ extension.
      The second comment line will not be extracted, because there is one
      blank line between the comment line and the keyword.
 
+‘--check[=CHECK]’
+     Perform a syntax check on msgid and msgid_plural.  The supported
+     checks are:
+
+     ‘ellipsis-unicode’
+          Prefer Unicode ellipsis character over ASCII ‘...’
+
+     ‘space-ellipsis’
+          Prohibit whitespace before an ellipsis character
+
+     ‘quote-unicode’
+          Prefer Unicode quotation marks over ASCII ‘"'`’
+
+     The option has an effect on all input files.  To enable or disable
+     checks for a certain string, you can mark it with an ‘xgettext:’
+     special comment in the source file.  For example, if you specify
+     the ‘--check=space-ellipsis’ option, but want to suppress the check
+     on a particular string, add the following comment:
+
+          /* xgettext: no-space-ellipsis-check */
+          gettext ("We really want a space before ellipsis here ...");
+
+     The ‘xgettext:’ comment can be followed by flags separated with a
+     comma.  The possible flags are of the form ‘[no-]NAME-check’, where
+     NAME is the name of a valid syntax check.  If a flag is prefixed by
+     ‘no-’, the meaning is negated.
+
+     Some tests apply the checks to each sentence within the msgid,
+     rather than the whole string.  xgettext detects the end of sentence
+     by performing a pattern match, which usually looks for a period
+     followed by a certain number of spaces.  The number is specified
+     with the ‘--sentence-end’ option.
+
+‘--sentence-end[=TYPE]’
+     The supported values are:
+
+     ‘single-space’
+          Expect at least one whitespace after a period
+
+     ‘double-space’
+          Expect at least two whitespaces after a period
+
 5.1.6 Language specific options
 -------------------------------
 
@@ -2757,7 +2802,7 @@ extension.
 ‘--debug’
      Use the flags ‘c-format’ and ‘possible-c-format’ to show who was
      responsible for marking a message as a format string.  The latter
-     form is used if the ‘xgettext’ program decided, the format form is
+     form is used if the ‘xgettext’ program decided, the former form is
      used if the programmer prescribed it.
 
      By default only the ‘c-format’ form is used.  The translator should
@@ -2815,6 +2860,14 @@ adjacent strings, and escaped end of lines for continued strings.
      Write out a NeXTstep/GNUstep localized resource file in ‘.strings’
      syntax.  Note that this file format doesn’t support plural forms.
 
+‘--its=FILE’
+     Use ITS rules defined in FILE.  Note that this is only effective
+     with XML files.
+
+‘--itstool’
+     Write out comments recognized by itstool (<http://itstool.org>).
+     Note that this is only effective with XML files.
+
 ‘-w NUMBER’
 ‘--width=NUMBER’
      Set the output page width.  Long strings in the output files will
@@ -2881,7 +2934,7 @@ adjacent strings, and escaped end of lines for continued strings.
      address or URL to which the translators shall report bugs in the
      untranslated strings:
 
-        - Strings which are not entire sentences, see the maintainer
+        - Strings which are not entire sentences; see the maintainer
           guidelines in *note Preparing Strings::.
         - Strings which use unclear terms or require additional context
           to be understood.
@@ -2955,6 +3008,39 @@ File: gettext.info,  Node: msginit Invocation,  Next: Header Entry,  Prev: Creat
    The ‘msginit’ program creates a new PO file, initializing the meta
 information with values from the user’s environment.
 
+   Here are more details.  The following header fields of a PO file are
+automatically filled, when possible.
+
+‘Project-Id-Version’
+     The value is guessed from the ‘configure’ script or any other files
+     in the current directory.
+
+‘PO-Revision-Date’
+     The value is taken from the ‘PO-Creation-Data’ in the input POT
+     file, or the current date is used.
+
+‘Last-Translator’
+     The value is taken from user’s password file entry and the mailer
+     configuration files.
+
+‘Language-Team, Language’
+     These values are set according to the current locale and the
+     predefined list of translation teams.
+
+‘MIME-Version, Content-Type, Content-Transfer-Encoding’
+     These values are set according to the content of the POT file and
+     the current locale.  If the POT file contains charset=UTF-8, it
+     means that the POT file contains non-ASCII characters, and we keep
+     the UTF-8 encoding.  Otherwise, when the POT file is plain ASCII,
+     we use the locale’s encoding.
+
+‘Plural-Forms’
+     The value is first looked up from the embedded table.
+
+     As an experimental feature, you can instruct ‘msginit’ to use the
+     information from Unicode CLDR, by setting the ‘GETTEXTCLDRDIR’
+     environment variable.
+
 6.1.1 Input file location
 -------------------------
 
@@ -5381,6 +5467,10 @@ input and writes a modified translation to standard output.  A
 frequently used filter is ‘sed’.  A few particular built-in filters are
 also recognized.
 
+‘--newline’
+     Add newline at the end of each input line and also strip the ending
+     newline from the output line.
+
    Note: If the filter is not a built-in filter, you have to care about
 encodings: It is your responsibility to ensure that the FILTER can cope
 with input encoded in the translation catalog’s encoding.  If the FILTER
@@ -5393,12 +5483,13 @@ program and then make ‘msgfilter’ work in an UTF-8 locale, by using the
 ‘LC_ALL’ environment variable.
 
    Note: Most translations in a translation catalog don’t end with a
-newline character.  For this reason, it is important that the FILTER
-recognizes its last input line even if it ends without a newline, and
-that it doesn’t add an undesired trailing newline at the end.  The ‘sed’
-program on some platforms is known to ignore the last line of input if
-it is not terminated with a newline.  You can use GNU ‘sed’ instead; it
-does not have this limitation.
+newline character.  For this reason, unless the ‘--newline’ option is
+used, it is important that the FILTER recognizes its last input line
+even if it ends without a newline, and that it doesn’t add an undesired
+trailing newline at the end.  The ‘sed’ program on some platforms is
+known to ignore the last line of input if it is not terminated with a
+newline.  You can use GNU ‘sed’ instead; it does not have this
+limitation.
 
 9.4.4 Useful FILTER-OPTIONs when the FILTER is ‘sed’
 ----------------------------------------------------
@@ -6285,6 +6376,9 @@ code is the maximum return code across all invocations.
 followed by a null byte.  The output of ‘msgexec 0’ is suitable as input
 for ‘xargs -0’.
 
+‘--newline’
+     Add newline at the end of each input line.
+
    During each COMMAND invocation, the environment variable
 ‘MSGEXEC_MSGID’ is bound to the message’s msgid, and the environment
 variable ‘MSGEXEC_LOCATION’ is bound to the location in the PO file of
@@ -6914,6 +7008,9 @@ textual translation description.
 ‘--desktop’
      Desktop Entry mode: generate a ‘.desktop’ file.
 
+‘--xml’
+     XML mode: generate an XML file.
+
 10.1.3 Output file location
 ---------------------------
 
@@ -7011,7 +7108,8 @@ in the specified directory.
      form LL_CC.
 
 ‘-d DIRECTORY’
-     Specify the base directory of ‘.msg’ message catalogs.
+     Specify the directory where PO files are read.  The directory must
+     contain the ‘LINGUAS’ file.
 
    To generate a ‘.desktop’ file for a single locale, you can use it as
 follows.
@@ -7019,11 +7117,8 @@ follows.
      msgfmt --desktop --template=TEMPLATE --locale=LOCALE \
        -o FILE FILENAME.po …
 
-   On the other hand, when using msgfmt from a Makefile, it is
-cumbersome to loop over all locales under a particular directory.
-msgfmt provides a special operation mode for this use-case.  To generate
-a ‘.desktop’ file from multiple ‘.po’ files under a directory, specify
-the directory with the ‘-d’ option.
+   msgfmt provides a special "bulk" operation mode to process multiple
+‘.po’ files at a time.
 
      msgfmt --desktop --template=TEMPLATE -d DIRECTORY -o FILE
 
@@ -7034,7 +7129,44 @@ to a subset, through the ‘LINGUAS’ environment variable.
    For either operation modes, the ‘-o’ and ‘--template’ options are
 mandatory.
 
-10.1.8 Input file syntax
+10.1.8 XML mode operations
+--------------------------
+
+‘--template=TEMPLATE’
+     Specify an XML file used as a template.
+
+‘-L NAME’
+‘--language=NAME’
+     Specifies the language of the input files.
+
+‘-l LOCALE’
+‘--locale=LOCALE’
+     Specify the locale name, either a language specification of the
+     form LL or a combined language and country specification of the
+     form LL_CC.
+
+‘-d DIRECTORY’
+     Specify the base directory of ‘.po’ message catalogs.
+
+   To generate an XML file for a single locale, you can use it as
+follows.
+
+     msgfmt --xml --template=TEMPLATE --locale=LOCALE \
+       -o FILE FILENAME.po …
+
+   msgfmt provides a special "bulk" operation mode to process multiple
+‘.po’ files at a time.
+
+     msgfmt --xml --template=TEMPLATE -d DIRECTORY -o FILE
+
+   msgfmt first reads the ‘LINGUAS’ file under DIRECTORY, and then
+processes all ‘.po’ files listed there.  You can also limit the locales
+to a subset, through the ‘LINGUAS’ environment variable.
+
+   For either operation modes, the ‘-o’ and ‘--template’ options are
+mandatory.
+
+10.1.9 Input file syntax
 ------------------------
 
 ‘-P’
@@ -7046,8 +7178,8 @@ mandatory.
      Assume the input files are NeXTstep/GNUstep localized resource
      files in ‘.strings’ syntax, not in PO file syntax.
 
-10.1.9 Input file interpretation
---------------------------------
+10.1.10 Input file interpretation
+---------------------------------
 
 ‘-c’
 ‘--check’
@@ -7108,7 +7240,7 @@ mandatory.
      usually wrong, because fuzzy messages are exactly those which have
      not been validated by a human translator.
 
-10.1.10 Output details
+10.1.11 Output details
 ----------------------
 
 ‘-a NUMBER’
@@ -7132,7 +7264,7 @@ mandatory.
      Don’t include a hash table in the binary file.  Lookup will be more
      expensive at run time (binary search instead of hash table lookup).
 
-10.1.11 Informative output
+10.1.12 Informative output
 --------------------------
 
 ‘-h’
@@ -8152,6 +8284,8 @@ Only one form:
 
      Asian family
           Japanese, Vietnamese, Korean
+     Tai-Kadai family
+          Thai
 
 Two forms, singular used for one only
      This is the form used in most existing programs since it is what
@@ -8174,6 +8308,8 @@ Two forms, singular used for one only
           Finnish, Estonian
      Semitic family
           Hebrew
+     Austronesian family
+          Bahasa Indonesian
      Artificial
           Esperanto
 
@@ -8297,6 +8433,18 @@ Four forms, special case for one and all numbers ending in 02, 03, or 04
      Slavic family
           Slovenian
 
+Six forms, special cases for one, two, all numbers ending in 02, 03, … 10, all numbers ending in 11 … 99, and others
+     The header entry would look like this:
+
+          Plural-Forms: nplurals=6; \
+              plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 \
+              : n%100>=11 ? 4 : 5;
+
+     Languages with this property include:
+
+     Afroasiatic family
+          Arabic
+
    You might now ask, ‘ngettext’ handles only numbers N of type
 ‘unsigned long’.  What about larger integer types?  What about negative
 numbers?  What about floating-point numbers?
@@ -8339,7 +8487,11 @@ is acceptable in English, and similarly for other languages.
    ---------- Footnotes ----------
 
    (1) Additions are welcome.  Send appropriate information to
-<bug-gnu-gettext@gnu.org> and <bug-glibc-manual@gnu.org>.
+<bug-gnu-gettext@gnu.org> and <bug-glibc-manual@gnu.org>.  The Unicode
+CLDR Project (<http://cldr.unicode.org>) provides a comprehensive set of
+plural forms in a different format.  The ‘msginit’ program has
+preliminary support for the format so you can use it as a baseline
+(*note msginit Invocation::).
 
 
 File: gettext.info,  Node: Optimized gettext,  Prev: Plural forms,  Up: gettext
@@ -9640,11 +9792,11 @@ each.
 
    So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-‘gettext’ 0.19.4 distribution itself, or from the GNU ‘hello’
-distribution (<http://www.franken.de/users/gnu/ke/hello> or
-<http://www.gnu.franken.de/ke/hello/>) You may indeed refer to the
-source code of the GNU ‘gettext’ and GNU ‘hello’ packages, as they are
-intended to be good examples for using GNU gettext functionality.
+‘gettext’ 0.19.7 distribution itself, or from the GNU ‘hello’
+distribution (<http://www.gnu.org/software/hello>).  You may indeed
+refer to the source code of the GNU ‘gettext’ and GNU ‘hello’ packages,
+as they are intended to be good examples for using GNU gettext
+functionality.
 
 * Menu:
 
@@ -9797,7 +9949,7 @@ File: gettext.info,  Node: configure.ac,  Next: config.guess,  Prev: po/Rules-*,
      This is done by a set of lines like these:
 
           PACKAGE=gettext
-          VERSION=0.19.4
+          VERSION=0.19.7
           AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
           AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
           AC_SUBST(PACKAGE)
@@ -9805,12 +9957,12 @@ File: gettext.info,  Node: configure.ac,  Next: config.guess,  Prev: po/Rules-*,
 
      or, if you are using GNU ‘automake’, by a line like this:
 
-          AM_INIT_AUTOMAKE(gettext, 0.19.4)
+          AM_INIT_AUTOMAKE(gettext, 0.19.7)
 
      Of course, you replace ‘gettext’ with the name of your package, and
-     ‘0.19.4’ by its version numbers, exactly as they should appear in
+     ‘0.19.7’ by its version numbers, exactly as they should appear in
      the packaged ‘tar’ file name of your distribution
-     (‘gettext-0.19.4.tar.gz’, here).
+     (‘gettext-0.19.7.tar.gz’, here).
 
   2. Check for internationalization support.
 
@@ -10579,7 +10731,7 @@ into the repository.
 all the files that ‘gettextize’ mentions as "copy".  Instead, he adds to
 the ‘configure.ac’ or ‘configure.in’ a line of the form
 
-     AM_GNU_GETTEXT_VERSION(0.19.4)
+     AM_GNU_GETTEXT_VERSION(0.19.7)
 
 and adds to the package’s pre-build script an invocation of ‘autopoint’.
 For everyone who checks out the source, this ‘autopoint’ invocation will
@@ -10660,6 +10812,13 @@ or ‘configure.ac’ file, the gettext version used by the package, and
 copies the infrastructure files belonging to this version into the
 package.
 
+   To extract the latest available infrastructure which satisfies a
+version requirement, then you can use the form
+‘AM_GNU_GETTEXT_REQUIRE_VERSION(VERSION)’ instead.  For example, if
+gettext 0.19.7 is installed on your system and ‘0.19.1’ is requested,
+then the infrastructure files of version 0.19.7 will be copied into a
+source package.
+
 13.6.4.1 Options
 ................
 
@@ -10683,8 +10842,8 @@ package.
      Output version information and exit.
 
    ‘autopoint’ supports the GNU ‘gettext’ versions from 0.10.35 to the
-current one, 0.19.4.  In order to apply ‘autopoint’ to a package using a
-‘gettext’ version newer than 0.19.4, you need to install this same
+current one, 0.19.7.  In order to apply ‘autopoint’ to a package using a
+‘gettext’ version newer than 0.19.7, you need to install this same
 version of GNU ‘gettext’ at least.
 
    In packages using GNU ‘automake’, an invocation of ‘autopoint’ should
@@ -10901,6 +11060,7 @@ strings.
 * qt-format::                   Qt Format Strings
 * qt-plural-format::            Qt Plural Format Strings
 * kde-format::                  KDE Format Strings
+* kde-kuit-format::             KUIT Format Strings
 * boost-format::                Boost Format Strings
 * lua-format::                  Lua Format Strings
 * javascript-format::           JavaScript Format Strings
@@ -10984,9 +11144,9 @@ the Python built-in format operator ‘%’, labelled as ‘python-format’,
 and those acceptable to the ‘format’ method of the ‘str’ object.
 
    Python ‘%’ format strings are described in Python Library reference /
-2. Built-in Types, Exceptions and Functions / 2.2. Built-in Types / 2.2.6. Sequence Types
-/ 2.2.6.2. String Formatting Operations.
-<http://www.python.org/doc/2.2.1/lib/typesseq-strings.html>.
+5. Built-in Types / 5.6. Sequence Types /
+5.6.2. String Formatting Operations.
+<http://docs.python.org/2/library/stdtypes.html#string-formatting-operations>.
 
    Python brace format strings are described in
 PEP 3101 – Advanced String Formatting,
@@ -11194,7 +11354,7 @@ QObject::tr method <file:/usr/lib/qt-4.3.0/doc/html/qobject.html>.  In
 summary, the only allowed directive is ‘%n’.
 
 
-File: gettext.info,  Node: kde-format,  Next: boost-format,  Prev: qt-plural-format,  Up: Translators for other Languages
+File: gettext.info,  Node: kde-format,  Next: kde-kuit-format,  Prev: qt-plural-format,  Up: Translators for other Languages
 
 15.3.22 KDE Format Strings
 --------------------------
@@ -11205,9 +11365,24 @@ format strings, all of ‘%1’, ..., ‘%(n-1)’ must occur as well, except
 possibly one of them.
 
 
-File: gettext.info,  Node: boost-format,  Next: lua-format,  Prev: kde-format,  Up: Translators for other Languages
+File: gettext.info,  Node: kde-kuit-format,  Next: boost-format,  Prev: kde-format,  Up: Translators for other Languages
 
-15.3.23 Boost Format Strings
+15.3.23 KUIT Format Strings
+---------------------------
+
+   KUIT (KDE User Interface Text) is compatible with KDE 4 format
+strings, while it also allows programmers to add semantic information to
+a format string, through XML markup tags.  For example, if the first
+format directive in a string is a filename, programmers could indicate
+that with a ‘filename’ tag, like ‘<filename>%1</filename>’.
+
+   KUIT format strings are described in
+<http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/prg_guide.html#kuit_markup>.
+
+
+File: gettext.info,  Node: boost-format,  Next: lua-format,  Prev: kde-kuit-format,  Up: Translators for other Languages
+
+15.3.24 Boost Format Strings
 ----------------------------
 
    Boost format strings are described in the documentation of the
@@ -11221,7 +11396,7 @@ such as ‘%1%’.
 
 File: gettext.info,  Node: lua-format,  Next: javascript-format,  Prev: boost-format,  Up: Translators for other Languages
 
-15.3.24 Lua Format Strings
+15.3.25 Lua Format Strings
 --------------------------
 
    Lua format strings are described in the Lua reference manual, section
@@ -11231,7 +11406,7 @@ String Manipulation,
 
 File: gettext.info,  Node: javascript-format,  Prev: lua-format,  Up: Translators for other Languages
 
-15.3.25 JavaScript Format Strings
+15.3.26 JavaScript Format Strings
 ---------------------------------
 
    Although JavaScript specification itself does not define any format
@@ -11299,6 +11474,7 @@ File: gettext.info,  Node: List of Programming Languages,  Next: List of Data Fo
 * GCC-source::                  GNU Compiler Collection sources
 * Lua::                         Lua
 * JavaScript::                  JavaScript
+* Vala::                        Vala
 
 
 File: gettext.info,  Node: C,  Next: sh,  Prev: List of Programming Languages,  Up: List of Programming Languages
@@ -12545,7 +12721,8 @@ RPMs
      gawk 3.1 or newer
 
 File extension
-     ‘awk’
+     ‘awk’, ‘gawk’, ‘twjr’.  The file extension ‘twjr’ is used by
+     TexiWeb Jr (<https://github.com/arnoldrobbins/texiwebjr>).
 
 String syntax
      ‘"abc"’
@@ -13749,7 +13926,7 @@ po-mode marking
      —
 
 
-File: gettext.info,  Node: JavaScript,  Prev: Lua,  Up: List of Programming Languages
+File: gettext.info,  Node: JavaScript,  Next: Vala,  Prev: Lua,  Up: List of Programming Languages
 
 15.5.23 JavaScript
 ------------------
@@ -13800,6 +13977,58 @@ po-mode marking
      —
 
 
+File: gettext.info,  Node: Vala,  Prev: JavaScript,  Up: List of Programming Languages
+
+15.5.24 Vala
+------------
+
+RPMs
+     vala
+
+File extension
+     ‘vala’
+
+String syntax
+
+        • ‘"abc"’
+
+        • ‘"""abc"""’
+
+gettext shorthand
+     ‘_("abc")’
+
+gettext/ngettext functions
+     ‘gettext’, ‘dgettext’, ‘dcgettext’, ‘ngettext’, ‘dngettext’,
+     ‘dpgettext’, ‘dpgettext2’
+
+textdomain
+     ‘textdomain’ function, defined under the ‘Intl’ namespace
+
+bindtextdomain
+     ‘bindtextdomain’ function, defined under the ‘Intl’ namespace
+
+setlocale
+     Programmer must call ‘Intl.setlocale (LocaleCategory.ALL, "")’
+
+Prerequisite
+     —
+
+Use or emulate GNU gettext
+     Use
+
+Extractor
+     ‘xgettext’
+
+Formatting with positions
+     Same as for the C language.
+
+Portability
+     autoconf (gettext.m4) and #if ENABLE_NLS
+
+po-mode marking
+     yes
+
+
 File: gettext.info,  Node: List of Data Formats,  Prev: List of Programming Languages,  Up: Programming Languages
 
 15.6 Internationalizable Data
@@ -13814,6 +14043,8 @@ using GNU gettext.
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
 * GSettings::                   GSettings - GNOME user configuration schema
+* AppData::                     AppData - freedesktop.org application description
+* Preparing ITS Rules::  Preparing Rules for XML Internationalization
 
 
 File: gettext.info,  Node: POT,  Next: RST,  Prev: List of Data Formats,  Up: List of Data Formats
@@ -13862,7 +14093,7 @@ Extractor
      ‘intltool-extract’
 
 
-File: gettext.info,  Node: GSettings,  Prev: Glade,  Up: List of Data Formats
+File: gettext.info,  Node: GSettings,  Next: AppData,  Prev: Glade,  Up: List of Data Formats
 
 15.6.4 GSettings - GNOME user configuration schema
 --------------------------------------------------
@@ -13877,6 +14108,160 @@ Extractor
      ‘xgettext’, ‘intltool-extract’
 
 
+File: gettext.info,  Node: AppData,  Next: Preparing ITS Rules,  Prev: GSettings,  Up: List of Data Formats
+
+15.6.5 AppData - freedesktop.org application description
+--------------------------------------------------------
+
+RPMs
+     appdata-tools, appstream, libappstream-glib,
+     libappstream-glib-builder
+
+File extension
+     ‘appdata.xml’
+
+Extractor
+     ‘xgettext’, ‘intltool-extract’, ‘itstool’
+
+* Menu:
+
+
+File: gettext.info,  Node: Preparing ITS Rules,  Prev: AppData,  Up: List of Data Formats
+
+15.6.6 Preparing Rules for XML Internationalization
+---------------------------------------------------
+
+   Marking translatable strings in an XML file is done through a
+separate "rule" file, making use of the Internationalization Tag Set
+standard (ITS, <http://www.w3.org/TR/its20/>).  The currently supported
+ITS data categories are: ‘Translate’, ‘Localization Note’, ‘Elements
+Within Text’, and ‘Preserve Space’.  In addition to them, ‘xgettext’
+also recognizes the following extended data categories:
+
+‘Context’
+
+     This data category associates ‘msgctxt’ to the extracted text.  In
+     the global rule, the ‘contextRule’ element contains the following:
+
+        • A required ‘selector’ attribute.  It contains an absolute
+          selector that selects the nodes to which this rule applies.
+
+        • A required ‘contextPointer’ attribute that contains a relative
+          selector pointing to a node that holds the ‘msgctxt’ value.
+
+        • An optional ‘textPointer’ attribute that contains a relative
+          selector pointing to a node that holds the ‘msgid’ value.
+
+‘Escape Special Characters’
+
+     This data category indicates whether the special XML characters
+     (‘<’, ‘>’, ‘&’, ‘"’) are escaped with entity reference.  In the
+     global rule, the ‘escapeRule’ element contains the following:
+
+        • A required ‘selector’ attribute.  It contains an absolute
+          selector that selects the nodes to which this rule applies.
+
+        • A required ‘escape’ attribute with the value ‘yes’ or ‘no’.
+
+‘Extended Preserve Space’
+
+     This data category extends the standard ‘Preserve Space’ data
+     category with the additional value ‘trim’.  The value means to
+     remove the leading and trailing whitespaces of the content, but not
+     to normalize whitespaces in the middle.  In the global rule, the
+     ‘preserveSpaceRule’ element contains the following:
+
+        • A required ‘selector’ attribute.  It contains an absolute
+          selector that selects the nodes to which this rule applies.
+
+        • A required ‘space’ attribute with the value ‘default’,
+          ‘preserve’, or ‘trim’.
+
+   All those extended data categories can only be expressed with global
+rules, and the rule elements have to have the
+‘https://www.gnu.org/s/gettext/ns/its/extensions/1.0’ namespace.
+
+   Given the following XML document in a file ‘messages.xml’:
+
+     <?xml version="1.0"?>
+     <messages>
+       <message>
+         <p>A translatable string</p>
+       </message>
+       <message>
+         <p translatable="no">A non-translatable string</p>
+       </message>
+     </messages>
+
+   To extract the first text content ("A translatable string"), but not
+the second ("A non-translatable string"), the following ITS rules can be
+used:
+
+     <?xml version="1.0"?>
+     <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+       <its:translateRule selector="/messages" translate="no"/>
+       <its:translateRule selector="//message/p" translate="yes"/>
+
+       <!-- If 'p' has an attribute 'translatable' with the value 'no', then
+            the content is not translatable.  -->
+       <its:translateRule selector="//message/p[@translatable = 'no']"
+         translate="no"/>
+     </its:rules>
+
+   ‘xgettext’ needs another file called "locating rule" to associate an
+ITS rule with an XML file.  If the above ITS file is saved as
+‘messages.its’, the locating rule would look like:
+
+     <?xml version="1.0"?>
+     <locatingRules>
+       <locatingRule name="Messages" pattern="*.xml">
+         <documentRule localName="messages" target="messages.its"/>
+       </locatingRule>
+       <locatingRule name="Messages" pattern="*.msg" target="messages.its"/>
+     </locatingRules>
+
+   The ‘locatingRule’ element must have a ‘pattern’ attribute, which
+denotes either a literal file name or a wildcard pattern of the XML
+file.  The ‘locatingRule’ element can have child ‘documentRule’ element,
+which adds checks on the content of the XML file.
+
+   The first rule matches any file with the ‘.xml’ file extension, but
+it only applies to XML files whose root element is ‘<messages>’.
+
+   The second rule indicates that the same ITS rule file are also
+applicable to any file with the ‘.msg’ file extension.  The optional
+‘name’ attribute of ‘locatingRule’ allows to choose rules by name,
+typically with ‘xgettext’’s ‘-L’ option.
+
+   The associated ITS rule file is indicated by the ‘target’ attribute
+of ‘locatingRule’ or ‘documentRule’.  If it is specified in a
+‘documentRule’ element, the parent ‘locatingRule’ shouldn’t have the
+‘target’ attribute.
+
+   Locating rule files must have the ‘.loc’ file extension.  Both ITS
+rule files and locating rule files must be installed in the
+‘$prefix/share/gettext/its’ directory.  Once those files are properly
+installed, ‘xgettext’ can extract translatable strings from the matching
+XML files.
+
+15.6.6.1 Two Use-cases of Translated Strings in XML
+...................................................
+
+   For XML, there are two use-cases of translated strings.  One is the
+case where the translated strings are directly consumed by programs, and
+the other is the case where the translated strings are merged back to
+the original XML document.  In the former case, special characters in
+the extracted strings shouldn’t be escaped, while they should in the
+latter case.  To control wheter to escape special characters, the
+‘Escape Special Characters’ data category can be used.
+
+   To merge the translations, the ‘msgfmt’ program can be used with the
+option ‘--xml’.  *Note msgfmt Invocation::, for more details about how
+one calls the ‘msgfmt’ program.  ‘msgfmt’’s ‘--xml’ option doesn’t
+perform character escaping, so translated strings can have arbitrary XML
+constructs, such as elements for markup.
+
+
 File: gettext.info,  Node: Conclusion,  Next: Language Codes,  Prev: Programming Languages,  Up: Top
 
 16 Concluding Remarks
@@ -15085,7 +15470,7 @@ each particular file or directory.  Here is a summary:
 * GNU FDL::                     GNU Free Documentation License
 
 
-File: gettext.info,  Node: GNU GPL,  Next: GNU LGPL,  Up: Licenses
+File: gettext.info,  Node: GNU GPL,  Next: GNU LGPL,  Prev: Licenses,  Up: Licenses
 
 C.1 GNU GENERAL PUBLIC LICENSE
 ==============================
@@ -16411,7 +16796,7 @@ Program Index
 * autopoint:                             autopoint Invocation.
                                                               (line   6)
 * boldquot:                              msgfilter Invocation.
-                                                              (line 106)
+                                                              (line 111)
 * envsubst:                              envsubst Invocation. (line   6)
 * gettext:                               sh.                  (line  19)
 * gettext <1>:                           gettext Invocation.  (line   6)
@@ -16436,9 +16821,9 @@ Program Index
 * ngettext:                              sh.                  (line  19)
 * ngettext <1>:                          ngettext Invocation. (line   6)
 * quot:                                  msgfilter Invocation.
-                                                              (line 102)
+                                                              (line 107)
 * recode-sr-latin:                       msgfilter Invocation.
-                                                              (line  96)
+                                                              (line 101)
 * xgettext:                              xgettext Invocation. (line   6)
 
 
@@ -16458,21 +16843,22 @@ Option Index
 * --add-location, ‘msgconv’ option:      msgconv Invocation.  (line  80)
 * --add-location, ‘msgen’ option:        msgen Invocation.    (line  83)
 * --add-location, ‘msgfilter’ option:    msgfilter Invocation.
-                                                              (line 156)
+                                                              (line 161)
 * --add-location, ‘msggrep’ option:      msggrep Invocation.  (line 152)
 * --add-location, ‘msgmerge’ option:     msgmerge Invocation. (line 150)
 * --add-location, ‘msguniq’ option:      msguniq Invocation.  (line  97)
-* --add-location, ‘xgettext’ option:     xgettext Invocation. (line 326)
-* --alignment, ‘msgfmt’ option:          msgfmt Invocation.   (line 250)
+* --add-location, ‘xgettext’ option:     xgettext Invocation. (line 368)
+* --alignment, ‘msgfmt’ option:          msgfmt Invocation.   (line 288)
 * --backup, ‘msgmerge’ option:           msgmerge Invocation. (line  62)
-* --boost, ‘xgettext’ option:            xgettext Invocation. (line 284)
+* --boost, ‘xgettext’ option:            xgettext Invocation. (line 326)
 * --c++, ‘xgettext’ option:              xgettext Invocation. (line  63)
-* --check, ‘msgfmt’ option:              msgfmt Invocation.   (line 188)
-* --check-accelerators, ‘msgfmt’ option: msgfmt Invocation.   (line 229)
-* --check-compatibility, ‘msgfmt’ option: msgfmt Invocation.  (line 225)
-* --check-domain, ‘msgfmt’ option:       msgfmt Invocation.   (line 220)
-* --check-format, ‘msgfmt’ option:       msgfmt Invocation.   (line 192)
-* --check-header, ‘msgfmt’ option:       msgfmt Invocation.   (line 215)
+* --check, ‘msgfmt’ option:              msgfmt Invocation.   (line 226)
+* --check, ‘xgettext’ option:            xgettext Invocation. (line 116)
+* --check-accelerators, ‘msgfmt’ option: msgfmt Invocation.   (line 267)
+* --check-compatibility, ‘msgfmt’ option: msgfmt Invocation.  (line 263)
+* --check-domain, ‘msgfmt’ option:       msgfmt Invocation.   (line 258)
+* --check-format, ‘msgfmt’ option:       msgfmt Invocation.   (line 230)
+* --check-header, ‘msgfmt’ option:       msgfmt Invocation.   (line 253)
 * --clear-fuzzy, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line  68)
 * --clear-obsolete, ‘msgattrib’ option:  msgattrib Invocation.
@@ -16487,21 +16873,21 @@ Option Index
 * --color, ‘msgconv’ option:             msgconv Invocation.  (line  61)
 * --color, ‘msgen’ option:               msgen Invocation.    (line  64)
 * --color, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line 133)
+                                                              (line 138)
 * --color, ‘msggrep’ option:             msggrep Invocation.  (line 134)
-* --color, ‘msginit’ option:             msginit Invocation.  (line  60)
+* --color, ‘msginit’ option:             msginit Invocation.  (line  93)
 * --color, ‘msgmerge’ option:            msgmerge Invocation. (line 131)
 * --color, ‘msgunfmt’ option:            msgunfmt Invocation. (line 103)
 * --color, ‘msguniq’ option:             msguniq Invocation.  (line  78)
-* --color, ‘xgettext’ option:            xgettext Invocation. (line 305)
+* --color, ‘xgettext’ option:            xgettext Invocation. (line 347)
 * --comment, ‘msggrep’ option:           msggrep Invocation.  (line  86)
 * --compendium, ‘msgmerge’ option:       msgmerge Invocation. (line  36)
-* --copyright-holder, ‘xgettext’ option: xgettext Invocation. (line 382)
+* --copyright-holder, ‘xgettext’ option: xgettext Invocation. (line 432)
 * --csharp, ‘msgfmt’ option:             msgfmt Invocation.   (line  36)
 * --csharp, ‘msgunfmt’ option:           msgunfmt Invocation. (line  19)
 * --csharp-resources, ‘msgfmt’ option:   msgfmt Invocation.   (line  40)
 * --csharp-resources, ‘msgunfmt’ option: msgunfmt Invocation. (line  23)
-* --debug, ‘xgettext’ option:            xgettext Invocation. (line 288)
+* --debug, ‘xgettext’ option:            xgettext Invocation. (line 330)
 * --default-domain, ‘xgettext’ option:   xgettext Invocation. (line  35)
 * --desktop, ‘msgfmt’ option:            msgfmt Invocation.   (line  49)
 * --directory, ‘msgattrib’ option:       msgattrib Invocation.
@@ -16511,7 +16897,7 @@ Option Index
 * --directory, ‘msgcomm’ option:         msgcomm Invocation.  (line  30)
 * --directory, ‘msgconv’ option:         msgconv Invocation.  (line  19)
 * --directory, ‘msgen’ option:           msgen Invocation.    (line  25)
-* --directory, ‘msgexec’ option:         msgexec Invocation.  (line  51)
+* --directory, ‘msgexec’ option:         msgexec Invocation.  (line  54)
 * --directory, ‘msgfilter’ option:       msgfilter Invocation.
                                                               (line  34)
 * --directory, ‘msgfmt’ option:          msgfmt Invocation.   (line  18)
@@ -16523,28 +16909,28 @@ Option Index
 * --domain, ‘msggrep’ option:            msggrep Invocation.  (line  70)
 * --domain, ‘ngettext’ option:           ngettext Invocation. (line  15)
 * --dry-run, ‘autopoint’ option:         autopoint Invocation.
-                                                              (line  24)
+                                                              (line  31)
 * --dry-run, ‘gettextize’ option:        gettextize Invocation.
                                                               (line  72)
 * --empty, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line  84)
-* --endianness, ‘msgfmt’ option:         msgfmt Invocation.   (line 253)
+* --endianness, ‘msgfmt’ option:         msgfmt Invocation.   (line 291)
 * --exclude-file, ‘xgettext’ option:     xgettext Invocation. (line  89)
 * --expression, ‘msgfilter’ option:      msgfilter Invocation.
-                                                              (line  82)
+                                                              (line  87)
 * --extended-regexp, ‘msggrep’ option:   msggrep Invocation.  (line  94)
-* --extract-all, ‘xgettext’ option:      xgettext Invocation. (line 120)
+* --extract-all, ‘xgettext’ option:      xgettext Invocation. (line 162)
 * --extracted-comment, ‘msggrep’ option: msggrep Invocation.  (line  90)
 * --file, ‘msgfilter’ option:            msgfilter Invocation.
-                                                              (line  86)
+                                                              (line  91)
 * --file, ‘msggrep’ option:              msggrep Invocation.  (line 106)
 * --files-from, ‘msgcat’ option:         msgcat Invocation.   (line  26)
 * --files-from, ‘msgcomm’ option:        msgcomm Invocation.  (line  25)
 * --files-from, ‘xgettext’ option:       xgettext Invocation. (line  19)
 * --fixed-strings, ‘msggrep’ option:     msggrep Invocation.  (line  98)
-* --flag, ‘xgettext’ option:             xgettext Invocation. (line 231)
+* --flag, ‘xgettext’ option:             xgettext Invocation. (line 273)
 * --force, ‘autopoint’ option:           autopoint Invocation.
-                                                              (line  20)
+                                                              (line  27)
 * --force, ‘gettextize’ option:          gettextize Invocation.
                                                               (line  40)
 * --force-po, ‘msgattrib’ option:        msgattrib Invocation.
@@ -16554,18 +16940,18 @@ Option Index
 * --force-po, ‘msgconv’ option:          msgconv Invocation.  (line  69)
 * --force-po, ‘msgen’ option:            msgen Invocation.    (line  72)
 * --force-po, ‘msgfilter’ option:        msgfilter Invocation.
-                                                              (line 141)
+                                                              (line 146)
 * --force-po, ‘msggrep’ option:          msggrep Invocation.  (line 142)
 * --force-po, ‘msgmerge’ option:         msgmerge Invocation. (line 139)
 * --force-po, ‘msgunfmt’ option:         msgunfmt Invocation. (line 111)
 * --force-po, ‘msguniq’ option:          msguniq Invocation.  (line  86)
-* --force-po, ‘xgettext’ option:         xgettext Invocation. (line 313)
-* --foreign-user, ‘xgettext’ option:     xgettext Invocation. (line 397)
+* --force-po, ‘xgettext’ option:         xgettext Invocation. (line 355)
+* --foreign-user, ‘xgettext’ option:     xgettext Invocation. (line 447)
 * --from-code, ‘xgettext’ option:        xgettext Invocation. (line  72)
 * --fuzzy, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line  95)
 * --help, ‘autopoint’ option:            autopoint Invocation.
-                                                              (line  32)
+                                                              (line  39)
 * --help, ‘envsubst’ option:             envsubst Invocation. (line  21)
 * --help, ‘gettext’ option:              gettext Invocation.  (line  32)
 * --help, ‘gettextize’ option:           gettextize Invocation.
@@ -16577,17 +16963,17 @@ Option Index
 * --help, ‘msgcomm’ option:              msgcomm Invocation.  (line 153)
 * --help, ‘msgconv’ option:              msgconv Invocation.  (line 130)
 * --help, ‘msgen’ option:                msgen Invocation.    (line 133)
-* --help, ‘msgexec’ option:              msgexec Invocation.  (line  74)
+* --help, ‘msgexec’ option:              msgexec Invocation.  (line  77)
 * --help, ‘msgfilter’ option:            msgfilter Invocation.
-                                                              (line 206)
-* --help, ‘msgfmt’ option:               msgfmt Invocation.   (line 274)
+                                                              (line 211)
+* --help, ‘msgfmt’ option:               msgfmt Invocation.   (line 312)
 * --help, ‘msggrep’ option:              msggrep Invocation.  (line 200)
-* --help, ‘msginit’ option:              msginit Invocation.  (line  95)
+* --help, ‘msginit’ option:              msginit Invocation.  (line 128)
 * --help, ‘msgmerge’ option:             msgmerge Invocation. (line 200)
 * --help, ‘msgunfmt’ option:             msgunfmt Invocation. (line 155)
 * --help, ‘msguniq’ option:              msguniq Invocation.  (line 147)
 * --help, ‘ngettext’ option:             ngettext Invocation. (line  31)
-* --help, ‘xgettext’ option:             xgettext Invocation. (line 444)
+* --help, ‘xgettext’ option:             xgettext Invocation. (line 494)
 * --ignore-case, ‘msggrep’ option:       msggrep Invocation.  (line 110)
 * --ignore-file, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line  91)
@@ -16598,39 +16984,43 @@ Option Index
 * --indent, ‘msgconv’ option:            msgconv Invocation.  (line  73)
 * --indent, ‘msgen’ option:              msgen Invocation.    (line  76)
 * --indent, ‘msgfilter’ option:          msgfilter Invocation.
-                                                              (line 144)
+                                                              (line 149)
 * --indent, ‘msggrep’ option:            msggrep Invocation.  (line 145)
 * --indent, ‘msgmerge’ option:           msgmerge Invocation. (line 143)
 * --indent, ‘msgunfmt’ option:           msgunfmt Invocation. (line 115)
 * --indent, ‘msguniq’ option:            msguniq Invocation.  (line  90)
-* --indent, ‘xgettext’ option:           xgettext Invocation. (line 317)
-* --input, ‘msgexec’ option:             msgexec Invocation.  (line  47)
+* --indent, ‘xgettext’ option:           xgettext Invocation. (line 359)
+* --input, ‘msgexec’ option:             msgexec Invocation.  (line  50)
 * --input, ‘msgfilter’ option:           msgfilter Invocation.
                                                               (line  30)
-* --input, ‘msginit’ option:             msginit Invocation.  (line  16)
+* --input, ‘msginit’ option:             msginit Invocation.  (line  49)
 * --intl, ‘gettextize’ option:           gettextize Invocation.
                                                               (line  43)
 * --invert-match, ‘msggrep’ option:      msggrep Invocation.  (line 114)
+* --its, ‘xgettext’ option:              xgettext Invocation. (line 391)
+* --itstool, ‘xgettext’ option:          xgettext Invocation. (line 395)
 * --java, ‘msgfmt’ option:               msgfmt Invocation.   (line  30)
 * --java, ‘msgunfmt’ option:             msgunfmt Invocation. (line  16)
 * --java2, ‘msgfmt’ option:              msgfmt Invocation.   (line  33)
 * --join-existing, ‘xgettext’ option:    xgettext Invocation. (line  85)
-* --kde, ‘xgettext’ option:              xgettext Invocation. (line 280)
+* --kde, ‘xgettext’ option:              xgettext Invocation. (line 322)
 * --keep-header, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line 147)
-* --keyword, ‘msgfmt’ option:            msgfmt Invocation.   (line 137)
-* --keyword, ‘xgettext’ option:          xgettext Invocation. (line 129)
+                                                              (line 152)
+* --keyword, ‘msgfmt’ option:            msgfmt Invocation.   (line 140)
+* --keyword, ‘xgettext’ option:          xgettext Invocation. (line 171)
 * --lang, ‘msgcat’ option:               msgcat Invocation.   (line  89)
 * --lang, ‘msgen’ option:                msgen Invocation.    (line  57)
 * --lang, ‘msgmerge’ option:             msgmerge Invocation. (line 123)
+* --language, ‘msgfmt’ option:           msgfmt Invocation.   (line 180)
 * --language, ‘xgettext’ option:         xgettext Invocation. (line  54)
 * --less-than, ‘msgcat’ option:          msgcat Invocation.   (line  52)
 * --less-than, ‘msgcomm’ option:         msgcomm Invocation.  (line  51)
-* --locale, ‘msgfmt’ option:             msgfmt Invocation.   (line  80)
-* --locale, ‘msgfmt’ option <1>:         msgfmt Invocation.   (line 103)
-* --locale, ‘msgfmt’ option <2>:         msgfmt Invocation.   (line 119)
-* --locale, ‘msgfmt’ option <3>:         msgfmt Invocation.   (line 143)
-* --locale, ‘msginit’ option:            msginit Invocation.  (line  49)
+* --locale, ‘msgfmt’ option:             msgfmt Invocation.   (line  83)
+* --locale, ‘msgfmt’ option <1>:         msgfmt Invocation.   (line 106)
+* --locale, ‘msgfmt’ option <2>:         msgfmt Invocation.   (line 122)
+* --locale, ‘msgfmt’ option <3>:         msgfmt Invocation.   (line 146)
+* --locale, ‘msgfmt’ option <4>:         msgfmt Invocation.   (line 184)
+* --locale, ‘msginit’ option:            msginit Invocation.  (line  82)
 * --locale, ‘msgunfmt’ option:           msgunfmt Invocation. (line  45)
 * --locale, ‘msgunfmt’ option <1>:       msgunfmt Invocation. (line  62)
 * --locale, ‘msgunfmt’ option <2>:       msgunfmt Invocation. (line  78)
@@ -16640,12 +17030,15 @@ Option Index
 * --msgctxt, ‘msggrep’ option:           msggrep Invocation.  (line  74)
 * --msgid, ‘msggrep’ option:             msggrep Invocation.  (line  78)
 * --msgid-bugs-address, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 410)
+                                                              (line 460)
 * --msgstr, ‘msggrep’ option:            msggrep Invocation.  (line  82)
-* --msgstr-prefix, ‘xgettext’ option:    xgettext Invocation. (line 433)
-* --msgstr-suffix, ‘xgettext’ option:    xgettext Invocation. (line 437)
+* --msgstr-prefix, ‘xgettext’ option:    xgettext Invocation. (line 483)
+* --msgstr-suffix, ‘xgettext’ option:    xgettext Invocation. (line 487)
 * --multi-domain, ‘msgcmp’ option:       msgcmp Invocation.   (line  35)
 * --multi-domain, ‘msgmerge’ option:     msgmerge Invocation. (line  96)
+* --newline, ‘msgfilter’ option:         msgfilter Invocation.
+                                                              (line  59)
+* --newline, ‘msgfilter’ option <1>:     msgexec Invocation.  (line  19)
 * --no-changelog, ‘gettextize’ option:   gettextize Invocation.
                                                               (line  58)
 * --no-fuzzy, ‘msgattrib’ option:        msgattrib Invocation.
@@ -16653,7 +17046,7 @@ Option Index
 * --no-fuzzy-matching, ‘msgcmp’ option:  msgcmp Invocation.   (line  39)
 * --no-fuzzy-matching, ‘msgmerge’ option: msgmerge Invocation.
                                                               (line 100)
-* --no-hash, ‘msgfmt’ option:            msgfmt Invocation.   (line 266)
+* --no-hash, ‘msgfmt’ option:            msgfmt Invocation.   (line 304)
 * --no-location, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line 134)
 * --no-location, ‘msgcat’ option:        msgcat Invocation.   (line 110)
@@ -16661,14 +17054,14 @@ Option Index
 * --no-location, ‘msgconv’ option:       msgconv Invocation.  (line  76)
 * --no-location, ‘msgen’ option:         msgen Invocation.    (line  79)
 * --no-location, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line 152)
+                                                              (line 157)
 * --no-location, ‘msggrep’ option:       msggrep Invocation.  (line 148)
 * --no-location, ‘msgmerge’ option:      msgmerge Invocation. (line 146)
 * --no-location, ‘msguniq’ option:       msguniq Invocation.  (line  93)
-* --no-location, ‘xgettext’ option:      xgettext Invocation. (line 320)
+* --no-location, ‘xgettext’ option:      xgettext Invocation. (line 362)
 * --no-obsolete, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line  51)
-* --no-translator, ‘msginit’ option:     msginit Invocation.  (line  55)
+* --no-translator, ‘msginit’ option:     msginit Invocation.  (line  88)
 * --no-wrap, ‘msgattrib’ option:         msgattrib Invocation.
                                                               (line 169)
 * --no-wrap, ‘msgcat’ option:            msgcat Invocation.   (line 145)
@@ -16676,17 +17069,17 @@ Option Index
 * --no-wrap, ‘msgconv’ option:           msgconv Invocation.  (line 111)
 * --no-wrap, ‘msgen’ option:             msgen Invocation.    (line 114)
 * --no-wrap, ‘msgfilter’ option:         msgfilter Invocation.
-                                                              (line 187)
+                                                              (line 192)
 * --no-wrap, ‘msggrep’ option:           msggrep Invocation.  (line 183)
-* --no-wrap, ‘msginit’ option:           msginit Invocation.  (line  85)
+* --no-wrap, ‘msginit’ option:           msginit Invocation.  (line 118)
 * --no-wrap, ‘msgmerge’ option:          msgmerge Invocation. (line 181)
 * --no-wrap, ‘msgunfmt’ option:          msgunfmt Invocation. (line 140)
 * --no-wrap, ‘msguniq’ option:           msguniq Invocation.  (line 128)
-* --no-wrap, ‘xgettext’ option:          xgettext Invocation. (line 356)
+* --no-wrap, ‘xgettext’ option:          xgettext Invocation. (line 406)
 * --obsolete, ‘msgattrib’ option:        msgattrib Invocation.
                                                               (line  99)
 * --omit-header, ‘msgcomm’ option:       msgcomm Invocation.  (line 146)
-* --omit-header, ‘xgettext’ option:      xgettext Invocation. (line 371)
+* --omit-header, ‘xgettext’ option:      xgettext Invocation. (line 421)
 * --only-file, ‘msgattrib’ option:       msgattrib Invocation.
                                                               (line  87)
 * --only-fuzzy, ‘msgattrib’ option:      msgattrib Invocation.
@@ -16703,14 +17096,14 @@ Option Index
 * --output-file, ‘msgen’ option:         msgen Invocation.    (line  36)
 * --output-file, ‘msgfilter’ option:     msgfilter Invocation.
                                                               (line  45)
-* --output-file, ‘msgfmt’ option:        msgfmt Invocation.   (line  56)
+* --output-file, ‘msgfmt’ option:        msgfmt Invocation.   (line  59)
 * --output-file, ‘msggrep’ option:       msggrep Invocation.  (line  30)
-* --output-file, ‘msginit’ option:       msginit Invocation.  (line  26)
+* --output-file, ‘msginit’ option:       msginit Invocation.  (line  59)
 * --output-file, ‘msgmerge’ option:      msgmerge Invocation. (line  51)
 * --output-file, ‘msgunfmt’ option:      msgunfmt Invocation. (line  93)
 * --output-file, ‘msguniq’ option:       msguniq Invocation.  (line  37)
-* --package-name, ‘xgettext’ option:     xgettext Invocation. (line 403)
-* --package-version, ‘xgettext’ option:  xgettext Invocation. (line 406)
+* --package-name, ‘xgettext’ option:     xgettext Invocation. (line 453)
+* --package-version, ‘xgettext’ option:  xgettext Invocation. (line 456)
 * --po-dir, ‘gettextize’ option:         gettextize Invocation.
                                                               (line  51)
 * --previous, ‘msgattrib’ option:        msgattrib Invocation.
@@ -16723,12 +17116,12 @@ Option Index
 * --properties-input, ‘msgcomm’ option:  msgcomm Invocation.  (line  69)
 * --properties-input, ‘msgconv’ option:  msgconv Invocation.  (line  49)
 * --properties-input, ‘msgen’ option:    msgen Invocation.    (line  46)
-* --properties-input, ‘msgexec’ option:  msgexec Invocation.  (line  62)
+* --properties-input, ‘msgexec’ option:  msgexec Invocation.  (line  65)
 * --properties-input, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 121)
-* --properties-input, ‘msgfmt’ option:   msgfmt Invocation.   (line 176)
+                                                              (line 126)
+* --properties-input, ‘msgfmt’ option:   msgfmt Invocation.   (line 214)
 * --properties-input, ‘msggrep’ option:  msggrep Invocation.  (line 122)
-* --properties-input, ‘msginit’ option:  msginit Invocation.  (line  37)
+* --properties-input, ‘msginit’ option:  msginit Invocation.  (line  70)
 * --properties-input, ‘msgmerge’ option: msgmerge Invocation. (line 112)
 * --properties-input, ‘msguniq’ option:  msguniq Invocation.  (line  58)
 * --properties-output, ‘msgattrib’ option: msgattrib Invocation.
@@ -16738,33 +17131,34 @@ Option Index
 * --properties-output, ‘msgconv’ option: msgconv Invocation.  (line  95)
 * --properties-output, ‘msgen’ option:   msgen Invocation.    (line  98)
 * --properties-output, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 171)
+                                                              (line 176)
 * --properties-output, ‘msggrep’ option: msggrep Invocation.  (line 167)
-* --properties-output, ‘msginit’ option: msginit Invocation.  (line  69)
+* --properties-output, ‘msginit’ option: msginit Invocation.  (line 102)
 * --properties-output, ‘msgmerge’ option: msgmerge Invocation.
                                                               (line 165)
 * --properties-output, ‘msgunfmt’ option: msgunfmt Invocation.
                                                               (line 124)
 * --properties-output, ‘msguniq’ option: msguniq Invocation.  (line 112)
 * --properties-output, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 340)
+                                                              (line 382)
 * --qt, ‘msgfmt’ option:                 msgfmt Invocation.   (line  46)
-* --qt, ‘xgettext’ option:               xgettext Invocation. (line 276)
+* --qt, ‘xgettext’ option:               xgettext Invocation. (line 318)
 * --quiet, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line  91)
+                                                              (line  96)
 * --quiet, ‘msgmerge’ option:            msgmerge Invocation. (line 213)
 * --regexp=, ‘msggrep’ option:           msggrep Invocation.  (line 102)
 * --repeated, ‘msguniq’ option:          msguniq Invocation.  (line  47)
-* --resource, ‘msgfmt’ option:           msgfmt Invocation.   (line  76)
-* --resource, ‘msgfmt’ option <1>:       msgfmt Invocation.   (line  99)
+* --resource, ‘msgfmt’ option:           msgfmt Invocation.   (line  79)
+* --resource, ‘msgfmt’ option <1>:       msgfmt Invocation.   (line 102)
 * --resource, ‘msgunfmt’ option:         msgunfmt Invocation. (line  41)
 * --resource, ‘msgunfmt’ option <1>:     msgunfmt Invocation. (line  58)
+* --sentence-end, ‘xgettext’ option:     xgettext Invocation. (line 149)
 * --set-fuzzy, ‘msgattrib’ option:       msgattrib Invocation.
                                                               (line  65)
 * --set-obsolete, ‘msgattrib’ option:    msgattrib Invocation.
                                                               (line  71)
 * --silent, ‘msgfilter’ option:          msgfilter Invocation.
-                                                              (line  91)
+                                                              (line  96)
 * --silent, ‘msgmerge’ option:           msgmerge Invocation. (line 213)
 * --sort-by-file, ‘msgattrib’ option:    msgattrib Invocation.
                                                               (line 181)
@@ -16773,11 +17167,11 @@ Option Index
 * --sort-by-file, ‘msgconv’ option:      msgconv Invocation.  (line 123)
 * --sort-by-file, ‘msgen’ option:        msgen Invocation.    (line 126)
 * --sort-by-file, ‘msgfilter’ option:    msgfilter Invocation.
-                                                              (line 199)
+                                                              (line 204)
 * --sort-by-file, ‘msggrep’ option:      msggrep Invocation.  (line 193)
 * --sort-by-file, ‘msgmerge’ option:     msgmerge Invocation. (line 193)
 * --sort-by-file, ‘msguniq’ option:      msguniq Invocation.  (line 140)
-* --sort-by-file, ‘xgettext’ option:     xgettext Invocation. (line 368)
+* --sort-by-file, ‘xgettext’ option:     xgettext Invocation. (line 418)
 * --sort-output, ‘msgattrib’ option:     msgattrib Invocation.
                                                               (line 176)
 * --sort-output, ‘msgcat’ option:        msgcat Invocation.   (line 152)
@@ -16785,14 +17179,14 @@ Option Index
 * --sort-output, ‘msgconv’ option:       msgconv Invocation.  (line 118)
 * --sort-output, ‘msgen’ option:         msgen Invocation.    (line 121)
 * --sort-output, ‘msgfilter’ option:     msgfilter Invocation.
-                                                              (line 194)
+                                                              (line 199)
 * --sort-output, ‘msggrep’ option:       msggrep Invocation.  (line 189)
 * --sort-output, ‘msgmerge’ option:      msgmerge Invocation. (line 188)
 * --sort-output, ‘msgunfmt’ option:      msgunfmt Invocation. (line 147)
 * --sort-output, ‘msguniq’ option:       msguniq Invocation.  (line 135)
-* --sort-output, ‘xgettext’ option:      xgettext Invocation. (line 363)
-* --source, ‘msgfmt’ option:             msgfmt Invocation.   (line  88)
-* --statistics, ‘msgfmt’ option:         msgfmt Invocation.   (line 281)
+* --sort-output, ‘xgettext’ option:      xgettext Invocation. (line 413)
+* --source, ‘msgfmt’ option:             msgfmt Invocation.   (line  91)
+* --statistics, ‘msgfmt’ option:         msgfmt Invocation.   (line 319)
 * --strict, ‘msgattrib’ option:          msgattrib Invocation.
                                                               (line 147)
 * --strict, ‘msgcat’ option:             msgcat Invocation.   (line 123)
@@ -16800,25 +17194,25 @@ Option Index
 * --strict, ‘msgconv’ option:            msgconv Invocation.  (line  89)
 * --strict, ‘msgen’ option:              msgen Invocation.    (line  92)
 * --strict, ‘msgfilter’ option:          msgfilter Invocation.
-                                                              (line 165)
-* --strict, ‘msgfmt’ option:             msgfmt Invocation.   (line  59)
+                                                              (line 170)
+* --strict, ‘msgfmt’ option:             msgfmt Invocation.   (line  62)
 * --strict, ‘msggrep’ option:            msggrep Invocation.  (line 161)
 * --strict, ‘msgmerge’ option:           msgmerge Invocation. (line 159)
 * --strict, ‘msgunfmt’ option:           msgunfmt Invocation. (line 118)
 * --strict, ‘msguniq’ option:            msguniq Invocation.  (line 106)
-* --strict, ‘xgettext’ option:           xgettext Invocation. (line 335)
+* --strict, ‘xgettext’ option:           xgettext Invocation. (line 377)
 * --stringtable-input, ‘msgattrib’ option: msgattrib Invocation.
                                                               (line 111)
 * --stringtable-input, ‘msgcat’ option:  msgcat Invocation.   (line  74)
 * --stringtable-input, ‘msgcmp’ option:  msgcmp Invocation.   (line  61)
 * --stringtable-input, ‘msgcomm’ option: msgcomm Invocation.  (line  73)
 * --stringtable-input, ‘msgen’ option:   msgen Invocation.    (line  50)
-* --stringtable-input, ‘msgexec’ option: msgexec Invocation.  (line  66)
+* --stringtable-input, ‘msgexec’ option: msgexec Invocation.  (line  69)
 * --stringtable-input, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 125)
-* --stringtable-input, ‘msgfmt’ option:  msgfmt Invocation.   (line 180)
+                                                              (line 130)
+* --stringtable-input, ‘msgfmt’ option:  msgfmt Invocation.   (line 218)
 * --stringtable-input, ‘msggrep’ option: msggrep Invocation.  (line 126)
-* --stringtable-input, ‘msginit’ option: msginit Invocation.  (line  41)
+* --stringtable-input, ‘msginit’ option: msginit Invocation.  (line  74)
 * --stringtable-input, ‘msgmerge’ option: msgmerge Invocation.
                                                               (line 116)
 * --stringtable-input, ‘msgonv’ option:  msgconv Invocation.  (line  53)
@@ -16830,16 +17224,16 @@ Option Index
 * --stringtable-output, ‘msgconv’ option: msgconv Invocation. (line 100)
 * --stringtable-output, ‘msgen’ option:  msgen Invocation.    (line 103)
 * --stringtable-output, ‘msgfilter’ option: msgfilter Invocation.
-                                                              (line 176)
+                                                              (line 181)
 * --stringtable-output, ‘msggrep’ option: msggrep Invocation. (line 172)
-* --stringtable-output, ‘msginit’ option: msginit Invocation. (line  74)
+* --stringtable-output, ‘msginit’ option: msginit Invocation. (line 107)
 * --stringtable-output, ‘msgmerge’ option: msgmerge Invocation.
                                                               (line 170)
 * --stringtable-output, ‘msgunfmt’ option: msgunfmt Invocation.
                                                               (line 129)
 * --stringtable-output, ‘msguniq’ option: msguniq Invocation. (line 117)
 * --stringtable-output, ‘xgettext’ option: xgettext Invocation.
-                                                              (line 345)
+                                                              (line 387)
 * --style, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line 123)
 * --style, ‘msgcat’ option:              msgcat Invocation.   (line  99)
@@ -16848,25 +17242,26 @@ Option Index
 * --style, ‘msgconv’ option:             msgconv Invocation.  (line  65)
 * --style, ‘msgen’ option:               msgen Invocation.    (line  68)
 * --style, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line 137)
+                                                              (line 142)
 * --style, ‘msggrep’ option:             msggrep Invocation.  (line 138)
-* --style, ‘msginit’ option:             msginit Invocation.  (line  64)
+* --style, ‘msginit’ option:             msginit Invocation.  (line  97)
 * --style, ‘msgmerge’ option:            msgmerge Invocation. (line 135)
 * --style, ‘msgunfmt’ option:            msgunfmt Invocation. (line 107)
 * --style, ‘msguniq’ option:             msguniq Invocation.  (line  82)
-* --style, ‘xgettext’ option:            xgettext Invocation. (line 309)
+* --style, ‘xgettext’ option:            xgettext Invocation. (line 351)
 * --suffix, ‘msgmerge’ option:           msgmerge Invocation. (line  65)
 * --symlink, ‘gettextize’ option:        gettextize Invocation.
                                                               (line  63)
 * --tcl, ‘msgfmt’ option:                msgfmt Invocation.   (line  43)
 * --tcl, ‘msgunfmt’ option:              msgunfmt Invocation. (line  26)
-* --template, ‘msgfmt’ option:           msgfmt Invocation.   (line 133)
+* --template, ‘msgfmt’ option:           msgfmt Invocation.   (line 136)
+* --template, ‘msgfmt’ option <1>:       msgfmt Invocation.   (line 176)
 * --to-code, ‘msgcat’ option:            msgcat Invocation.   (line  82)
 * --to-code, ‘msgconv’ option:           msgconv Invocation.  (line  40)
 * --to-code, ‘msguniq’ option:           msguniq Invocation.  (line  70)
 * --translated, ‘msgattrib’ option:      msgattrib Invocation.
                                                               (line  39)
-* --trigraphs, ‘xgettext’ option:        xgettext Invocation. (line 271)
+* --trigraphs, ‘xgettext’ option:        xgettext Invocation. (line 313)
 * --unique, ‘msgcat’ option:             msgcat Invocation.   (line  62)
 * --unique, ‘msgcomm’ option:            msgcomm Invocation.  (line  61)
 * --unique, ‘msguniq’ option:            msguniq Invocation.  (line  51)
@@ -16876,14 +17271,14 @@ Option Index
 * --use-first, ‘msgcat’ option:          msgcat Invocation.   (line  85)
 * --use-first, ‘msguniq’ option:         msguniq Invocation.  (line  73)
 * --use-fuzzy, ‘msgcmp’ option:          msgcmp Invocation.   (line  43)
-* --use-fuzzy, ‘msgfmt’ option:          msgfmt Invocation.   (line 241)
+* --use-fuzzy, ‘msgfmt’ option:          msgfmt Invocation.   (line 279)
 * --use-untranslated, ‘msgcmp’ option:   msgcmp Invocation.   (line  49)
 * --variables, ‘envsubst’ option:        envsubst Invocation. (line  15)
-* --verbose, ‘msgfmt’ option:            msgfmt Invocation.   (line 287)
+* --verbose, ‘msgfmt’ option:            msgfmt Invocation.   (line 325)
 * --verbose, ‘msgmerge’ option:          msgmerge Invocation. (line 208)
 * --verbose, ‘msgunfmt’ option:          msgunfmt Invocation. (line 163)
 * --version, ‘autopoint’ option:         autopoint Invocation.
-                                                              (line  35)
+                                                              (line  42)
 * --version, ‘envsubst’ option:          envsubst Invocation. (line  25)
 * --version, ‘gettext’ option:           gettext Invocation.  (line  40)
 * --version, ‘gettextize’ option:        gettextize Invocation.
@@ -16895,17 +17290,17 @@ Option Index
 * --version, ‘msgcomm’ option:           msgcomm Invocation.  (line 157)
 * --version, ‘msgconv’ option:           msgconv Invocation.  (line 134)
 * --version, ‘msgen’ option:             msgen Invocation.    (line 137)
-* --version, ‘msgexec’ option:           msgexec Invocation.  (line  78)
+* --version, ‘msgexec’ option:           msgexec Invocation.  (line  81)
 * --version, ‘msgfilter’ option:         msgfilter Invocation.
-                                                              (line 210)
-* --version, ‘msgfmt’ option:            msgfmt Invocation.   (line 278)
+                                                              (line 215)
+* --version, ‘msgfmt’ option:            msgfmt Invocation.   (line 316)
 * --version, ‘msggrep’ option:           msggrep Invocation.  (line 204)
-* --version, ‘msginit’ option:           msginit Invocation.  (line  99)
+* --version, ‘msginit’ option:           msginit Invocation.  (line 132)
 * --version, ‘msgmerge’ option:          msgmerge Invocation. (line 204)
 * --version, ‘msgunfmt’ option:          msgunfmt Invocation. (line 159)
 * --version, ‘msguniq’ option:           msguniq Invocation.  (line 151)
 * --version, ‘ngettext’ option:          ngettext Invocation. (line  35)
-* --version, ‘xgettext’ option:          xgettext Invocation. (line 448)
+* --version, ‘xgettext’ option:          xgettext Invocation. (line 498)
 * --width, ‘msgattrib’ option:           msgattrib Invocation.
                                                               (line 163)
 * --width, ‘msgcat’ option:              msgcat Invocation.   (line 139)
@@ -16913,27 +17308,28 @@ Option Index
 * --width, ‘msgconv’ option:             msgconv Invocation.  (line 105)
 * --width, ‘msgen’ option:               msgen Invocation.    (line 108)
 * --width, ‘msgfilter’ option:           msgfilter Invocation.
-                                                              (line 181)
+                                                              (line 186)
 * --width, ‘msggrep’ option:             msggrep Invocation.  (line 177)
-* --width, ‘msginit’ option:             msginit Invocation.  (line  79)
+* --width, ‘msginit’ option:             msginit Invocation.  (line 112)
 * --width, ‘msgmerge’ option:            msgmerge Invocation. (line 175)
 * --width, ‘msgunfmt’ option:            msgunfmt Invocation. (line 134)
 * --width, ‘msguniq’ option:             msguniq Invocation.  (line 122)
-* --width, ‘xgettext’ option:            xgettext Invocation. (line 350)
+* --width, ‘xgettext’ option:            xgettext Invocation. (line 400)
+* --xml, ‘msgfmt’ option:                msgfmt Invocation.   (line  52)
 * -<, ‘msgcat’ option:                   msgcat Invocation.   (line  52)
 * -<, ‘msgcomm’ option:                  msgcomm Invocation.  (line  51)
 * ->, ‘msgcat’ option:                   msgcat Invocation.   (line  57)
 * ->, ‘msgcomm’ option:                  msgcomm Invocation.  (line  56)
-* -a, ‘msgfmt’ option:                   msgfmt Invocation.   (line 250)
-* -a, ‘xgettext’ option:                 xgettext Invocation. (line 120)
-* -c, ‘msgfmt’ option:                   msgfmt Invocation.   (line 188)
-* -C, ‘msgfmt’ option:                   msgfmt Invocation.   (line 225)
+* -a, ‘msgfmt’ option:                   msgfmt Invocation.   (line 288)
+* -a, ‘xgettext’ option:                 xgettext Invocation. (line 162)
+* -c, ‘msgfmt’ option:                   msgfmt Invocation.   (line 226)
+* -C, ‘msgfmt’ option:                   msgfmt Invocation.   (line 263)
 * -C, ‘msggrep’ option:                  msggrep Invocation.  (line  86)
 * -C, ‘msgmerge’ option:                 msgmerge Invocation. (line  36)
 * -C, ‘xgettext’ option:                 xgettext Invocation. (line  63)
 * -c, ‘xgettext’ option:                 xgettext Invocation. (line  94)
 * -d, ‘autopoint’ option:                autopoint Invocation.
-                                                              (line  24)
+                                                              (line  31)
 * -d, ‘gettext’ option:                  gettext Invocation.  (line  16)
 * -d, ‘gettextize’ option:               gettextize Invocation.
                                                               (line  72)
@@ -16944,14 +17340,15 @@ Option Index
 * -D, ‘msgcomm’ option:                  msgcomm Invocation.  (line  30)
 * -D, ‘msgconv’ option:                  msgconv Invocation.  (line  19)
 * -D, ‘msgen’ option:                    msgen Invocation.    (line  25)
-* -D, ‘msgexec’ option:                  msgexec Invocation.  (line  51)
+* -D, ‘msgexec’ option:                  msgexec Invocation.  (line  54)
 * -D, ‘msgfilter’ option:                msgfilter Invocation.
                                                               (line  34)
 * -D, ‘msgfmt’ option:                   msgfmt Invocation.   (line  18)
-* -d, ‘msgfmt’ option:                   msgfmt Invocation.   (line  85)
-* -d, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 108)
-* -d, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 124)
-* -d, ‘msgfmt’ option <3>:               msgfmt Invocation.   (line 148)
+* -d, ‘msgfmt’ option:                   msgfmt Invocation.   (line  88)
+* -d, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 111)
+* -d, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 127)
+* -d, ‘msgfmt’ option <3>:               msgfmt Invocation.   (line 151)
+* -d, ‘msgfmt’ option <4>:               msgfmt Invocation.   (line 189)
 * -D, ‘msggrep’ option:                  msggrep Invocation.  (line  19)
 * -D, ‘msgmerge’ option:                 msgmerge Invocation. (line  30)
 * -d, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  67)
@@ -16964,13 +17361,13 @@ Option Index
 * -e, ‘gettext’ option:                  gettext Invocation.  (line  20)
 * -E, ‘gettext’ option:                  gettext Invocation.  (line  27)
 * -e, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  82)
+                                                              (line  87)
 * -E, ‘msggrep’ option:                  msggrep Invocation.  (line  94)
 * -e, ‘msggrep’ option:                  msggrep Invocation.  (line 102)
 * -e, ‘ngettext’ option:                 ngettext Invocation. (line  19)
 * -E, ‘ngettext’ option:                 ngettext Invocation. (line  26)
 * -f, ‘autopoint’ option:                autopoint Invocation.
-                                                              (line  20)
+                                                              (line  27)
 * -f, ‘gettextize’ option:               gettextize Invocation.
                                                               (line  40)
 * -F, ‘msgattrib’ option:                msgattrib Invocation.
@@ -16982,16 +17379,16 @@ Option Index
 * -F, ‘msgconv’ option:                  msgconv Invocation.  (line 123)
 * -F, ‘msgen’ option:                    msgen Invocation.    (line 126)
 * -f, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  86)
+                                                              (line  91)
 * -F, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 199)
-* -f, ‘msgfmt’ option:                   msgfmt Invocation.   (line 241)
+                                                              (line 204)
+* -f, ‘msgfmt’ option:                   msgfmt Invocation.   (line 279)
 * -F, ‘msggrep’ option:                  msggrep Invocation.  (line  98)
 * -f, ‘msggrep’ option:                  msggrep Invocation.  (line 106)
 * -F, ‘msgmerge’ option:                 msgmerge Invocation. (line 193)
 * -F, ‘msguniq’ option:                  msguniq Invocation.  (line 140)
 * -f, ‘xgettext’ option:                 xgettext Invocation. (line  19)
-* -F, ‘xgettext’ option:                 xgettext Invocation. (line 368)
+* -F, ‘xgettext’ option:                 xgettext Invocation. (line 418)
 * -h, ‘envsubst’ option:                 envsubst Invocation. (line  21)
 * -h, ‘gettext’ option:                  gettext Invocation.  (line  32)
 * -h, ‘msgattrib’ option:                msgattrib Invocation.
@@ -17001,44 +17398,46 @@ Option Index
 * -h, ‘msgcomm’ option:                  msgcomm Invocation.  (line 153)
 * -h, ‘msgconv’ option:                  msgconv Invocation.  (line 130)
 * -h, ‘msgen’ option:                    msgen Invocation.    (line 133)
-* -h, ‘msgexec’ option:                  msgexec Invocation.  (line  74)
+* -h, ‘msgexec’ option:                  msgexec Invocation.  (line  77)
 * -h, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 206)
-* -h, ‘msgfmt’ option:                   msgfmt Invocation.   (line 274)
+                                                              (line 211)
+* -h, ‘msgfmt’ option:                   msgfmt Invocation.   (line 312)
 * -h, ‘msggrep’ option:                  msggrep Invocation.  (line 200)
-* -h, ‘msginit’ option:                  msginit Invocation.  (line  95)
+* -h, ‘msginit’ option:                  msginit Invocation.  (line 128)
 * -h, ‘msgmerge’ option:                 msgmerge Invocation. (line 200)
 * -h, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 155)
 * -h, ‘msguniq’ option:                  msguniq Invocation.  (line 147)
 * -h, ‘ngettext’ option:                 ngettext Invocation. (line  31)
-* -h, ‘xgettext’ option:                 xgettext Invocation. (line 444)
+* -h, ‘xgettext’ option:                 xgettext Invocation. (line 494)
 * -i, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line 131)
 * -i, ‘msgcat’ option:                   msgcat Invocation.   (line 107)
 * -i, ‘msgcomm’ option:                  msgcomm Invocation.  (line  93)
 * -i, ‘msgconv’ option:                  msgconv Invocation.  (line  73)
 * -i, ‘msgen’ option:                    msgen Invocation.    (line  76)
-* -i, ‘msgexec’ option:                  msgexec Invocation.  (line  47)
+* -i, ‘msgexec’ option:                  msgexec Invocation.  (line  50)
 * -i, ‘msgfilter’ option:                msgfilter Invocation.
                                                               (line  30)
 * -i, ‘msggrep’ option:                  msggrep Invocation.  (line 110)
-* -i, ‘msginit’ option:                  msginit Invocation.  (line  16)
+* -i, ‘msginit’ option:                  msginit Invocation.  (line  49)
 * -i, ‘msgmerge’ option:                 msgmerge Invocation. (line 143)
 * -i, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 115)
 * -i, ‘msguniq’ option:                  msguniq Invocation.  (line  90)
-* -i, ‘xgettext’ option:                 xgettext Invocation. (line 317)
+* -i, ‘xgettext’ option:                 xgettext Invocation. (line 359)
 * -j, ‘msgfmt’ option:                   msgfmt Invocation.   (line  30)
 * -J, ‘msggrep’ option:                  msggrep Invocation.  (line  74)
 * -j, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  16)
 * -j, ‘xgettext’ option:                 xgettext Invocation. (line  85)
-* -k, ‘msgfmt’ option:                   msgfmt Invocation.   (line 137)
+* -k, ‘msgfmt’ option:                   msgfmt Invocation.   (line 140)
 * -K, ‘msggrep’ option:                  msggrep Invocation.  (line  78)
-* -k, ‘xgettext’ option:                 xgettext Invocation. (line 129)
-* -l, ‘msgfmt’ option:                   msgfmt Invocation.   (line  80)
-* -l, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 103)
-* -l, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 119)
-* -l, ‘msgfmt’ option <3>:               msgfmt Invocation.   (line 143)
-* -l, ‘msginit’ option:                  msginit Invocation.  (line  49)
+* -k, ‘xgettext’ option:                 xgettext Invocation. (line 171)
+* -l, ‘msgfmt’ option:                   msgfmt Invocation.   (line  83)
+* -l, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 106)
+* -l, ‘msgfmt’ option <2>:               msgfmt Invocation.   (line 122)
+* -l, ‘msgfmt’ option <3>:               msgfmt Invocation.   (line 146)
+* -L, ‘msgfmt’ option:                   msgfmt Invocation.   (line 180)
+* -l, ‘msgfmt’ option <4>:               msgfmt Invocation.   (line 184)
+* -l, ‘msginit’ option:                  msginit Invocation.  (line  82)
 * -l, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  45)
 * -l, ‘msgunfmt’ option <1>:             msgunfmt Invocation. (line  62)
 * -l, ‘msgunfmt’ option <2>:             msgunfmt Invocation. (line  78)
@@ -17046,8 +17445,8 @@ Option Index
 * -m, ‘msgcmp’ option:                   msgcmp Invocation.   (line  35)
 * -M, ‘msggrep’ option:                  msggrep Invocation.  (line  70)
 * -m, ‘msgmerge’ option:                 msgmerge Invocation. (line  96)
-* -m, ‘xgettext’ option:                 xgettext Invocation. (line 433)
-* -M, ‘xgettext’ option:                 xgettext Invocation. (line 437)
+* -m, ‘xgettext’ option:                 xgettext Invocation. (line 483)
+* -M, ‘xgettext’ option:                 xgettext Invocation. (line 487)
 * -n, ‘gettext’ option:                  gettext Invocation.  (line  35)
 * -n, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line 138)
@@ -17055,11 +17454,11 @@ Option Index
 * -N, ‘msgcmp’ option:                   msgcmp Invocation.   (line  39)
 * -n, ‘msgcomm’ option:                  msgcomm Invocation.  (line 100)
 * -n, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line  91)
+                                                              (line  96)
 * -N, ‘msggrep’ option:                  msggrep Invocation.  (line  65)
 * -N, ‘msgmerge’ option:                 msgmerge Invocation. (line 100)
 * -n, ‘msguniq’ option:                  msguniq Invocation.  (line  97)
-* -n, ‘xgettext’ option:                 xgettext Invocation. (line 326)
+* -n, ‘xgettext’ option:                 xgettext Invocation. (line 368)
 * -o, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line  30)
 * -o, ‘msgcat’ option:                   msgcat Invocation.   (line  42)
@@ -17068,9 +17467,9 @@ Option Index
 * -o, ‘msgen’ option:                    msgen Invocation.    (line  36)
 * -o, ‘msgfilter’ option:                msgfilter Invocation.
                                                               (line  45)
-* -o, ‘msgfmt’ option:                   msgfmt Invocation.   (line  56)
+* -o, ‘msgfmt’ option:                   msgfmt Invocation.   (line  59)
 * -o, ‘msggrep’ option:                  msggrep Invocation.  (line  30)
-* -o, ‘msginit’ option:                  msginit Invocation.  (line  26)
+* -o, ‘msginit’ option:                  msginit Invocation.  (line  59)
 * -o, ‘msgmerge’ option:                 msgmerge Invocation. (line  51)
 * -o, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  93)
 * -o, ‘msguniq’ option:                  msguniq Invocation.  (line  37)
@@ -17088,16 +17487,16 @@ Option Index
 * -p, ‘msgconv’ option:                  msgconv Invocation.  (line  95)
 * -P, ‘msgen’ option:                    msgen Invocation.    (line  46)
 * -p, ‘msgen’ option:                    msgen Invocation.    (line  98)
-* -P, ‘msgexec’ option:                  msgexec Invocation.  (line  62)
+* -P, ‘msgexec’ option:                  msgexec Invocation.  (line  65)
 * -P, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 121)
+                                                              (line 126)
 * -p, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 171)
-* -P, ‘msgfmt’ option:                   msgfmt Invocation.   (line 176)
+                                                              (line 176)
+* -P, ‘msgfmt’ option:                   msgfmt Invocation.   (line 214)
 * -P, ‘msggrep’ option:                  msggrep Invocation.  (line 122)
 * -p, ‘msggrep’ option:                  msggrep Invocation.  (line 167)
-* -P, ‘msginit’ option:                  msginit Invocation.  (line  37)
-* -p, ‘msginit’ option:                  msginit Invocation.  (line  69)
+* -P, ‘msginit’ option:                  msginit Invocation.  (line  70)
+* -p, ‘msginit’ option:                  msginit Invocation.  (line 102)
 * -P, ‘msgmerge’ option:                 msgmerge Invocation. (line 112)
 * -p, ‘msgmerge’ option:                 msgmerge Invocation. (line 165)
 * -p, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 124)
@@ -17105,8 +17504,8 @@ Option Index
 * -p, ‘msguniq’ option:                  msguniq Invocation.  (line 112)
 * -p, ‘xgettext’ option:                 xgettext Invocation. (line  44)
 * -q, ‘msgmerge’ option:                 msgmerge Invocation. (line 213)
-* -r, ‘msgfmt’ option:                   msgfmt Invocation.   (line  76)
-* -r, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line  99)
+* -r, ‘msgfmt’ option:                   msgfmt Invocation.   (line  79)
+* -r, ‘msgfmt’ option <1>:               msgfmt Invocation.   (line 102)
 * -r, ‘msgunfmt’ option:                 msgunfmt Invocation. (line  41)
 * -r, ‘msgunfmt’ option <1>:             msgunfmt Invocation. (line  58)
 * -s, ‘msgattrib’ option:                msgattrib Invocation.
@@ -17116,16 +17515,16 @@ Option Index
 * -s, ‘msgconv’ option:                  msgconv Invocation.  (line 118)
 * -s, ‘msgen’ option:                    msgen Invocation.    (line 121)
 * -s, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 194)
+                                                              (line 199)
 * -s, ‘msgmerge’ option:                 msgmerge Invocation. (line 188)
 * -s, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 147)
 * -s, ‘msguniq’ option:                  msguniq Invocation.  (line 135)
-* -s, ‘xgettext’ option:                 xgettext Invocation. (line 363)
+* -s, ‘xgettext’ option:                 xgettext Invocation. (line 413)
 * -t, ‘msgcat’ option:                   msgcat Invocation.   (line  82)
 * -t, ‘msgconv’ option:                  msgconv Invocation.  (line  40)
 * -T, ‘msggrep’ option:                  msggrep Invocation.  (line  82)
 * -t, ‘msguniq’ option:                  msguniq Invocation.  (line  70)
-* -T, ‘xgettext’ option:                 xgettext Invocation. (line 271)
+* -T, ‘xgettext’ option:                 xgettext Invocation. (line 313)
 * -u, ‘msgcat’ option:                   msgcat Invocation.   (line  62)
 * -u, ‘msgcomm’ option:                  msgcomm Invocation.  (line  61)
 * -U, ‘msgmerge’ option:                 msgmerge Invocation. (line  44)
@@ -17140,21 +17539,21 @@ Option Index
 * -V, ‘msgcomm’ option:                  msgcomm Invocation.  (line 157)
 * -V, ‘msgconv’ option:                  msgconv Invocation.  (line 134)
 * -V, ‘msgen’ option:                    msgen Invocation.    (line 137)
-* -V, ‘msgexec’ option:                  msgexec Invocation.  (line  78)
+* -V, ‘msgexec’ option:                  msgexec Invocation.  (line  81)
 * -V, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 210)
-* -V, ‘msgfmt’ option:                   msgfmt Invocation.   (line 278)
-* -v, ‘msgfmt’ option:                   msgfmt Invocation.   (line 287)
+                                                              (line 215)
+* -V, ‘msgfmt’ option:                   msgfmt Invocation.   (line 316)
+* -v, ‘msgfmt’ option:                   msgfmt Invocation.   (line 325)
 * -v, ‘msggrep’ option:                  msggrep Invocation.  (line 114)
 * -V, ‘msggrep’ option:                  msggrep Invocation.  (line 204)
-* -V, ‘msginit’ option:                  msginit Invocation.  (line  99)
+* -V, ‘msginit’ option:                  msginit Invocation.  (line 132)
 * -V, ‘msgmerge’ option:                 msgmerge Invocation. (line 204)
 * -v, ‘msgmerge’ option:                 msgmerge Invocation. (line 208)
 * -V, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 159)
 * -v, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 163)
 * -V, ‘msguniq’ option:                  msguniq Invocation.  (line 151)
 * -V, ‘ngettext’ option:                 ngettext Invocation. (line  35)
-* -V, ‘xgettext’ option:                 xgettext Invocation. (line 448)
+* -V, ‘xgettext’ option:                 xgettext Invocation. (line 498)
 * -w, ‘msgattrib’ option:                msgattrib Invocation.
                                                               (line 163)
 * -w, ‘msgcat’ option:                   msgcat Invocation.   (line 139)
@@ -17162,13 +17561,13 @@ Option Index
 * -w, ‘msgconv’ option:                  msgconv Invocation.  (line 105)
 * -w, ‘msgen’ option:                    msgen Invocation.    (line 108)
 * -w, ‘msgfilter’ option:                msgfilter Invocation.
-                                                              (line 181)
+                                                              (line 186)
 * -w, ‘msggrep’ option:                  msggrep Invocation.  (line 177)
-* -w, ‘msginit’ option:                  msginit Invocation.  (line  79)
+* -w, ‘msginit’ option:                  msginit Invocation.  (line 112)
 * -w, ‘msgmerge’ option:                 msgmerge Invocation. (line 175)
 * -w, ‘msgunfmt’ option:                 msgunfmt Invocation. (line 134)
 * -w, ‘msguniq’ option:                  msguniq Invocation.  (line 122)
-* -w, ‘xgettext’ option:                 xgettext Invocation. (line 350)
+* -w, ‘xgettext’ option:                 xgettext Invocation. (line 400)
 * -X, ‘msggrep’ option:                  msggrep Invocation.  (line  90)
 * -x, ‘xgettext’ option:                 xgettext Invocation. (line  89)
 
@@ -17212,19 +17611,19 @@ Variable Index
                                                                (line 12)
 * LC_TIME, environment variable <1>:     gettext grok.         (line 29)
 * LINGUAS, environment variable:         Installers.           (line 17)
-* MSGEXEC_LOCATION, environment variable: msgexec Invocation.  (line 18)
-* MSGEXEC_MSGCTXT, environment variable: msgexec Invocation.   (line 18)
-* MSGEXEC_MSGID, environment variable:   msgexec Invocation.   (line 18)
+* MSGEXEC_LOCATION, environment variable: msgexec Invocation.  (line 21)
+* MSGEXEC_MSGCTXT, environment variable: msgexec Invocation.   (line 21)
+* MSGEXEC_MSGID, environment variable:   msgexec Invocation.   (line 21)
 * MSGEXEC_MSGID_PLURAL, environment variable: msgexec Invocation.
-                                                               (line 18)
+                                                               (line 21)
 * MSGEXEC_PLURAL_FORM, environment variable: msgexec Invocation.
-                                                               (line 18)
+                                                               (line 21)
 * MSGEXEC_PREV_MSGCTXT, environment variable: msgexec Invocation.
-                                                               (line 18)
+                                                               (line 21)
 * MSGEXEC_PREV_MSGID, environment variable: msgexec Invocation.
-                                                               (line 18)
+                                                               (line 21)
 * MSGEXEC_PREV_MSGID_PLURAL, environment variable: msgexec Invocation.
-                                                               (line 18)
+                                                               (line 21)
 * MSGFILTER_LOCATION, environment variable: msgfilter Invocation.
                                                                (line 11)
 * MSGFILTER_MSGCTXT, environment variable: msgfilter Invocation.
@@ -17522,7 +17921,7 @@ General Index
 * ‘acconfig.h’ file:                     acconfig.            (line   6)
 * accumulating translations:             Creating Compendia.  (line  14)
 * ‘aclocal.m4’ file:                     aclocal.             (line   6)
-* adding keywords, ‘xgettext’:           xgettext Invocation. (line 133)
+* adding keywords, ‘xgettext’:           xgettext Invocation. (line 175)
 * ambiguities:                           Preparing Strings.   (line  41)
 * apply a filter to translations:        msgfilter Invocation.
                                                               (line   8)
@@ -17548,11 +17947,11 @@ General Index
 * bibliography:                          References.          (line   6)
 * big picture:                           Overview.            (line   6)
 * bind_textdomain_codeset:               Charset conversion.  (line  26)
-* Boost format strings:                  xgettext Invocation. (line 284)
+* Boost format strings:                  xgettext Invocation. (line 326)
 * boost-format flag:                     PO Files.            (line 200)
 * bug report address:                    Introduction.        (line  24)
 * C and C-like languages:                C.                   (line   6)
-* C trigraphs:                           xgettext Invocation. (line 271)
+* C trigraphs:                           xgettext Invocation. (line 313)
 * C#:                                    C#.                  (line   6)
 * C# mode, and ‘msgfmt’ program:         msgfmt Invocation.   (line  36)
 * C# mode, and ‘msgunfmt’ program:       msgunfmt Invocation. (line  19)
@@ -17562,7 +17961,7 @@ General Index
 * C#, string concatenation:              Preparing Strings.   (line 168)
 * c-format flag:                         PO Files.            (line  88)
 * c-format, and ‘xgettext’:              c-format Flag.       (line  47)
-* catalog encoding and ‘msgexec’ output: msgexec Invocation.  (line  32)
+* catalog encoding and ‘msgexec’ output: msgexec Invocation.  (line  35)
 * ‘catclose’, a ‘catgets’ function:      Interface to catgets.
                                                               (line  44)
 * ‘catgets’, a ‘catgets’ function:       Interface to catgets.
@@ -17573,7 +17972,7 @@ General Index
 * character encoding:                    Aspects.             (line  67)
 * charset conversion at runtime:         Charset conversion.  (line   6)
 * charset of PO files:                   Header Entry.        (line 101)
-* check format strings:                  msgfmt Invocation.   (line 192)
+* check format strings:                  msgfmt Invocation.   (line 230)
 * checking of translations:              Manipulating.        (line  41)
 * clisp:                                 Common Lisp.         (line   6)
 * clisp C sources:                       clisp C.             (line   6)
@@ -17585,7 +17984,7 @@ General Index
 * Common Lisp:                           Common Lisp.         (line   6)
 * compare PO files:                      msgcmp Invocation.   (line   8)
 * comparison of interfaces:              Comparison.          (line   6)
-* compatibility with X/Open ‘msgfmt’:    msgfmt Invocation.   (line 225)
+* compatibility with X/Open ‘msgfmt’:    msgfmt Invocation.   (line 263)
 * compendium:                            Compendium.          (line   6)
 * compendium, creating:                  Creating Compendia.  (line   6)
 * concatenate PO files:                  msgcat Invocation.   (line   8)
@@ -17595,7 +17994,7 @@ General Index
 * ‘config.h.in’ file:                    config.h.in.         (line   6)
 * context:                               Contexts.            (line   6)
 * context, argument specification in ‘xgettext’: xgettext Invocation.
-                                                              (line 133)
+                                                              (line 175)
 * context, in MO files:                  MO Files.            (line  71)
 * context, in PO files:                  PO Files.            (line 211)
 * control characters:                    Preparing Strings.   (line 190)
@@ -17615,7 +18014,7 @@ General Index
 * dcpgettext:                            Contexts.            (line  56)
 * dcpgettext_expr:                       Contexts.            (line 112)
 * debugging messages marked as format strings: xgettext Invocation.
-                                                              (line 288)
+                                                              (line 330)
 * Desktop Entry mode, and ‘msgfmt’ program: msgfmt Invocation.
                                                               (line  49)
 * dialect:                               Manipulating.        (line  28)
@@ -17658,11 +18057,11 @@ General Index
 * filter messages according to attributes: msgattrib Invocation.
                                                               (line   8)
 * find common messages:                  msgcomm Invocation.  (line   8)
-* force use of fuzzy entries:            msgfmt Invocation.   (line 241)
+* force use of fuzzy entries:            msgfmt Invocation.   (line 279)
 * format strings:                        c-format Flag.       (line   6)
 * Free Pascal:                           Pascal.              (line   6)
-* function attribute, __format_arg__:    xgettext Invocation. (line 249)
-* function attribute, __format__:        xgettext Invocation. (line 235)
+* function attribute, __format_arg__:    xgettext Invocation. (line 291)
+* function attribute, __format__:        xgettext Invocation. (line 277)
 * fuzzy entries:                         Fuzzy Entries.       (line   6)
 * fuzzy flag:                            PO Files.            (line  78)
 * gawk:                                  gawk.                (line   6)
@@ -17713,10 +18112,10 @@ General Index
 * Java, string concatenation:            Preparing Strings.   (line 168)
 * java-format flag:                      PO Files.            (line 143)
 * javascript-format flag:                PO Files.            (line 208)
-* KDE format strings:                    xgettext Invocation. (line 280)
+* KDE format strings:                    xgettext Invocation. (line 322)
 * KDE PO file editor:                    KBabel.              (line   5)
 * kde-format flag:                       PO Files.            (line 196)
-* keyboard accelerator checking:         msgfmt Invocation.   (line 229)
+* keyboard accelerator checking:         msgfmt Invocation.   (line 267)
 * l10n:                                  Concepts.            (line   6)
 * language codes:                        Language Codes.      (line   6)
 * language selection:                    Locale Environment Variables.
@@ -17778,7 +18177,7 @@ General Index
 * marking translatable strings:          Overview.            (line  34)
 * markup:                                Preparing Strings.   (line 190)
 * menu entries:                          Contexts.            (line   6)
-* menu, keyboard accelerator support:    msgfmt Invocation.   (line 229)
+* menu, keyboard accelerator support:    msgfmt Invocation.   (line 267)
 * merge PO files:                        msgcat Invocation.   (line   8)
 * merging two PO files:                  Manipulating.        (line  10)
 * message catalog files location:        Locating Catalogs.   (line   6)
@@ -17786,7 +18185,7 @@ General Index
 * migration from earlier versions of ‘gettext’: Prerequisites.
                                                               (line   6)
 * ‘mkinstalldirs’ file:                  mkinstalldirs.       (line   6)
-* mnemonics of menu entries:             msgfmt Invocation.   (line 229)
+* mnemonics of menu entries:             msgfmt Invocation.   (line 267)
 * MO file’s format:                      MO Files.            (line   6)
 * modify message attributes:             msgattrib Invocation.
                                                               (line  59)
@@ -17800,7 +18199,7 @@ General Index
 * ‘msgen’ program, usage:                msgen Invocation.    (line   6)
 * ‘msgexec’ program, usage:              msgexec Invocation.  (line   6)
 * ‘msgfilter’ filter and catalog encoding: msgfilter Invocation.
-                                                              (line  58)
+                                                              (line  62)
 * ‘msgfilter’ program, usage:            msgfilter Invocation.
                                                               (line   6)
 * ‘msgfmt’ program, usage:               msgfmt Invocation.   (line   6)
@@ -17895,7 +18294,7 @@ General Index
 * PO mode (Emacs) commands:              Main PO Commands.    (line   6)
 * PO template file:                      Template.            (line   6)
 * portability problems with ‘sed’:       msgfilter Invocation.
-                                                              (line  69)
+                                                              (line  73)
 * ‘POTFILES.in’ file:                    po/POTFILES.in.      (line   6)
 * po_file_domains:                       libgettextpo.        (line  40)
 * po_file_free:                          libgettextpo.        (line  35)
@@ -17908,6 +18307,7 @@ General Index
 * po_message_msgstr_plural:              libgettextpo.        (line  84)
 * po_next_message:                       libgettextpo.        (line  60)
 * preparing programs for translation:    Sources.             (line   6)
+* preparing rules for XML translation:   Preparing ITS Rules. (line   6)
 * preparing shell scripts for translation: Preparing Shell Scripts.
                                                               (line   6)
 * problems with ‘catgets’ interface:     Problems with catgets.
@@ -17917,7 +18317,7 @@ General Index
 * Python:                                Python.              (line   6)
 * python-brace-format flag:              PO Files.            (line 119)
 * python-format flag:                    PO Files.            (line 115)
-* Qt format strings:                     xgettext Invocation. (line 276)
+* Qt format strings:                     xgettext Invocation. (line 318)
 * Qt mode, and ‘msgfmt’ program:         msgfmt Invocation.   (line  46)
 * qt-format flag:                        PO Files.            (line 188)
 * qt-plural-format flag:                 PO Files.            (line 192)
@@ -17926,7 +18326,7 @@ General Index
 * quote characters, use in PO files:     Header Entry.        (line 160)
 * range: flag:                           PO Files.            (line 262)
 * ‘recode-sr-latin’ program:             msgfilter Invocation.
-                                                              (line  96)
+                                                              (line 101)
 * related reading:                       References.          (line   6)
 * release:                               Release Management.  (line   6)
 * RST:                                   RST.                 (line   6)
@@ -17937,6 +18337,7 @@ General Index
 * search messages in a catalog:          msggrep Invocation.  (line   8)
 * selecting message language:            Locale Environment Variables.
                                                               (line   6)
+* sentence end markers, ‘xgettext’:      xgettext Invocation. (line 149)
 * sentences:                             Preparing Strings.   (line  44)
 * setting up ‘gettext’ at build time:    Installers.          (line   6)
 * setting up ‘gettext’ at run time:      Locale Environment Variables.
@@ -17952,7 +18353,7 @@ General Index
 * sorting ‘msgcat’ output:               msgcat Invocation.   (line 152)
 * sorting ‘msgmerge’ output:             msgmerge Invocation. (line 188)
 * sorting ‘msgunfmt’ output:             msgunfmt Invocation. (line 147)
-* sorting output of ‘xgettext’:          xgettext Invocation. (line 363)
+* sorting output of ‘xgettext’:          xgettext Invocation. (line 413)
 * specifying plural form in a PO file:   Plural forms.        (line 177)
 * standard output, and ‘msgcat’:         msgcat Invocation.   (line  44)
 * standard output, and ‘msgmerge’ program: msgmerge Invocation.
@@ -17960,13 +18361,15 @@ General Index
 * string concatenation:                  Preparing Strings.   (line 117)
 * string normalization in entries:       Normalizing.         (line   6)
 * style:                                 Preparing Strings.   (line  24)
+* supported languages, ‘msgfmt’:         msgfmt Invocation.   (line 180)
 * supported languages, ‘xgettext’:       xgettext Invocation. (line  54)
+* supported syntax checks, ‘xgettext’:   xgettext Invocation. (line 116)
 * Tcl:                                   Tcl.                 (line   6)
 * Tcl mode, and ‘msgfmt’ program:        msgfmt Invocation.   (line  43)
 * Tcl mode, and ‘msgunfmt’ program:      msgunfmt Invocation. (line  26)
 * tcl-format flag:                       PO Files.            (line 163)
 * template PO file:                      Overview.            (line  67)
-* testing ‘.po’ files for equivalence:   xgettext Invocation. (line 373)
+* testing ‘.po’ files for equivalence:   xgettext Invocation. (line 423)
 * Tk’s scripting language:               Tcl.                 (line   6)
 * translated entries:                    Translated Entries.  (line   6)
 * translating menu entries:              Contexts.            (line   6)
@@ -17986,6 +18389,7 @@ General Index
 * ‘wxWidgets’ library:                   wxWidgets.           (line   6)
 * ‘xargs’, and output from ‘msgexec’:    msgexec Invocation.  (line  14)
 * ‘xgettext’ program, usage:             xgettext Invocation. (line   6)
+* XML mode, and ‘msgfmt’ program:        msgfmt Invocation.   (line  52)
 * ‘xmodmap’ program, and typing quotation marks: Header Entry.
                                                               (line 172)
 * YaST2 scripting language:              YCP.                 (line   6)
@@ -17996,245 +18400,249 @@ General Index
 
 Tag Table:
 Node: Top2954
-Node: Introduction18147
-Node: Why19789
-Ref: Why-Footnote-123045
-Node: Concepts23201
-Node: Aspects26632
-Node: Files33240
-Node: Overview35190
-Node: Users45277
-Node: System Installation46192
-Node: Setting the GUI Locale47885
-Node: Setting the POSIX Locale49293
-Node: Locale Names50275
-Node: Locale Environment Variables52764
-Node: The LANGUAGE variable55107
-Node: Installing Localizations57128
-Node: PO Files58505
-Ref: PO Files-Footnote-171643
-Node: Sources71778
-Node: Importing73020
-Node: Triggering73724
-Node: Preparing Strings77082
-Node: Mark Keywords86241
-Node: Marking90809
-Node: c-format Flag98766
-Node: Special cases102812
-Node: Bug Report Address105595
-Node: Names107574
-Node: Libraries111880
-Node: Template114970
-Node: xgettext Invocation115735
-Node: Creating134056
-Node: msginit Invocation134965
-Node: Header Entry138010
-Node: Updating147467
-Node: msgmerge Invocation147686
-Node: Editing154152
-Node: KBabel154516
-Node: Gtranslator154656
-Node: PO Mode154800
-Node: Installation156460
-Node: Main PO Commands158476
-Node: Entry Positioning163748
-Node: Normalizing169393
-Node: Translated Entries173954
-Node: Fuzzy Entries175359
-Node: Untranslated Entries178666
-Node: Obsolete Entries180665
-Node: Modifying Translations183964
-Node: Modifying Comments192106
-Node: Subedit196655
-Node: C Sources Context200673
-Node: Auxiliary205902
-Node: Compendium209222
-Node: Creating Compendia209837
-Node: Using Compendia212399
-Node: Manipulating213357
-Node: msgcat Invocation217301
-Node: msgconv Invocation222623
-Node: msggrep Invocation226614
-Node: msgfilter Invocation233436
-Node: msguniq Invocation241622
-Node: msgcomm Invocation246362
-Node: msgcmp Invocation251263
-Node: msgattrib Invocation253504
-Node: msgen Invocation259273
-Node: msgexec Invocation263682
-Node: Colorizing266941
-Node: The --color option267996
-Node: The TERM variable269725
-Node: The --style option271279
-Node: Style rules272657
-Node: Customizing less279670
-Node: libgettextpo281125
-Node: Binaries286375
-Node: msgfmt Invocation286727
-Node: msgunfmt Invocation296469
-Node: MO Files301153
-Node: Programmers309764
-Node: catgets310978
-Node: Interface to catgets312408
-Node: Problems with catgets314477
-Node: gettext315402
-Node: Interface to gettext316925
-Node: Ambiguities319293
-Node: Locating Catalogs322053
-Ref: Locating Catalogs-Footnote-1323318
-Ref: Locating Catalogs-Footnote-2323550
-Node: Charset conversion323703
-Node: Contexts326223
-Node: Plural forms331843
-Ref: Plural forms-Footnote-1348061
-Node: Optimized gettext348183
-Node: Comparison349534
-Node: Using libintl.a353901
-Node: gettext grok354356
-Node: Temp Programmers357065
-Node: Temp Implementations357597
-Node: Temp catgets359015
-Node: Temp WSI360742
-Node: Temp Notes362805
-Node: Translators363319
-Node: Trans Intro 0363864
-Node: Trans Intro 1366721
-Node: Discussions368694
-Node: Organization372412
-Node: Central Coordination374498
-Node: National Teams375646
-Node: Sub-Cultures378180
-Node: Organizational Ideas379121
-Node: Mailing Lists380152
-Node: Information Flow381989
-Node: Translating plural forms384256
-Node: Prioritizing messages387699
-Node: Maintainers392083
-Node: Flat and Non-Flat394060
-Node: Prerequisites395590
-Node: gettextize Invocation399849
-Node: Adjusting Files407629
-Node: po/POTFILES.in409521
-Node: po/LINGUAS410820
-Node: po/Makevars412627
-Node: po/Rules-*413617
-Node: configure.ac415178
-Node: config.guess418343
-Node: mkinstalldirs419809
-Node: aclocal420222
-Node: acconfig422777
-Node: config.h.in423321
-Node: Makefile424869
-Node: src/Makefile427601
-Node: lib/gettext.h432527
-Node: autoconf macros434860
-Node: AM_GNU_GETTEXT435764
-Node: AM_GNU_GETTEXT_VERSION439988
-Node: AM_GNU_GETTEXT_NEED440467
-Node: AM_GNU_GETTEXT_INTL_SUBDIR441400
-Node: AM_PO_SUBDIRS442085
-Node: AM_XGETTEXT_OPTION442924
-Node: AM_ICONV443835
-Node: Version Control Issues446220
-Node: Distributed Development446975
-Node: Files under Version Control449010
-Node: Translations under Version Control452501
-Ref: Translations under Version Control-Footnote-1454577
-Node: autopoint Invocation454667
-Node: Release Management456684
-Node: Installers457225
-Node: Programming Languages458488
-Node: Language Implementors459326
-Node: Programmers for other Languages464316
-Node: Translators for other Languages464910
-Node: c-format466720
-Node: objc-format468494
-Node: sh-format468853
-Node: python-format469702
-Node: lisp-format470509
-Node: elisp-format470838
-Node: librep-format471333
-Node: scheme-format471736
-Node: smalltalk-format472015
-Node: java-format472546
-Node: csharp-format473001
-Node: awk-format473383
-Node: object-pascal-format473711
-Node: ycp-format474097
-Node: tcl-format474515
-Node: perl-format474817
-Node: php-format475609
-Node: gcc-internal-format475985
-Node: gfc-internal-format477144
-Node: qt-format477893
-Node: qt-plural-format478339
-Node: kde-format478698
-Node: boost-format479127
-Node: lua-format479714
-Node: javascript-format480053
-Node: Maintainers for other Languages480823
-Node: List of Programming Languages482111
-Node: C483475
-Node: sh484923
-Node: Preparing Shell Scripts486283
-Node: gettext.sh489803
-Node: gettext Invocation490371
-Node: ngettext Invocation492422
-Node: envsubst Invocation494302
-Node: eval_gettext Invocation495781
-Node: eval_ngettext Invocation496246
-Node: bash496764
-Node: Python498813
-Node: Common Lisp501293
-Node: clisp C502143
-Node: Emacs Lisp502901
-Node: librep503669
-Node: Scheme504450
-Node: Smalltalk505325
-Node: Java506420
-Node: C#512464
-Node: gawk522138
-Node: Pascal523112
-Node: wxWidgets524524
-Node: YCP525491
-Node: Tcl526270
-Node: Perl527760
-Node: General Problems530952
-Node: Default Keywords536620
-Node: Special Keywords537648
-Node: Quote-like Expressions539210
-Node: Interpolation I541527
-Node: Interpolation II545471
-Node: Parentheses547855
-Node: Long Lines549380
-Node: Perl Pitfalls551247
-Node: PHP555581
-Node: Pike556590
-Node: GCC-source557291
-Node: Lua558111
-Node: JavaScript559117
-Node: List of Data Formats559872
-Node: POT560417
-Node: RST560687
-Node: Glade560925
-Node: GSettings561337
-Node: Conclusion561632
-Node: History562146
-Node: References566549
-Node: Language Codes568248
-Node: Usual Language Codes568763
-Node: Rare Language Codes573681
-Node: Country Codes575531
-Node: Licenses582684
-Node: GNU GPL584540
-Node: GNU LGPL603840
-Node: GNU FDL632077
-Node: Program Index654608
-Node: Option Index657018
-Node: Variable Index711172
-Node: PO Mode Index715843
-Node: Autoconf Macro Index732553
-Node: Index733360
+Node: Introduction18343
+Node: Why19985
+Ref: Why-Footnote-123241
+Node: Concepts23397
+Node: Aspects26828
+Node: Files33436
+Node: Overview35386
+Node: Users45473
+Node: System Installation46388
+Node: Setting the GUI Locale48081
+Node: Setting the POSIX Locale49489
+Node: Locale Names50471
+Node: Locale Environment Variables52960
+Node: The LANGUAGE variable55303
+Node: Installing Localizations57324
+Node: PO Files58701
+Ref: PO Files-Footnote-171839
+Node: Sources71974
+Node: Importing73216
+Node: Triggering73920
+Node: Preparing Strings77278
+Node: Mark Keywords86437
+Node: Marking91005
+Node: c-format Flag98962
+Node: Special cases103008
+Node: Bug Report Address105792
+Node: Names107771
+Node: Libraries112077
+Node: Template115167
+Node: xgettext Invocation115932
+Node: Creating136166
+Node: msginit Invocation137075
+Node: Header Entry141398
+Node: Updating150855
+Node: msgmerge Invocation151074
+Node: Editing157540
+Node: KBabel157904
+Node: Gtranslator158044
+Node: PO Mode158188
+Node: Installation159848
+Node: Main PO Commands161864
+Node: Entry Positioning167136
+Node: Normalizing172781
+Node: Translated Entries177342
+Node: Fuzzy Entries178747
+Node: Untranslated Entries182054
+Node: Obsolete Entries184053
+Node: Modifying Translations187352
+Node: Modifying Comments195494
+Node: Subedit200043
+Node: C Sources Context204061
+Node: Auxiliary209290
+Node: Compendium212610
+Node: Creating Compendia213225
+Node: Using Compendia215787
+Node: Manipulating216745
+Node: msgcat Invocation220689
+Node: msgconv Invocation226011
+Node: msggrep Invocation230002
+Node: msgfilter Invocation236824
+Node: msguniq Invocation245178
+Node: msgcomm Invocation249918
+Node: msgcmp Invocation254819
+Node: msgattrib Invocation257060
+Node: msgen Invocation262829
+Node: msgexec Invocation267238
+Node: Colorizing270562
+Node: The --color option271617
+Node: The TERM variable273346
+Node: The --style option274900
+Node: Style rules276278
+Node: Customizing less283291
+Node: libgettextpo284746
+Node: Binaries289996
+Node: msgfmt Invocation290348
+Node: msgunfmt Invocation301074
+Node: MO Files305758
+Node: Programmers314369
+Node: catgets315583
+Node: Interface to catgets317013
+Node: Problems with catgets319082
+Node: gettext320007
+Node: Interface to gettext321530
+Node: Ambiguities323898
+Node: Locating Catalogs326658
+Ref: Locating Catalogs-Footnote-1327923
+Ref: Locating Catalogs-Footnote-2328155
+Node: Charset conversion328308
+Node: Contexts330828
+Node: Plural forms336448
+Ref: Plural forms-Footnote-1353164
+Node: Optimized gettext353536
+Node: Comparison354887
+Node: Using libintl.a359254
+Node: gettext grok359709
+Node: Temp Programmers362418
+Node: Temp Implementations362950
+Node: Temp catgets364368
+Node: Temp WSI366095
+Node: Temp Notes368158
+Node: Translators368672
+Node: Trans Intro 0369217
+Node: Trans Intro 1372074
+Node: Discussions374047
+Node: Organization377765
+Node: Central Coordination379851
+Node: National Teams380999
+Node: Sub-Cultures383533
+Node: Organizational Ideas384474
+Node: Mailing Lists385505
+Node: Information Flow387342
+Node: Translating plural forms389609
+Node: Prioritizing messages393052
+Node: Maintainers397436
+Node: Flat and Non-Flat399413
+Node: Prerequisites400943
+Node: gettextize Invocation405202
+Node: Adjusting Files412982
+Node: po/POTFILES.in414828
+Node: po/LINGUAS416127
+Node: po/Makevars417934
+Node: po/Rules-*418924
+Node: configure.ac420485
+Node: config.guess423650
+Node: mkinstalldirs425116
+Node: aclocal425529
+Node: acconfig428084
+Node: config.h.in428628
+Node: Makefile430176
+Node: src/Makefile432908
+Node: lib/gettext.h437834
+Node: autoconf macros440167
+Node: AM_GNU_GETTEXT441071
+Node: AM_GNU_GETTEXT_VERSION445295
+Node: AM_GNU_GETTEXT_NEED445774
+Node: AM_GNU_GETTEXT_INTL_SUBDIR446707
+Node: AM_PO_SUBDIRS447392
+Node: AM_XGETTEXT_OPTION448231
+Node: AM_ICONV449142
+Node: Version Control Issues451527
+Node: Distributed Development452282
+Node: Files under Version Control454317
+Node: Translations under Version Control457808
+Ref: Translations under Version Control-Footnote-1459884
+Node: autopoint Invocation459974
+Node: Release Management462339
+Node: Installers462880
+Node: Programming Languages464143
+Node: Language Implementors464981
+Node: Programmers for other Languages469971
+Node: Translators for other Languages470565
+Node: c-format472427
+Node: objc-format474201
+Node: sh-format474560
+Node: python-format475409
+Node: lisp-format476182
+Node: elisp-format476511
+Node: librep-format477006
+Node: scheme-format477409
+Node: smalltalk-format477688
+Node: java-format478219
+Node: csharp-format478674
+Node: awk-format479056
+Node: object-pascal-format479384
+Node: ycp-format479770
+Node: tcl-format480188
+Node: perl-format480490
+Node: php-format481282
+Node: gcc-internal-format481658
+Node: gfc-internal-format482817
+Node: qt-format483566
+Node: qt-plural-format484012
+Node: kde-format484371
+Node: kde-kuit-format484803
+Node: boost-format485468
+Node: lua-format486060
+Node: javascript-format486399
+Node: Maintainers for other Languages487169
+Node: List of Programming Languages488457
+Node: C489858
+Node: sh491306
+Node: Preparing Shell Scripts492666
+Node: gettext.sh496186
+Node: gettext Invocation496754
+Node: ngettext Invocation498805
+Node: envsubst Invocation500685
+Node: eval_gettext Invocation502164
+Node: eval_ngettext Invocation502629
+Node: bash503147
+Node: Python505196
+Node: Common Lisp507676
+Node: clisp C508526
+Node: Emacs Lisp509284
+Node: librep510052
+Node: Scheme510833
+Node: Smalltalk511708
+Node: Java512803
+Node: C#518847
+Node: gawk528521
+Node: Pascal529626
+Node: wxWidgets531038
+Node: YCP532005
+Node: Tcl532784
+Node: Perl534274
+Node: General Problems537466
+Node: Default Keywords543134
+Node: Special Keywords544162
+Node: Quote-like Expressions545724
+Node: Interpolation I548041
+Node: Interpolation II551985
+Node: Parentheses554369
+Node: Long Lines555894
+Node: Perl Pitfalls557761
+Node: PHP562095
+Node: Pike563104
+Node: GCC-source563805
+Node: Lua564625
+Node: JavaScript565631
+Node: Vala566399
+Node: List of Data Formats567318
+Node: POT568015
+Node: RST568285
+Node: Glade568523
+Node: GSettings568935
+Node: AppData569246
+Node: Preparing ITS Rules569677
+Node: Conclusion575810
+Node: History576324
+Node: References580727
+Node: Language Codes582426
+Node: Usual Language Codes582941
+Node: Rare Language Codes587859
+Node: Country Codes589709
+Node: Licenses596862
+Node: GNU GPL598718
+Node: GNU LGPL618035
+Node: GNU FDL646272
+Node: Program Index668803
+Node: Option Index671213
+Node: Variable Index726431
+Node: PO Mode Index731102
+Node: Autoconf Macro Index747812
+Node: Index748619
 
 End Tag Table
 
diff --git a/gettext-tools/doc/gettext.texi b/gettext-tools/doc/gettext.texi
index 507c622..8391073 100644
--- a/gettext-tools/doc/gettext.texi
+++ b/gettext-tools/doc/gettext.texi
@@ -79,7 +79,7 @@ This file provides documentation for GNU @code{gettext} utilities.
 It also serves as a reference for the free Translation Project.
 
 @copying
-Copyright (C) 1995-1998, 2001-2012 Free Software Foundation, Inc.
+Copyright (C) 1995-1998, 2001-2015 Free Software Foundation, Inc.
 
 This manual is free documentation.  It is dually licensed under the
 GNU FDL and the GNU GPL.  This means that you can redistribute this
@@ -439,6 +439,7 @@ Individual Programming Languages
 * GCC-source::                  GNU Compiler Collection sources
 * Lua::                         Lua
 * JavaScript::                  JavaScript
+* Vala::                        Vala
 
 sh - Shell Script
 
@@ -468,6 +469,8 @@ Internationalizable Data
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
 * GSettings::                   GSettings - GNOME user configuration schema
+* AppData::                     AppData - freedesktop.org application description
+* Preparing ITS Rules::         Preparing Rules for XML Internationalization
 
 Concluding Remarks
 
@@ -2606,7 +2609,7 @@ with the following one:
 
 @{
   static const char *messages[] = @{
-    gettext_noop ("some very meaningful message",
+    gettext_noop ("some very meaningful message"),
     gettext_noop ("and another one")
   @};
   const char *string;
@@ -6221,7 +6224,11 @@ The following rules are known at this point.  The language with families
 are listed.  But this does not necessarily mean the information can be
 generalized for the whole family (as can be easily seen in the table
 below).@footnote{Additions are welcome.  Send appropriate information to
-@email{bug-gnu-gettext@@gnu.org} and @email{bug-glibc-manual@@gnu.org}.}
+@email{bug-gnu-gettext@@gnu.org} and @email{bug-glibc-manual@@gnu.org}.
+The Unicode CLDR Project (@uref{http://cldr.unicode.org}) provides a
+comprehensive set of plural forms in a different format.  The
+@code{msginit} program has preliminary support for the format so you can
+use it as a baseline (@pxref{msginit Invocation}).}
 
 @table @asis
 @item Only one form:
@@ -6241,6 +6248,8 @@ Languages with this property include:
 Japanese, @c   122.1 million speakers
 Vietnamese, @c  68.6 million speakers
 Korean @c       66.3 million speakers
+@item Tai-Kadai family
+Thai @c         20.4 million speakers
 @end table
 
 @item Two forms, singular used for one only
@@ -6278,6 +6287,8 @@ Finnish, @c      5.0 million speakers
 Estonian @c      1.0 million speakers
 @item Semitic family
 Hebrew @c        5.3 million speakers
+@item Austronesian family
+Bahasa Indonesian @c 23.2 million speakers
 @item Artificial
 Esperanto @c       2 million speakers
 @end table
@@ -6453,6 +6464,23 @@ Languages with this property include:
 @item Slavic family
 Slovenian @c   1.9 million speakers
 @end table
+
+@item Six forms, special cases for one, two, all numbers ending in 02, 03, @dots{} 10, all numbers ending in 11 @dots{} 99, and others
+The header entry would look like this:
+
+@smallexample
+Plural-Forms: nplurals=6; \
+    plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 \
+    : n%100>=11 ? 4 : 5;
+@end smallexample
+
+@noindent
+Languages with this property include:
+
+@table @asis
+@item Afroasiatic family
+Arabic @c    246.0 million speakers
+@end table
 @end table
 
 You might now ask, @code{ngettext} handles only numbers @var{n} of type
@@ -7690,11 +7718,10 @@ changes needed in each.
 So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
 @code{gettext} @value{VERSION} distribution itself, or from the GNU
-@code{hello} distribution (@uref{http://www.franken.de/users/gnu/ke/hello}
-or @uref{http://www.gnu.franken.de/ke/hello/})  You may indeed
-refer to the source code of the GNU @code{gettext} and GNU @code{hello}
-packages, as they are intended to be good examples for using GNU
-gettext functionality.
+@code{hello} distribution (@uref{http://www.gnu.org/software/hello}).
+You may indeed refer to the source code of the GNU @code{gettext} and
+GNU @code{hello} packages, as they are intended to be good examples for
+using GNU gettext functionality.
 
 @menu
 * po/POTFILES.in::              @file{POTFILES.in} in @file{po/}
@@ -8754,7 +8781,7 @@ adds to the @file{configure.ac} or @file{configure.in} a line of the
 form
 
 @example
-AM_GNU_GETTEXT_VERSION(@value{VERSION})
+AM_GNU_GETTEXT_VERSION(@value{ARCHIVE-VERSION})
 @end example
 
 @noindent
@@ -9041,6 +9068,7 @@ strings.
 * qt-format::                   Qt Format Strings
 * qt-plural-format::            Qt Plural Format Strings
 * kde-format::                  KDE Format Strings
+* kde-kuit-format::             KUIT Format Strings
 * boost-format::                Boost Format Strings
 * lua-format::                  Lua Format Strings
 * javascript-format::           JavaScript Format Strings
@@ -9127,11 +9155,10 @@ of the @samp{str} object.
 
 Python @code{%} format strings are described in
 @w{Python Library reference} /
-@w{2. Built-in Types, Exceptions and Functions} /
-@w{2.2. Built-in Types} /
-@w{2.2.6. Sequence Types} /
-@w{2.2.6.2. String Formatting Operations}.
-@uref{http://www.python.org/doc/2.2.1/lib/typesseq-strings.html}.
+@w{5. Built-in Types} /
+@w{5.6. Sequence Types} /
+@w{5.6.2. String Formatting Operations}.
+@uref{http://docs.python.org/2/library/stdtypes.html#string-formatting-operations}.
 
 Python brace format strings are described in @w{PEP 3101 -- Advanced
 String Formatting}, @uref{http://www.python.org/dev/peps/pep-3101/}.
@@ -9289,7 +9316,7 @@ Qt format strings are described in the documentation of the QObject::tr method
 @uref{file:/usr/lib/qt-4.3.0/doc/html/qobject.html}.
 In summary, the only allowed directive is @samp{%n}.
 
-@node kde-format, boost-format, qt-plural-format, Translators for other Languages
+@node kde-format, kde-kuit-format, qt-plural-format, Translators for other Languages
 @subsection KDE Format Strings
 
 KDE 4 format strings are defined as follows:
@@ -9297,7 +9324,19 @@ A directive consists of a @samp{%} followed by a non-zero decimal number.
 If a @samp{%n} occurs in a format strings, all of @samp{%1}, ..., @samp{%(n-1)}
 must occur as well, except possibly one of them.
 
-@node boost-format, lua-format, kde-format, Translators for other Languages
+@node kde-kuit-format, boost-format, kde-format, Translators for other Languages
+@subsection KUIT Format Strings
+
+KUIT (KDE User Interface Text) is compatible with KDE 4 format strings,
+while it also allows programmers to add semantic information to a format
+string, through XML markup tags.  For example, if the first format
+directive in a string is a filename, programmers could indicate that
+with a @samp{filename} tag, like @samp{<filename>%1</filename>}.
+
+KUIT format strings are described in
+@uref{http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/prg_guide.html#kuit_markup}.
+
+@node boost-format, lua-format, kde-kuit-format, Translators for other Languages
 @subsection Boost Format Strings
 
 Boost format strings are described in the documentation of the
@@ -9434,6 +9473,7 @@ that language, and to combine the resulting files using @code{msgcat}.
 * GCC-source::                  GNU Compiler Collection sources
 * Lua::                         Lua
 * JavaScript::                  JavaScript
+* Vala::                        Vala
 @end menu
 
 @node C, sh, List of Programming Languages, List of Programming Languages
@@ -10649,7 +10689,9 @@ with a single-letter name.
 gawk 3.1 or newer
 
 @item File extension
-@code{awk}
+@code{awk}, @code{gawk}, @code{twjr}.
+The file extension @code{twjr} is used by TexiWeb Jr
+(@uref{https://github.com/arnoldrobbins/texiwebjr}).
 
 @item String syntax
 @code{"abc"}
@@ -11956,7 +11998,7 @@ On platforms without gettext, the functions are not available.
 ---
 @end table
 
-@node JavaScript,  , Lua, List of Programming Languages
+@node JavaScript, Vala, Lua, List of Programming Languages
 @subsection JavaScript
 
 @table @asis
@@ -12010,6 +12052,60 @@ On platforms without gettext, the functions are not available.
 ---
 @end table
 
+@node Vala,  , JavaScript, List of Programming Languages
+@subsection Vala
+
+@table @asis
+@item RPMs
+vala
+
+@item File extension
+@code{vala}
+
+@item String syntax
+@itemize @bullet
+
+@item @code{"abc"}
+
+@item @code{"""abc"""}
+
+@end itemize
+
+@item gettext shorthand
+@code{_("abc")}
+
+@item gettext/ngettext functions
+@code{gettext}, @code{dgettext}, @code{dcgettext}, @code{ngettext},
+@code{dngettext}, @code{dpgettext}, @code{dpgettext2}
+
+@item textdomain
+@code{textdomain} function, defined under the @code{Intl} namespace
+
+@item bindtextdomain
+@code{bindtextdomain} function, defined under the @code{Intl} namespace
+
+@item setlocale
+Programmer must call @code{Intl.setlocale (LocaleCategory.ALL, "")}
+
+@item Prerequisite
+---
+
+@item Use or emulate GNU gettext
+Use
+
+@item Extractor
+@code{xgettext}
+
+@item Formatting with positions
+Same as for the C language.
+
+@item Portability
+autoconf (gettext.m4) and #if ENABLE_NLS
+
+@item po-mode marking
+yes
+@end table
+
 @c This is the template for new languages.
 @ignore
 
@@ -12059,6 +12155,8 @@ using GNU gettext.
 * RST::                         Resource String Table
 * Glade::                       Glade - GNOME user interface description
 * GSettings::                   GSettings - GNOME user configuration schema
+* AppData::                     AppData - freedesktop.org application description
+* Preparing ITS Rules::  Preparing Rules for XML Internationalization
 @end menu
 
 @node POT, RST, List of Data Formats, List of Data Formats
@@ -12104,7 +12202,7 @@ glade, libglade, glade2, libglade2, intltool
 @code{xgettext}, @code{libglade-xgettext}, @code{xml-i18n-extract}, @code{intltool-extract}
 @end table
 
-@node GSettings,  , Glade, List of Data Formats
+@node GSettings, AppData, Glade, List of Data Formats
 @subsection GSettings - GNOME user configuration schema
 
 @table @asis
@@ -12118,6 +12216,180 @@ glib2
 @code{xgettext}, @code{intltool-extract}
 @end table
 
+@node AppData, Preparing ITS Rules, GSettings, List of Data Formats
+@subsection AppData - freedesktop.org application description
+
+@table @asis
+@item RPMs
+appdata-tools, appstream, libappstream-glib, libappstream-glib-builder
+
+@item File extension
+@code{appdata.xml}
+
+@item Extractor
+@code{xgettext}, @code{intltool-extract}, @code{itstool}
+@end table
+
+@menu
+@end menu
+
+@node Preparing ITS Rules,  , AppData, List of Data Formats
+@subsection Preparing Rules for XML Internationalization
+@cindex preparing rules for XML translation
+
+Marking translatable strings in an XML file is done through a separate
+"rule" file, making use of the Internationalization Tag Set standard
+(ITS, @uref{http://www.w3.org/TR/its20/}).  The currently supported ITS
+data categories are: @samp{Translate}, @samp{Localization Note},
+@samp{Elements Within Text}, and @samp{Preserve Space}.  In addition to
+them, @code{xgettext} also recognizes the following extended data
+categories:
+
+@table @samp
+@item Context
+
+This data category associates @code{msgctxt} to the extracted text.  In
+the global rule, the @code{contextRule} element contains the following:
+
+@itemize
+@item
+A required @code{selector} attribute.  It contains an absolute selector
+that selects the nodes to which this rule applies.
+
+@item
+A required @code{contextPointer} attribute that contains a relative
+selector pointing to a node that holds the @code{msgctxt} value.
+
+@item
+An optional @code{textPointer} attribute that contains a relative
+selector pointing to a node that holds the @code{msgid} value.
+@end itemize
+
+@item Escape Special Characters
+
+This data category indicates whether the special XML characters
+(@code{<}, @code{>}, @code{&}, @code{"}) are escaped with entity
+reference.  In the global rule, the @code{escapeRule} element contains
+the following:
+
+@itemize
+@item
+A required @code{selector} attribute.  It contains an absolute selector
+that selects the nodes to which this rule applies.
+
+@item
+A required @code{escape} attribute with the value @code{yes} or @code{no}.
+@end itemize
+
+@item Extended Preserve Space
+
+This data category extends the standard @samp{Preserve Space} data
+category with the additional value @samp{trim}.  The value means to
+remove the leading and trailing whitespaces of the content, but not to
+normalize whitespaces in the middle.  In the global rule, the
+@code{preserveSpaceRule} element contains the following:
+
+@itemize
+@item
+A required @code{selector} attribute.  It contains an absolute selector
+that selects the nodes to which this rule applies.
+
+@item
+A required @code{space} attribute with the value @code{default},
+@code{preserve}, or @code{trim}.
+@end itemize
+
+@end table
+
+All those extended data categories can only be expressed with global
+rules, and the rule elements have to have the
+@code{https://www.gnu.org/s/gettext/ns/its/extensions/1.0} namespace.
+
+Given the following XML document in a file @file{messages.xml}:
+
+@example
+<?xml version="1.0"?>
+<messages>
+  <message>
+    <p>A translatable string</p>
+  </message>
+  <message>
+    <p translatable="no">A non-translatable string</p>
+  </message>
+</messages>
+@end example
+
+To extract the first text content ("A translatable string"), but not the
+second ("A non-translatable string"), the following ITS rules can be used:
+
+@example
+<?xml version="1.0"?>
+<its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+  <its:translateRule selector="/messages" translate="no"/>
+  <its:translateRule selector="//message/p" translate="yes"/>
+
+  <!-- If 'p' has an attribute 'translatable' with the value 'no', then
+       the content is not translatable.  -->
+  <its:translateRule selector="//message/p[@@translatable = 'no']"
+    translate="no"/>
+</its:rules>
+@end example
+
+@samp{xgettext} needs another file called "locating rule" to associate
+an ITS rule with an XML file.  If the above ITS file is saved as
+@file{messages.its}, the locating rule would look like:
+
+@example
+<?xml version="1.0"?>
+<locatingRules>
+  <locatingRule name="Messages" pattern="*.xml">
+    <documentRule localName="messages" target="messages.its"/>
+  </locatingRule>
+  <locatingRule name="Messages" pattern="*.msg" target="messages.its"/>
+</locatingRules>
+@end example
+
+The @code{locatingRule} element must have a @code{pattern} attribute,
+which denotes either a literal file name or a wildcard pattern of the
+XML file.  The @code{locatingRule} element can have child
+@code{documentRule} element, which adds checks on the content of the XML
+file.
+
+The first rule matches any file with the @file{.xml} file extension, but
+it only applies to XML files whose root element is @samp{<messages>}.
+
+The second rule indicates that the same ITS rule file are also
+applicable to any file with the @file{.msg} file extension.  The
+optional @code{name} attribute of @code{locatingRule} allows to choose
+rules by name, typically with @code{xgettext}'s @code{-L} option.
+
+The associated ITS rule file is indicated by the @code{target} attribute
+of @code{locatingRule} or @code{documentRule}.  If it is specified in a
+@code{documentRule} element, the parent @code{locatingRule} shouldn't
+have the @code{target} attribute.
+
+Locating rule files must have the @file{.loc} file extension.  Both ITS
+rule files and locating rule files must be installed in the
+@file{$prefix/share/gettext/its} directory.  Once those files are
+properly installed, @code{xgettext} can extract translatable strings
+from the matching XML files.
+
+@subsubsection Two Use-cases of Translated Strings in XML
+
+For XML, there are two use-cases of translated strings.  One is the case
+where the translated strings are directly consumed by programs, and the
+other is the case where the translated strings are merged back to the
+original XML document.  In the former case, special characters in the
+extracted strings shouldn't be escaped, while they should in the latter
+case.  To control wheter to escape special characters, the @samp{Escape
+Special Characters} data category can be used.
+
+To merge the translations, the @samp{msgfmt} program can be used with
+the option @code{--xml}.  @xref{msgfmt Invocation}, for more details
+about how one calls the @samp{msgfmt} program.  @samp{msgfmt}'s
+@code{--xml} option doesn't perform character escaping, so translated
+strings can have arbitrary XML constructs, such as elements for markup.
+
 @c This is the template for new data formats.
 @ignore
 
@@ -12369,19 +12641,19 @@ A copy of the license is included in @ref{GNU GPL}.
 @end menu
 
 @page
-@node GNU GPL
+@node GNU GPL, GNU LGPL, Licenses, Licenses
 @appendixsec GNU GENERAL PUBLIC LICENSE
 @cindex GPL, GNU General Public License
 @cindex License, GNU GPL
 @include gpl.texi
 @page
-@node GNU LGPL
+@node GNU LGPL, GNU FDL, GNU GPL, Licenses
 @appendixsec GNU LESSER GENERAL PUBLIC LICENSE
 @cindex LGPL, GNU Lesser General Public License
 @cindex License, GNU LGPL
 @include lgpl.texi
 @page
-@node GNU FDL
+@node GNU FDL,  , GNU LGPL, Licenses
 @appendixsec GNU Free Documentation License
 @cindex FDL, GNU Free Documentation License
 @cindex License, GNU FDL
diff --git a/gettext-tools/doc/gettext_1.html b/gettext-tools/doc/gettext_1.html
index c643537..1ff58df 100644
--- a/gettext-tools/doc/gettext_1.html
+++ b/gettext-tools/doc/gettext_1.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 1  Introduction</TITLE>
@@ -174,7 +174,7 @@ by which the programs are untied from calling only English strings or
 other English specific habits, and connected to generic ways of doing
 the same, instead.  Program developers may use various techniques to
 internationalize their programs.  Some of these have been standardized.
-GNU <CODE>gettext</CODE> offers one of these standards.  See section <A HREF="gettext_11.html#SEC179">11  The Programmer's View</A>.
+GNU <CODE>gettext</CODE> offers one of these standards.  See section <A HREF="gettext_11.html#SEC180">11  The Programmer's View</A>.
 
 </P>
 <P>
@@ -559,7 +559,7 @@ a Template PO file, not yet oriented towards any particular language.
 See section <A HREF="gettext_5.html#SEC28">5.1  Invoking the <CODE>xgettext</CODE> Program</A>, for more details about how one calls the
 <CODE>xgettext</CODE> program.  If you are <EM>really</EM> lazy, you might
 be interested at working a lot more right away, and preparing the
-whole distribution setup (see section <A HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>).  By doing so, you
+whole distribution setup (see section <A HREF="gettext_13.html#SEC213">13  The Maintainer's View</A>).  By doing so, you
 spare yourself typing the <CODE>xgettext</CODE> command, as <CODE>make</CODE>
 should now generate the proper things automatically for you!
 
@@ -576,7 +576,7 @@ Then comes the initial translation of messages.  Translation in
 itself is a whole matter, still exclusively meant for humans,
 and whose complexity far overwhelms the level of this manual.
 Nevertheless, a few hints are given in some other chapter of this
-manual (see section <A HREF="gettext_12.html#SEC199">12  The Translator's View</A>).  You will also find there indications
+manual (see section <A HREF="gettext_12.html#SEC200">12  The Translator's View</A>).  You will also find there indications
 about how to contact translating teams, or becoming part of them,
 for sharing your translating concerns with others who target the same
 native language.
@@ -675,7 +675,7 @@ distribution.
 Once the PO file is complete and dependable, the <CODE>msgfmt</CODE> program
 is used for turning the PO file into a machine-oriented format, which
 may yield efficient retrieval of translations by the programs of the
-package, whenever needed at runtime (see section <A HREF="gettext_10.html#SEC178">10.3  The Format of GNU MO Files</A>).  See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, for more information about all modes of execution
+package, whenever needed at runtime (see section <A HREF="gettext_10.html#SEC179">10.3  The Format of GNU MO Files</A>).  See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, for more information about all modes of execution
 for the <CODE>msgfmt</CODE> program.
 
 </P>
diff --git a/gettext-tools/doc/gettext_10.html b/gettext-tools/doc/gettext_10.html
index 50eee2f..3ae4722 100644
--- a/gettext-tools/doc/gettext_10.html
+++ b/gettext-tools/doc/gettext_10.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 10  Producing Binary MO Files</TITLE>
@@ -18,15 +18,15 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_9.html">previous<
 <H2><A NAME="SEC157" HREF="gettext_toc.html#TOC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX967"></A>
-<A NAME="IDX968"></A>
+<A NAME="IDX975"></A>
+<A NAME="IDX976"></A>
 
 <PRE>
 msgfmt [<VAR>option</VAR>] <VAR>filename</VAR>.po ...
 </PRE>
 
 <P>
-<A NAME="IDX969"></A>
+<A NAME="IDX977"></A>
 The <CODE>msgfmt</CODE> programs generates a binary message catalog from a textual
 translation description.
 
@@ -43,8 +43,8 @@ translation description.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX970"></A>
-<A NAME="IDX971"></A>
+<A NAME="IDX978"></A>
+<A NAME="IDX979"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting binary
 file will be written relative to the current directory, though.
@@ -65,47 +65,53 @@ If an input file is <SAMP>&lsquo;-&rsquo;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>&lsquo;--java&rsquo;</SAMP>
 <DD>
-<A NAME="IDX972"></A>
-<A NAME="IDX973"></A>
-<A NAME="IDX974"></A>
+<A NAME="IDX980"></A>
+<A NAME="IDX981"></A>
+<A NAME="IDX982"></A>
 Java mode: generate a Java <CODE>ResourceBundle</CODE> class.
 
 <DT><SAMP>&lsquo;--java2&rsquo;</SAMP>
 <DD>
-<A NAME="IDX975"></A>
+<A NAME="IDX983"></A>
 Like --java, and assume Java2 (JDK 1.2 or higher).
 
 <DT><SAMP>&lsquo;--csharp&rsquo;</SAMP>
 <DD>
-<A NAME="IDX976"></A>
-<A NAME="IDX977"></A>
+<A NAME="IDX984"></A>
+<A NAME="IDX985"></A>
 C# mode: generate a .NET .dll file containing a subclass of
 <CODE>GettextResourceSet</CODE>.
 
 <DT><SAMP>&lsquo;--csharp-resources&rsquo;</SAMP>
 <DD>
-<A NAME="IDX978"></A>
-<A NAME="IDX979"></A>
+<A NAME="IDX986"></A>
+<A NAME="IDX987"></A>
 C# resources mode: generate a .NET <TT>&lsquo;.resources&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--tcl&rsquo;</SAMP>
 <DD>
-<A NAME="IDX980"></A>
-<A NAME="IDX981"></A>
+<A NAME="IDX988"></A>
+<A NAME="IDX989"></A>
 Tcl mode: generate a tcl/msgcat <TT>&lsquo;.msg&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--qt&rsquo;</SAMP>
 <DD>
-<A NAME="IDX982"></A>
-<A NAME="IDX983"></A>
+<A NAME="IDX990"></A>
+<A NAME="IDX991"></A>
 Qt mode: generate a Qt <TT>&lsquo;.qm&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--desktop&rsquo;</SAMP>
 <DD>
-<A NAME="IDX984"></A>
-<A NAME="IDX985"></A>
+<A NAME="IDX992"></A>
+<A NAME="IDX993"></A>
 Desktop Entry mode: generate a <TT>&lsquo;.desktop&rsquo;</TT> file.
 
+<DT><SAMP>&lsquo;--xml&rsquo;</SAMP>
+<DD>
+<A NAME="IDX994"></A>
+<A NAME="IDX995"></A>
+XML mode: generate an XML file.
+
 </DL>
 
 
@@ -118,13 +124,13 @@ Desktop Entry mode: generate a <TT>&lsquo;.desktop&rsquo;</TT> file.
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX986"></A>
-<A NAME="IDX987"></A>
+<A NAME="IDX996"></A>
+<A NAME="IDX997"></A>
 Write output to specified file.
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX988"></A>
+<A NAME="IDX998"></A>
 Direct the program to work strictly following the Uniforum/Sun
 implementation.  Currently this only affects the naming of the output
 file.  If this option is not given the name of the output file is the
@@ -151,27 +157,27 @@ If the output <VAR>file</VAR> is <SAMP>&lsquo;-&rsquo;</SAMP>, output is written
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX989"></A>
-<A NAME="IDX990"></A>
+<A NAME="IDX999"></A>
+<A NAME="IDX1000"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX991"></A>
-<A NAME="IDX992"></A>
+<A NAME="IDX1001"></A>
+<A NAME="IDX1002"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX993"></A>
+<A NAME="IDX1003"></A>
 Specify the base directory of classes directory hierarchy.
 
 <DT><SAMP>&lsquo;--source&rsquo;</SAMP>
 <DD>
-<A NAME="IDX994"></A>
+<A NAME="IDX1004"></A>
 Produce a .java source file, instead of a compiled .class file.
 
 </DL>
@@ -192,22 +198,22 @@ is written under the specified directory.
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX995"></A>
-<A NAME="IDX996"></A>
+<A NAME="IDX1005"></A>
+<A NAME="IDX1006"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX997"></A>
-<A NAME="IDX998"></A>
+<A NAME="IDX1007"></A>
+<A NAME="IDX1008"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX999"></A>
+<A NAME="IDX1009"></A>
 Specify the base directory for locale dependent <TT>&lsquo;.dll&rsquo;</TT> files.
 
 </DL>
@@ -228,14 +234,14 @@ locale.
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1000"></A>
-<A NAME="IDX1001"></A>
+<A NAME="IDX1010"></A>
+<A NAME="IDX1011"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1002"></A>
+<A NAME="IDX1012"></A>
 Specify the base directory of <TT>&lsquo;.msg&rsquo;</TT> message catalogs.
 
 </DL>
@@ -253,15 +259,15 @@ written in the specified directory.
 
 <DT><SAMP>&lsquo;--template=<VAR>template</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1003"></A>
+<A NAME="IDX1013"></A>
 Specify a .desktop file used as a template.
 
 <DT><SAMP>&lsquo;-k[<VAR>keywordspec</VAR>]&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--keyword[=<VAR>keywordspec</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1004"></A>
-<A NAME="IDX1005"></A>
+<A NAME="IDX1014"></A>
+<A NAME="IDX1015"></A>
 Specify <VAR>keywordspec</VAR> as an additional keyword to be looked for.
 Without a <VAR>keywordspec</VAR>, the option means to not use default keywords.
 
@@ -269,15 +275,16 @@ Without a <VAR>keywordspec</VAR>, the option means to not use default keywords.
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1006"></A>
-<A NAME="IDX1007"></A>
+<A NAME="IDX1016"></A>
+<A NAME="IDX1017"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1008"></A>
-Specify the base directory of <TT>&lsquo;.msg&rsquo;</TT> message catalogs.
+<A NAME="IDX1018"></A>
+Specify the directory where PO files are read.  The directory must
+contain the <SAMP>&lsquo;LINGUAS&rsquo;</SAMP> file.
 
 </DL>
 
@@ -293,11 +300,8 @@ msgfmt --desktop --template=<VAR>template</VAR> --locale=<VAR>locale</VAR> \
 </PRE>
 
 <P>
-On the other hand, when using msgfmt from a Makefile, it is cumbersome
-to loop over all locales under a particular directory.  msgfmt
-provides a special operation mode for this use-case.  To generate a
-<SAMP>&lsquo;.desktop&rsquo;</SAMP> file from multiple <SAMP>&lsquo;.po&rsquo;</SAMP> files under a directory,
-specify the directory with the <SAMP>&lsquo;-d&rsquo;</SAMP> option.
+msgfmt provides a special "bulk" operation mode to process multiple
+<TT>&lsquo;.po&rsquo;</TT> files at a time.
 
 </P>
 
@@ -319,7 +323,75 @@ options are mandatory.
 </P>
 
 
-<H3><A NAME="SEC165" HREF="gettext_toc.html#TOC165">10.1.8  Input file syntax</A></H3>
+<H3><A NAME="SEC165" HREF="gettext_toc.html#TOC165">10.1.8  XML mode operations</A></H3>
+
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;--template=<VAR>template</VAR>&rsquo;</SAMP>
+<DD>
+<A NAME="IDX1019"></A>
+Specify an XML file used as a template.
+
+<DT><SAMP>&lsquo;-L <VAR>name</VAR>&rsquo;</SAMP>
+<DD>
+<DT><SAMP>&lsquo;--language=<VAR>name</VAR>&rsquo;</SAMP>
+<DD>
+<A NAME="IDX1020"></A>
+<A NAME="IDX1021"></A>
+<A NAME="IDX1022"></A>
+Specifies the language of the input files.
+
+<DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
+<DD>
+<DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
+<DD>
+<A NAME="IDX1023"></A>
+<A NAME="IDX1024"></A>
+Specify the locale name, either a language specification of the form <VAR>ll</VAR>
+or a combined language and country specification of the form <VAR>ll_CC</VAR>.
+
+<DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
+<DD>
+<A NAME="IDX1025"></A>
+Specify the base directory of <TT>&lsquo;.po&rsquo;</TT> message catalogs.
+
+</DL>
+
+<P>
+To generate an XML file for a single locale, you can use it as follows.
+
+</P>
+
+<PRE>
+msgfmt --xml --template=<VAR>template</VAR> --locale=<VAR>locale</VAR> \
+  -o <VAR>file</VAR> <VAR>filename</VAR>.po ...
+</PRE>
+
+<P>
+msgfmt provides a special "bulk" operation mode to process multiple
+<TT>&lsquo;.po&rsquo;</TT> files at a time.
+
+</P>
+
+<PRE>
+msgfmt --xml --template=<VAR>template</VAR> -d <VAR>directory</VAR> -o <VAR>file</VAR>
+</PRE>
+
+<P>
+msgfmt first reads the <SAMP>&lsquo;LINGUAS&rsquo;</SAMP> file under <VAR>directory</VAR>, and
+then processes all <SAMP>&lsquo;.po&rsquo;</SAMP> files listed there.  You can also limit
+the locales to a subset, through the <SAMP>&lsquo;LINGUAS&rsquo;</SAMP> environment
+variable.
+
+</P>
+<P>
+For either operation modes, the <SAMP>&lsquo;-o&rsquo;</SAMP> and <SAMP>&lsquo;--template&rsquo;</SAMP>
+options are mandatory.
+
+</P>
+
+
+<H3><A NAME="SEC166" HREF="gettext_toc.html#TOC166">10.1.9  Input file syntax</A></H3>
 
 <DL COMPACT>
 
@@ -327,14 +399,14 @@ options are mandatory.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1009"></A>
-<A NAME="IDX1010"></A>
+<A NAME="IDX1026"></A>
+<A NAME="IDX1027"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1011"></A>
+<A NAME="IDX1028"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -342,7 +414,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
 
 
-<H3><A NAME="SEC166" HREF="gettext_toc.html#TOC166">10.1.9  Input file interpretation</A></H3>
+<H3><A NAME="SEC167" HREF="gettext_toc.html#TOC167">10.1.10  Input file interpretation</A></H3>
 
 <DL COMPACT>
 
@@ -350,15 +422,15 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 <DD>
 <DT><SAMP>&lsquo;--check&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1012"></A>
-<A NAME="IDX1013"></A>
+<A NAME="IDX1029"></A>
+<A NAME="IDX1030"></A>
 Perform all the checks implied by <CODE>--check-format</CODE>, <CODE>--check-header</CODE>,
 <CODE>--check-domain</CODE>.
 
 <DT><SAMP>&lsquo;--check-format&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1014"></A>
-<A NAME="IDX1015"></A>
+<A NAME="IDX1031"></A>
+<A NAME="IDX1032"></A>
 Check language dependent format strings.
 
 If the string represents a format string used in a
@@ -377,19 +449,19 @@ used in a <CODE>printf</CODE>-like function and so <CODE>msgfmt</CODE> might rep
 errors where there are none.
 
 To solve this problem the programmer can dictate the decision to the
-<CODE>xgettext</CODE> program (see section <A HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A>).  The translator should not
+<CODE>xgettext</CODE> program (see section <A HREF="gettext_15.html#SEC252">15.3.1  C Format Strings</A>).  The translator should not
 consider removing the flag from the <KBD>#,</KBD> line.  This "fix" would be
 reversed again as soon as <CODE>msgmerge</CODE> is called the next time.
 
 <DT><SAMP>&lsquo;--check-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1016"></A>
+<A NAME="IDX1033"></A>
 Verify presence and contents of the header entry.  See section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A>,
 for a description of the various fields in the header entry.
 
 <DT><SAMP>&lsquo;--check-domain&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1017"></A>
+<A NAME="IDX1034"></A>
 Check for conflicts between domain directives and the <CODE>--output-file</CODE>
 option
 
@@ -397,18 +469,18 @@ option
 <DD>
 <DT><SAMP>&lsquo;--check-compatibility&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1018"></A>
-<A NAME="IDX1019"></A>
-<A NAME="IDX1020"></A>
+<A NAME="IDX1035"></A>
+<A NAME="IDX1036"></A>
+<A NAME="IDX1037"></A>
 Check that GNU msgfmt behaves like X/Open msgfmt.  This will give an error
 when attempting to use the GNU extensions.
 
 <DT><SAMP>&lsquo;--check-accelerators[=<VAR>char</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1021"></A>
-<A NAME="IDX1022"></A>
-<A NAME="IDX1023"></A>
-<A NAME="IDX1024"></A>
+<A NAME="IDX1038"></A>
+<A NAME="IDX1039"></A>
+<A NAME="IDX1040"></A>
+<A NAME="IDX1041"></A>
 Check presence of keyboard accelerators for menu items.  This is based on
 the convention used in some GUIs that a keyboard accelerator in a menu
 item string is designated by an immediately preceding <SAMP>&lsquo;&#38;&rsquo;</SAMP> character.
@@ -423,9 +495,9 @@ instead of <SAMP>&lsquo;&#38;&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--use-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1025"></A>
-<A NAME="IDX1026"></A>
-<A NAME="IDX1027"></A>
+<A NAME="IDX1042"></A>
+<A NAME="IDX1043"></A>
+<A NAME="IDX1044"></A>
 Use fuzzy entries in output.  Note that using this option is usually wrong,
 because fuzzy messages are exactly those which have not been validated by
 a human translator.
@@ -434,7 +506,7 @@ a human translator.
 
 
 
-<H3><A NAME="SEC167" HREF="gettext_toc.html#TOC167">10.1.10  Output details</A></H3>
+<H3><A NAME="SEC168" HREF="gettext_toc.html#TOC168">10.1.11  Output details</A></H3>
 
 <DL COMPACT>
 
@@ -442,13 +514,13 @@ a human translator.
 <DD>
 <DT><SAMP>&lsquo;--alignment=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1028"></A>
-<A NAME="IDX1029"></A>
+<A NAME="IDX1045"></A>
+<A NAME="IDX1046"></A>
 Align strings to <VAR>number</VAR> bytes (default: 1).
 
 <DT><SAMP>&lsquo;--endianness=<VAR>byteorder</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1030"></A>
+<A NAME="IDX1047"></A>
 Write out 32-bit numbers in the given byte order.  The possible values are
 <CODE>big</CODE> and <CODE>little</CODE>.  The default depends on the platform, namely
 on the endianness of the CPU.
@@ -462,7 +534,7 @@ platform.
 
 <DT><SAMP>&lsquo;--no-hash&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1031"></A>
+<A NAME="IDX1048"></A>
 Don't include a hash table in the binary file.  Lookup will be more expensive
 at run time (binary search instead of hash table lookup).
 
@@ -470,7 +542,7 @@ at run time (binary search instead of hash table lookup).
 
 
 
-<H3><A NAME="SEC168" HREF="gettext_toc.html#TOC168">10.1.11  Informative output</A></H3>
+<H3><A NAME="SEC169" HREF="gettext_toc.html#TOC169">10.1.12  Informative output</A></H3>
 
 <DL COMPACT>
 
@@ -478,21 +550,21 @@ at run time (binary search instead of hash table lookup).
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1032"></A>
-<A NAME="IDX1033"></A>
+<A NAME="IDX1049"></A>
+<A NAME="IDX1050"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1034"></A>
-<A NAME="IDX1035"></A>
+<A NAME="IDX1051"></A>
+<A NAME="IDX1052"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;--statistics&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1036"></A>
+<A NAME="IDX1053"></A>
 Print statistics about translations.  When the option <CODE>--verbose</CODE> is used
 in combination with <CODE>--statistics</CODE>, the input file name is printed in
 front of the statistics line.
@@ -501,33 +573,33 @@ front of the statistics line.
 <DD>
 <DT><SAMP>&lsquo;--verbose&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1037"></A>
-<A NAME="IDX1038"></A>
+<A NAME="IDX1054"></A>
+<A NAME="IDX1055"></A>
 Increase verbosity level.
 
 </DL>
 
 
 
-<H2><A NAME="SEC169" HREF="gettext_toc.html#TOC169">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
+<H2><A NAME="SEC170" HREF="gettext_toc.html#TOC170">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX1039"></A>
-<A NAME="IDX1040"></A>
+<A NAME="IDX1056"></A>
+<A NAME="IDX1057"></A>
 
 <PRE>
 msgunfmt [<VAR>option</VAR>] [<VAR>file</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX1041"></A>
+<A NAME="IDX1058"></A>
 The <CODE>msgunfmt</CODE> program converts a binary message catalog to a
 Uniforum style .po file.
 
 </P>
 
 
-<H3><A NAME="SEC170" HREF="gettext_toc.html#TOC170">10.2.1  Operation mode</A></H3>
+<H3><A NAME="SEC171" HREF="gettext_toc.html#TOC171">10.2.1  Operation mode</A></H3>
 
 <DL COMPACT>
 
@@ -535,35 +607,35 @@ Uniforum style .po file.
 <DD>
 <DT><SAMP>&lsquo;--java&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1042"></A>
-<A NAME="IDX1043"></A>
-<A NAME="IDX1044"></A>
+<A NAME="IDX1059"></A>
+<A NAME="IDX1060"></A>
+<A NAME="IDX1061"></A>
 Java mode: input is a Java <CODE>ResourceBundle</CODE> class.
 
 <DT><SAMP>&lsquo;--csharp&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1045"></A>
-<A NAME="IDX1046"></A>
+<A NAME="IDX1062"></A>
+<A NAME="IDX1063"></A>
 C# mode: input is a .NET .dll file containing a subclass of
 <CODE>GettextResourceSet</CODE>.
 
 <DT><SAMP>&lsquo;--csharp-resources&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1047"></A>
-<A NAME="IDX1048"></A>
+<A NAME="IDX1064"></A>
+<A NAME="IDX1065"></A>
 C# resources mode: input is a .NET <TT>&lsquo;.resources&rsquo;</TT> file.
 
 <DT><SAMP>&lsquo;--tcl&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1049"></A>
-<A NAME="IDX1050"></A>
+<A NAME="IDX1066"></A>
+<A NAME="IDX1067"></A>
 Tcl mode: input is a tcl/msgcat <TT>&lsquo;.msg&rsquo;</TT> file.
 
 </DL>
 
 
 
-<H3><A NAME="SEC171" HREF="gettext_toc.html#TOC171">10.2.2  Input file location</A></H3>
+<H3><A NAME="SEC172" HREF="gettext_toc.html#TOC172">10.2.2  Input file location</A></H3>
 
 <DL COMPACT>
 
@@ -579,7 +651,7 @@ If no input <VAR>file</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, s
 </P>
 
 
-<H3><A NAME="SEC172" HREF="gettext_toc.html#TOC172">10.2.3  Input file location in Java mode</A></H3>
+<H3><A NAME="SEC173" HREF="gettext_toc.html#TOC173">10.2.3  Input file location in Java mode</A></H3>
 
 <DL COMPACT>
 
@@ -587,16 +659,16 @@ If no input <VAR>file</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, s
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1051"></A>
-<A NAME="IDX1052"></A>
+<A NAME="IDX1068"></A>
+<A NAME="IDX1069"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1053"></A>
-<A NAME="IDX1054"></A>
+<A NAME="IDX1070"></A>
+<A NAME="IDX1071"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
@@ -609,7 +681,7 @@ separated with an underscore.  The class is located using the <CODE>CLASSPATH</C
 </P>
 
 
-<H3><A NAME="SEC173" HREF="gettext_toc.html#TOC173">10.2.4  Input file location in C# mode</A></H3>
+<H3><A NAME="SEC174" HREF="gettext_toc.html#TOC174">10.2.4  Input file location in C# mode</A></H3>
 
 <DL COMPACT>
 
@@ -617,22 +689,22 @@ separated with an underscore.  The class is located using the <CODE>CLASSPATH</C
 <DD>
 <DT><SAMP>&lsquo;--resource=<VAR>resource</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1055"></A>
-<A NAME="IDX1056"></A>
+<A NAME="IDX1072"></A>
+<A NAME="IDX1073"></A>
 Specify the resource name.
 
 <DT><SAMP>&lsquo;-l <VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1057"></A>
-<A NAME="IDX1058"></A>
+<A NAME="IDX1074"></A>
+<A NAME="IDX1075"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1059"></A>
+<A NAME="IDX1076"></A>
 Specify the base directory for locale dependent <TT>&lsquo;.dll&rsquo;</TT> files.
 
 </DL>
@@ -645,7 +717,7 @@ locale.
 </P>
 
 
-<H3><A NAME="SEC174" HREF="gettext_toc.html#TOC174">10.2.5  Input file location in Tcl mode</A></H3>
+<H3><A NAME="SEC175" HREF="gettext_toc.html#TOC175">10.2.5  Input file location in Tcl mode</A></H3>
 
 <DL COMPACT>
 
@@ -653,14 +725,14 @@ locale.
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>locale</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1060"></A>
-<A NAME="IDX1061"></A>
+<A NAME="IDX1077"></A>
+<A NAME="IDX1078"></A>
 Specify the locale name, either a language specification of the form <VAR>ll</VAR>
 or a combined language and country specification of the form <VAR>ll_CC</VAR>.
 
 <DT><SAMP>&lsquo;-d <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1062"></A>
+<A NAME="IDX1079"></A>
 Specify the base directory of <TT>&lsquo;.msg&rsquo;</TT> message catalogs.
 
 </DL>
@@ -672,7 +744,7 @@ located in the specified directory.
 </P>
 
 
-<H3><A NAME="SEC175" HREF="gettext_toc.html#TOC175">10.2.6  Output file location</A></H3>
+<H3><A NAME="SEC176" HREF="gettext_toc.html#TOC176">10.2.6  Output file location</A></H3>
 
 <DL COMPACT>
 
@@ -680,8 +752,8 @@ located in the specified directory.
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1063"></A>
-<A NAME="IDX1064"></A>
+<A NAME="IDX1080"></A>
+<A NAME="IDX1081"></A>
 Write output to specified file.
 
 </DL>
@@ -693,7 +765,7 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 </P>
 
 
-<H3><A NAME="SEC176" HREF="gettext_toc.html#TOC176">10.2.7  Output details</A></H3>
+<H3><A NAME="SEC177" HREF="gettext_toc.html#TOC177">10.2.7  Output details</A></H3>
 
 <DL COMPACT>
 
@@ -701,32 +773,32 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1065"></A>
+<A NAME="IDX1082"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1066"></A>
+<A NAME="IDX1083"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1067"></A>
+<A NAME="IDX1084"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1068"></A>
-<A NAME="IDX1069"></A>
+<A NAME="IDX1085"></A>
+<A NAME="IDX1086"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1070"></A>
+<A NAME="IDX1087"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -735,15 +807,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1071"></A>
-<A NAME="IDX1072"></A>
+<A NAME="IDX1088"></A>
+<A NAME="IDX1089"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1073"></A>
+<A NAME="IDX1090"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -751,15 +823,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1074"></A>
-<A NAME="IDX1075"></A>
+<A NAME="IDX1091"></A>
+<A NAME="IDX1092"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1076"></A>
+<A NAME="IDX1093"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -768,9 +840,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1077"></A>
-<A NAME="IDX1078"></A>
-<A NAME="IDX1079"></A>
+<A NAME="IDX1094"></A>
+<A NAME="IDX1095"></A>
+<A NAME="IDX1096"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -778,7 +850,7 @@ for the translator to understand each message's context.
 
 
 
-<H3><A NAME="SEC177" HREF="gettext_toc.html#TOC177">10.2.8  Informative output</A></H3>
+<H3><A NAME="SEC178" HREF="gettext_toc.html#TOC178">10.2.8  Informative output</A></H3>
 
 <DL COMPACT>
 
@@ -786,34 +858,34 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1080"></A>
-<A NAME="IDX1081"></A>
+<A NAME="IDX1097"></A>
+<A NAME="IDX1098"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1082"></A>
-<A NAME="IDX1083"></A>
+<A NAME="IDX1099"></A>
+<A NAME="IDX1100"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;-v&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--verbose&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1084"></A>
-<A NAME="IDX1085"></A>
+<A NAME="IDX1101"></A>
+<A NAME="IDX1102"></A>
 Increase verbosity level.
 
 </DL>
 
 
 
-<H2><A NAME="SEC178" HREF="gettext_toc.html#TOC178">10.3  The Format of GNU MO Files</A></H2>
+<H2><A NAME="SEC179" HREF="gettext_toc.html#TOC179">10.3  The Format of GNU MO Files</A></H2>
 <P>
-<A NAME="IDX1086"></A>
-<A NAME="IDX1087"></A>
+<A NAME="IDX1103"></A>
+<A NAME="IDX1104"></A>
 
 </P>
 <P>
@@ -822,7 +894,7 @@ which appears below.
 
 </P>
 <P>
-<A NAME="IDX1088"></A>
+<A NAME="IDX1105"></A>
 The first two words serve the identification of the file.  The magic
 number will always signal GNU MO files.  The number is stored in the
 byte order of the generating machine, so the magic number really is
@@ -882,7 +954,7 @@ translated tables, making the system information very easy to find.
 
 </P>
 <P>
-<A NAME="IDX1089"></A>
+<A NAME="IDX1106"></A>
 The size <VAR>S</VAR> of the hash table can be zero.  In this case, the
 hash table itself is not contained in the MO file.  Some people might
 prefer this because a precomputed hashing table takes disk space, and
@@ -903,13 +975,13 @@ machines, a correct alignment will speed things up.
 
 </P>
 <P>
-<A NAME="IDX1090"></A>
+<A NAME="IDX1107"></A>
 Contexts are stored by storing the concatenation of the context, a
 <KBD>EOT</KBD> byte, and the original string, instead of the original string.
 
 </P>
 <P>
-<A NAME="IDX1091"></A>
+<A NAME="IDX1108"></A>
 Plural forms are stored by letting the plural of the original string
 follow the singular of the original string, separated through a
 <KBD>NUL</KBD> byte.  The length which appears in the string descriptor
diff --git a/gettext-tools/doc/gettext_11.html b/gettext-tools/doc/gettext_11.html
index d77e233..a4a443a 100644
--- a/gettext-tools/doc/gettext_11.html
+++ b/gettext-tools/doc/gettext_11.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 11  The Programmer's View</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_10.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC179" HREF="gettext_toc.html#TOC179">11  The Programmer's View</A></H1>
+<H1><A NAME="SEC180" HREF="gettext_toc.html#TOC180">11  The Programmer's View</A></H1>
 
 <P>
 One aim of the current message catalog implementation provided by
@@ -29,9 +29,9 @@ later explain our solution of this dilemma.
 
 
 
-<H2><A NAME="SEC180" HREF="gettext_toc.html#TOC180">11.1  About <CODE>catgets</CODE></A></H2>
+<H2><A NAME="SEC181" HREF="gettext_toc.html#TOC181">11.1  About <CODE>catgets</CODE></A></H2>
 <P>
-<A NAME="IDX1092"></A>
+<A NAME="IDX1109"></A>
 
 </P>
 <P>
@@ -64,9 +64,9 @@ therefore part of all Unix implementation (implementations, which are
 
 
 
-<H3><A NAME="SEC181" HREF="gettext_toc.html#TOC181">11.1.1  The Interface</A></H3>
+<H3><A NAME="SEC182" HREF="gettext_toc.html#TOC182">11.1.1  The Interface</A></H3>
 <P>
-<A NAME="IDX1093"></A>
+<A NAME="IDX1110"></A>
 
 </P>
 <P>
@@ -79,7 +79,7 @@ for the functions and the needed definitions are in the
 
 </P>
 <P>
-<A NAME="IDX1094"></A>
+<A NAME="IDX1111"></A>
 <CODE>catopen</CODE> is used like in this:
 
 </P>
@@ -98,7 +98,7 @@ message catalog, equivalent to handles to file returned by <CODE>open</CODE>.
 
 </P>
 <P>
-<A NAME="IDX1095"></A>
+<A NAME="IDX1112"></A>
 This handle is of course used in the <CODE>catgets</CODE> function which can
 be used like this:
 
@@ -130,7 +130,7 @@ should better be <CODE>const char *</CODE>, but the standard is published in
 
 </P>
 <P>
-<A NAME="IDX1096"></A>
+<A NAME="IDX1113"></A>
 The last of these functions is used and behaves as expected:
 
 </P>
@@ -145,9 +145,9 @@ After this no <CODE>catgets</CODE> call using the descriptor is legal anymore.
 </P>
 
 
-<H3><A NAME="SEC182" HREF="gettext_toc.html#TOC182">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
+<H3><A NAME="SEC183" HREF="gettext_toc.html#TOC183">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A></H3>
 <P>
-<A NAME="IDX1097"></A>
+<A NAME="IDX1114"></A>
 
 </P>
 <P>
@@ -166,9 +166,9 @@ more easy to manage.
 </P>
 
 
-<H2><A NAME="SEC183" HREF="gettext_toc.html#TOC183">11.2  About <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC184" HREF="gettext_toc.html#TOC184">11.2  About <CODE>gettext</CODE></A></H2>
 <P>
-<A NAME="IDX1098"></A>
+<A NAME="IDX1115"></A>
 
 </P>
 <P>
@@ -183,7 +183,7 @@ The main point about this solution is that it does not follow the
 method of normal file handling (open-use-close) and that it does not
 burden the programmer with so many tasks, especially the unique key handling.
 Of course here also a unique key is needed, but this key is the message
-itself (how long or short it is).  See section <A HREF="gettext_11.html#SEC191">11.3  Comparing the Two Interfaces</A> for a more
+itself (how long or short it is).  See section <A HREF="gettext_11.html#SEC192">11.3  Comparing the Two Interfaces</A> for a more
 detailed comparison of the two methods.
 
 </P>
@@ -197,9 +197,9 @@ in using this library will be interested in this description.
 
 
 
-<H3><A NAME="SEC184" HREF="gettext_toc.html#TOC184">11.2.1  The Interface</A></H3>
+<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">11.2.1  The Interface</A></H3>
 <P>
-<A NAME="IDX1099"></A>
+<A NAME="IDX1116"></A>
 
 </P>
 <P>
@@ -268,11 +268,11 @@ your language.
 </P>
 
 
-<H3><A NAME="SEC185" HREF="gettext_toc.html#TOC185">11.2.2  Solving Ambiguities</A></H3>
+<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">11.2.2  Solving Ambiguities</A></H3>
 <P>
-<A NAME="IDX1100"></A>
-<A NAME="IDX1101"></A>
-<A NAME="IDX1102"></A>
+<A NAME="IDX1117"></A>
+<A NAME="IDX1118"></A>
+<A NAME="IDX1119"></A>
 
 </P>
 <P>
@@ -346,9 +346,9 @@ unreliabilities.
 </P>
 
 
-<H3><A NAME="SEC186" HREF="gettext_toc.html#TOC186">11.2.3  Locating Message Catalog Files</A></H3>
+<H3><A NAME="SEC187" HREF="gettext_toc.html#TOC187">11.2.3  Locating Message Catalog Files</A></H3>
 <P>
-<A NAME="IDX1103"></A>
+<A NAME="IDX1120"></A>
 
 </P>
 <P>
@@ -387,10 +387,10 @@ through the third argument.
 </P>
 
 
-<H3><A NAME="SEC187" HREF="gettext_toc.html#TOC187">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
+<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A></H3>
 <P>
-<A NAME="IDX1104"></A>
-<A NAME="IDX1105"></A>
+<A NAME="IDX1121"></A>
+<A NAME="IDX1122"></A>
 
 </P>
 <P>
@@ -422,7 +422,7 @@ recommended that all <VAR>msgid</VAR>s be US-ASCII strings.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>bind_textdomain_codeset</B> <I>(const char *<VAR>domainname</VAR>, const char *<VAR>codeset</VAR>)</I>
-<DD><A NAME="IDX1106"></A>
+<DD><A NAME="IDX1123"></A>
 The <CODE>bind_textdomain_codeset</CODE> function can be used to specify the
 output character set for message catalogs for domain <VAR>domainname</VAR>.
 The <VAR>codeset</VAR> argument must be a valid codeset name which can be used
@@ -454,12 +454,12 @@ global variable <VAR>errno</VAR> is set accordingly.
 </P>
 
 
-<H3><A NAME="SEC188" HREF="gettext_toc.html#TOC188">11.2.5  Using contexts for solving ambiguities</A></H3>
+<H3><A NAME="SEC189" HREF="gettext_toc.html#TOC189">11.2.5  Using contexts for solving ambiguities</A></H3>
 <P>
-<A NAME="IDX1107"></A>
-<A NAME="IDX1108"></A>
-<A NAME="IDX1109"></A>
-<A NAME="IDX1110"></A>
+<A NAME="IDX1124"></A>
+<A NAME="IDX1125"></A>
+<A NAME="IDX1126"></A>
+<A NAME="IDX1127"></A>
 
 </P>
 <P>
@@ -497,7 +497,7 @@ over the functions from <CODE>&#60;libintl.h&#62;</CODE>.
 
 </P>
 <P>
-<A NAME="IDX1111"></A>
+<A NAME="IDX1128"></A>
 
 <PRE>
 const char *pgettext (const char *msgctxt, const char *msgid);
@@ -532,8 +532,8 @@ fetches a particular translation of the <VAR>msgid</VAR>.
 
 </P>
 <P>
-<A NAME="IDX1112"></A>
-<A NAME="IDX1113"></A>
+<A NAME="IDX1129"></A>
+<A NAME="IDX1130"></A>
 
 <PRE>
 const char *dpgettext (const char *domain_name,
@@ -618,9 +618,9 @@ string literals, more general macros are available:
 
 </P>
 <P>
-<A NAME="IDX1114"></A>
-<A NAME="IDX1115"></A>
-<A NAME="IDX1116"></A>
+<A NAME="IDX1131"></A>
+<A NAME="IDX1132"></A>
+<A NAME="IDX1133"></A>
 
 <PRE>
 const char *pgettext_expr (const char *msgctxt, const char *msgid);
@@ -640,9 +640,9 @@ efficient.
 </P>
 
 
-<H3><A NAME="SEC189" HREF="gettext_toc.html#TOC189">11.2.6  Additional functions for plural forms</A></H3>
+<H3><A NAME="SEC190" HREF="gettext_toc.html#TOC190">11.2.6  Additional functions for plural forms</A></H3>
 <P>
-<A NAME="IDX1117"></A>
+<A NAME="IDX1134"></A>
 
 </P>
 <P>
@@ -765,7 +765,7 @@ purpose.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>ngettext</B> <I>(const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>)</I>
-<DD><A NAME="IDX1118"></A>
+<DD><A NAME="IDX1135"></A>
 The <CODE>ngettext</CODE> function is similar to the <CODE>gettext</CODE> function
 as it finds the message catalogs in the same way.  But it takes two
 extra arguments.  The <VAR>msgid1</VAR> parameter must contain the singular
@@ -836,7 +836,7 @@ printf (ngettext ("%$2d file removed from directory %$1s",
 </PRE>
 
 <P>
-See section <A HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A> for details about this argument reordering syntax.
+See section <A HREF="gettext_15.html#SEC252">15.3.1  C Format Strings</A> for details about this argument reordering syntax.
 
 </P>
 <P>
@@ -875,7 +875,7 @@ In this case the number <VAR>n</VAR> is only used to choose the plural form.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>dngettext</B> <I>(const char *<VAR>domain</VAR>, const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>)</I>
-<DD><A NAME="IDX1119"></A>
+<DD><A NAME="IDX1136"></A>
 The <CODE>dngettext</CODE> is similar to the <CODE>dgettext</CODE> function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -886,7 +886,7 @@ parameters are handled in the same way <CODE>ngettext</CODE> handles them.
 <P>
 <DL>
 <DT><U>Function:</U> char * <B>dcngettext</B> <I>(const char *<VAR>domain</VAR>, const char *<VAR>msgid1</VAR>, const char *<VAR>msgid2</VAR>, unsigned long int <VAR>n</VAR>, int <VAR>category</VAR>)</I>
-<DD><A NAME="IDX1120"></A>
+<DD><A NAME="IDX1137"></A>
 The <CODE>dcngettext</CODE> is similar to the <CODE>dcgettext</CODE> function in the
 way the message catalog is selected.  The difference is that it takes
 two extra parameter to provide the correct plural form.  These two
@@ -911,9 +911,9 @@ possibility of extensions to not prevent the use of new languages).
 
 </P>
 <P>
-<A NAME="IDX1121"></A>
-<A NAME="IDX1122"></A>
-<A NAME="IDX1123"></A>
+<A NAME="IDX1138"></A>
+<A NAME="IDX1139"></A>
+<A NAME="IDX1140"></A>
 The information about the plural form selection has to be stored in the
 header entry of the PO file (the one with the empty <CODE>msgid</CODE> string).
 The plural form information looks like this:
@@ -941,7 +941,7 @@ value of <CODE>nplurals</CODE>.
 
 </P>
 <P>
-<A NAME="IDX1124"></A>
+<A NAME="IDX1141"></A>
 The following rules are known at this point.  The language with families
 are listed.  But this does not necessarily mean the information can be
 generalized for the whole family (as can be easily seen in the table
@@ -970,6 +970,9 @@ Languages with this property include:
 Japanese, 
 Vietnamese, 
 Korean 
+<DT>Tai-Kadai family
+<DD>
+Thai 
 </DL>
 
 <DT>Two forms, singular used for one only
@@ -1014,6 +1017,9 @@ Estonian
 <DT>Semitic family
 <DD>
 Hebrew 
+<DT>Austronesian family
+<DD>
+Bahasa Indonesian 
 <DT>Artificial
 <DD>
 Esperanto 
@@ -1219,6 +1225,26 @@ Languages with this property include:
 <DD>
 Slovenian 
 </DL>
+
+<DT>Six forms, special cases for one, two, all numbers ending in 02, 03, ... 10, all numbers ending in 11 ... 99, and others
+<DD>
+The header entry would look like this:
+
+
+<PRE>
+Plural-Forms: nplurals=6; \
+    plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100&#62;=3 &#38;&#38; n%100&#60;=10 ? 3 \
+    : n%100&#62;=11 ? 4 : 5;
+</PRE>
+
+Languages with this property include:
+
+<DL COMPACT>
+
+<DT>Afroasiatic family
+<DD>
+Arabic 
+</DL>
 </DL>
 
 <P>
@@ -1279,14 +1305,14 @@ is acceptable in English, and similarly for other languages.
 </P>
 <P>
 The translators' perspective regarding plural forms is explained in
-section <A HREF="gettext_12.html#SEC210">12.6  Translating plural forms</A>.
+section <A HREF="gettext_12.html#SEC211">12.6  Translating plural forms</A>.
 
 </P>
 
 
-<H3><A NAME="SEC190" HREF="gettext_toc.html#TOC190">11.2.7  Optimization of the *gettext functions</A></H3>
+<H3><A NAME="SEC191" HREF="gettext_toc.html#TOC191">11.2.7  Optimization of the *gettext functions</A></H3>
 <P>
-<A NAME="IDX1125"></A>
+<A NAME="IDX1142"></A>
 
 </P>
 <P>
@@ -1339,10 +1365,10 @@ find the result through a single cache lookup.
 </P>
 
 
-<H2><A NAME="SEC191" HREF="gettext_toc.html#TOC191">11.3  Comparing the Two Interfaces</A></H2>
+<H2><A NAME="SEC192" HREF="gettext_toc.html#TOC192">11.3  Comparing the Two Interfaces</A></H2>
 <P>
-<A NAME="IDX1126"></A>
-<A NAME="IDX1127"></A>
+<A NAME="IDX1143"></A>
+<A NAME="IDX1144"></A>
 
 </P>
 
@@ -1392,7 +1418,7 @@ by
 
 </P>
 <P>
-<A NAME="IDX1128"></A>
+<A NAME="IDX1145"></A>
 
 <PRE>
 #include &#60;libintl.h&#62;
@@ -1407,7 +1433,7 @@ can use any that becomes available.
 
 </P>
 <P>
-<A NAME="IDX1129"></A>
+<A NAME="IDX1146"></A>
 The same procedure can be done for the <CODE>gettext_noop</CODE> invocations
 (see section <A HREF="gettext_4.html#SEC23">4.7  Special Cases of Translatable Strings</A>).  One usually defines <CODE>gettext_noop</CODE> as a
 no-op macro.  So you should consider the following code for your project:
@@ -1486,12 +1512,12 @@ little bit.  But it is not impossible to overcome.
 <P>
 <CODE>catgets</CODE> allows same original entry to have different translations,
 but <CODE>gettext</CODE> has another, scalable approach for solving ambiguities
-of this kind: See section <A HREF="gettext_11.html#SEC185">11.2.2  Solving Ambiguities</A>.
+of this kind: See section <A HREF="gettext_11.html#SEC186">11.2.2  Solving Ambiguities</A>.
 
 </P>
 
 
-<H2><A NAME="SEC192" HREF="gettext_toc.html#TOC192">11.4  Using libintl.a in own programs</A></H2>
+<H2><A NAME="SEC193" HREF="gettext_toc.html#TOC193">11.4  Using libintl.a in own programs</A></H2>
 
 <P>
 Starting with version 0.9.4 the library <CODE>libintl.h</CODE> should be
@@ -1502,7 +1528,7 @@ and the library in directories selected using the <CODE>$(prefix)</CODE>.
 </P>
 
 
-<H2><A NAME="SEC193" HREF="gettext_toc.html#TOC193">11.5  Being a <CODE>gettext</CODE> grok</A></H2>
+<H2><A NAME="SEC194" HREF="gettext_toc.html#TOC194">11.5  Being a <CODE>gettext</CODE> grok</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -1520,7 +1546,7 @@ is a list comments:
 <UL>
 <LI>Changing the language at runtime
 
-<A NAME="IDX1130"></A>
+<A NAME="IDX1147"></A>
 
 For interactive programs it might be useful to offer a selection of the
 used language at runtime.  To understand how to do this one need to know
@@ -1537,20 +1563,20 @@ priority:
 <OL>
 <LI><CODE>LANGUAGE</CODE>
 
-<A NAME="IDX1131"></A>
+<A NAME="IDX1148"></A>
  
-<A NAME="IDX1132"></A>
+<A NAME="IDX1149"></A>
 <LI><CODE>LC_ALL</CODE>
 
-<A NAME="IDX1133"></A>
-<A NAME="IDX1134"></A>
-<A NAME="IDX1135"></A>
-<A NAME="IDX1136"></A>
-<A NAME="IDX1137"></A>
-<A NAME="IDX1138"></A>
+<A NAME="IDX1150"></A>
+<A NAME="IDX1151"></A>
+<A NAME="IDX1152"></A>
+<A NAME="IDX1153"></A>
+<A NAME="IDX1154"></A>
+<A NAME="IDX1155"></A>
 <LI><CODE>LC_xxx</CODE>, according to selected locale category
 
-<A NAME="IDX1139"></A>
+<A NAME="IDX1156"></A>
 <LI><CODE>LANG</CODE>
 
 </OL>
@@ -1568,7 +1594,7 @@ But there is one little hook.  The code for gcc-2.7.0 and up provides
 some optimization.  This optimization normally prevents the calling of
 the <CODE>dcgettext</CODE> function as long as no new catalog is loaded.  But
 if <CODE>dcgettext</CODE> is not called the program also cannot find the
-<CODE>LANGUAGE</CODE> variable be changed (see section <A HREF="gettext_11.html#SEC190">11.2.7  Optimization of the *gettext functions</A>).  A
+<CODE>LANGUAGE</CODE> variable be changed (see section <A HREF="gettext_11.html#SEC191">11.2.7  Optimization of the *gettext functions</A>).  A
 solution for this is very easy.  Include the following code in the
 language switching function.
 
@@ -1584,7 +1610,7 @@ language switching function.
   }
 </PRE>
 
-<A NAME="IDX1140"></A>
+<A NAME="IDX1157"></A>
 The variable <CODE>_nl_msg_cat_cntr</CODE> is defined in <TT>&lsquo;loadmsgcat.c&rsquo;</TT>.
 You don't need to know what this is for.  But it can be used to detect
 whether a <CODE>gettext</CODE> implementation is GNU gettext and not non-GNU
@@ -1594,7 +1620,7 @@ system's native gettext implementation.
 
 
 
-<H2><A NAME="SEC194" HREF="gettext_toc.html#TOC194">11.6  Temporary Notes for the Programmers Chapter</A></H2>
+<H2><A NAME="SEC195" HREF="gettext_toc.html#TOC195">11.6  Temporary Notes for the Programmers Chapter</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -1604,7 +1630,7 @@ revised.
 
 
 
-<H3><A NAME="SEC195" HREF="gettext_toc.html#TOC195">11.6.1  Temporary - Two Possible Implementations</A></H3>
+<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">11.6.1  Temporary - Two Possible Implementations</A></H3>
 
 <P>
 There are two competing methods for language independent messages:
@@ -1636,7 +1662,7 @@ see the Programming for Internationalization FAQ.
 </P>
 
 
-<H3><A NAME="SEC196" HREF="gettext_toc.html#TOC196">11.6.2  Temporary - About <CODE>catgets</CODE></A></H3>
+<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">11.6.2  Temporary - About <CODE>catgets</CODE></A></H3>
 
 <P>
 There have been a few discussions of late on the use of
@@ -1681,7 +1707,7 @@ of all Unix systems.
 </P>
 
 
-<H3><A NAME="SEC197" HREF="gettext_toc.html#TOC197">11.6.3  Temporary - Why a single implementation</A></H3>
+<H3><A NAME="SEC198" HREF="gettext_toc.html#TOC198">11.6.3  Temporary - Why a single implementation</A></H3>
 
 <P>
 Now it seems kind of wasteful to me to have two different systems
@@ -1726,7 +1752,7 @@ the future.
 </P>
 
 
-<H3><A NAME="SEC198" HREF="gettext_toc.html#TOC198">11.6.4  Temporary - Notes</A></H3>
+<H3><A NAME="SEC199" HREF="gettext_toc.html#TOC199">11.6.4  Temporary - Notes</A></H3>
 
 <P>
 X/Open agreed very late on the standard form so that many
diff --git a/gettext-tools/doc/gettext_12.html b/gettext-tools/doc/gettext_12.html
index 74b621a..b9b89d6 100644
--- a/gettext-tools/doc/gettext_12.html
+++ b/gettext-tools/doc/gettext_12.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 12  The Translator's View</TITLE>
@@ -11,11 +11,11 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_11.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC199" HREF="gettext_toc.html#TOC199">12  The Translator's View</A></H1>
+<H1><A NAME="SEC200" HREF="gettext_toc.html#TOC200">12  The Translator's View</A></H1>
 
 
 
-<H2><A NAME="SEC200" HREF="gettext_toc.html#TOC200">12.1  Introduction 0</A></H2>
+<H2><A NAME="SEC201" HREF="gettext_toc.html#TOC201">12.1  Introduction 0</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -98,7 +98,7 @@ you can work on.
 </P>
 
 
-<H2><A NAME="SEC201" HREF="gettext_toc.html#TOC201">12.2  Introduction 1</A></H2>
+<H2><A NAME="SEC202" HREF="gettext_toc.html#TOC202">12.2  Introduction 1</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -153,7 +153,7 @@ document, please e-mail to <TT>&lsquo;coordinator@translationproject.org&rsquo;<
 </P>
 
 
-<H2><A NAME="SEC202" HREF="gettext_toc.html#TOC202">12.3  Discussions</A></H2>
+<H2><A NAME="SEC203" HREF="gettext_toc.html#TOC203">12.3  Discussions</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -236,7 +236,7 @@ software.
 
 
 
-<H2><A NAME="SEC203" HREF="gettext_toc.html#TOC203">12.4  Organization</A></H2>
+<H2><A NAME="SEC204" HREF="gettext_toc.html#TOC204">12.4  Organization</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -285,7 +285,7 @@ reaches the Translation Project coordinator.
 
 
 
-<H3><A NAME="SEC204" HREF="gettext_toc.html#TOC204">12.4.1  Central Coordination</A></H3>
+<H3><A NAME="SEC205" HREF="gettext_toc.html#TOC205">12.4.1  Central Coordination</A></H3>
 
 <P>
 I also think GNU will need sooner than it thinks, that someone set up
@@ -310,7 +310,7 @@ overwhelming task, the time to put delegations in place.
 </P>
 
 
-<H3><A NAME="SEC205" HREF="gettext_toc.html#TOC205">12.4.2  National Teams</A></H3>
+<H3><A NAME="SEC206" HREF="gettext_toc.html#TOC206">12.4.2  National Teams</A></H3>
 
 <P>
 I suggest we look for volunteer coordinators/editors for individual
@@ -373,7 +373,7 @@ consistent.
 
 
 
-<H4><A NAME="SEC206" HREF="gettext_toc.html#TOC206">12.4.2.1  Sub-Cultures</A></H4>
+<H4><A NAME="SEC207" HREF="gettext_toc.html#TOC207">12.4.2.1  Sub-Cultures</A></H4>
 
 <P>
 Taking French for example, there are a few sub-cultures around computers
@@ -395,7 +395,7 @@ means soon!
 </P>
 
 
-<H4><A NAME="SEC207" HREF="gettext_toc.html#TOC207">12.4.2.2  Organizational Ideas</A></H4>
+<H4><A NAME="SEC208" HREF="gettext_toc.html#TOC208">12.4.2.2  Organizational Ideas</A></H4>
 
 <P>
 I expect the next big changes after the official release.  Please note
@@ -432,7 +432,7 @@ this also seems to work).
 
 
 
-<H3><A NAME="SEC208" HREF="gettext_toc.html#TOC208">12.4.3  Mailing Lists</A></H3>
+<H3><A NAME="SEC209" HREF="gettext_toc.html#TOC209">12.4.3  Mailing Lists</A></H3>
 
 <P>
 If we get any inquiries about GNU <CODE>gettext</CODE>, send them on to:
@@ -486,7 +486,7 @@ subscribe as they see fit, as long as each team is represented in it.
 </P>
 
 
-<H2><A NAME="SEC209" HREF="gettext_toc.html#TOC209">12.5  Information Flow</A></H2>
+<H2><A NAME="SEC210" HREF="gettext_toc.html#TOC210">12.5  Information Flow</A></H2>
 
 <P>
 <STRONG> NOTE: </STRONG> This documentation section is outdated and needs to be
@@ -540,10 +540,10 @@ have more information about this.
 </P>
 
 
-<H2><A NAME="SEC210" HREF="gettext_toc.html#TOC210">12.6  Translating plural forms</A></H2>
+<H2><A NAME="SEC211" HREF="gettext_toc.html#TOC211">12.6  Translating plural forms</A></H2>
 
 <P>
-<A NAME="IDX1141"></A>
+<A NAME="IDX1158"></A>
 Suppose you are translating a PO file, and it contains an entry like this:
 
 </P>
@@ -565,7 +565,7 @@ Such an entry denotes a message with plural forms, that is, a message where
 the text depends on a cardinal number.  The general form of the message,
 in English, is the <CODE>msgid_plural</CODE> line.  The <CODE>msgid</CODE> line is the
 English singular form, that is, the form for when the number is equal to 1.
-More details about plural forms are explained in section <A HREF="gettext_11.html#SEC189">11.2.6  Additional functions for plural forms</A>.
+More details about plural forms are explained in section <A HREF="gettext_11.html#SEC190">11.2.6  Additional functions for plural forms</A>.
 
 </P>
 <P>
@@ -664,7 +664,7 @@ and therefore you cannot omit the placeholder.
 </P>
 
 
-<H2><A NAME="SEC211" HREF="gettext_toc.html#TOC211">12.7  Prioritizing messages: How to determine which messages to translate first</A></H2>
+<H2><A NAME="SEC212" HREF="gettext_toc.html#TOC212">12.7  Prioritizing messages: How to determine which messages to translate first</A></H2>
 
 <P>
 A translator sometimes has only a limited amount of time per week to
@@ -688,7 +688,7 @@ of messages.
 
 </P>
 <P>
-<A NAME="IDX1142"></A>
+<A NAME="IDX1159"></A>
 Here a more details.  The GNU <CODE>libintl</CODE> library (but not the
 corresponding functions in GNU <CODE>libc</CODE>) supports an environment variable
 <CODE>GETTEXT_LOG_UNTRANSLATED</CODE>.  The GNU <CODE>libintl</CODE> library will
diff --git a/gettext-tools/doc/gettext_13.html b/gettext-tools/doc/gettext_13.html
index ac36838..c0a29b5 100644
--- a/gettext-tools/doc/gettext_13.html
+++ b/gettext-tools/doc/gettext_13.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 13  The Maintainer's View</TITLE>
@@ -11,9 +11,9 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_12.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC212" HREF="gettext_toc.html#TOC212">13  The Maintainer's View</A></H1>
+<H1><A NAME="SEC213" HREF="gettext_toc.html#TOC213">13  The Maintainer's View</A></H1>
 <P>
-<A NAME="IDX1143"></A>
+<A NAME="IDX1160"></A>
 
 </P>
 <P>
@@ -53,7 +53,7 @@ for changes.
 
 
 
-<H2><A NAME="SEC213" HREF="gettext_toc.html#TOC213">13.1  Flat or Non-Flat Directory Structures</A></H2>
+<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">13.1  Flat or Non-Flat Directory Structures</A></H2>
 
 <P>
 Some free software packages are distributed as <CODE>tar</CODE> files which unpack
@@ -86,11 +86,11 @@ use this as an opportunity to unflatten their package structure.
 </P>
 
 
-<H2><A NAME="SEC214" HREF="gettext_toc.html#TOC214">13.2  Prerequisite Works</A></H2>
+<H2><A NAME="SEC215" HREF="gettext_toc.html#TOC215">13.2  Prerequisite Works</A></H2>
 <P>
-<A NAME="IDX1144"></A>
-<A NAME="IDX1145"></A>
-<A NAME="IDX1146"></A>
+<A NAME="IDX1161"></A>
+<A NAME="IDX1162"></A>
+<A NAME="IDX1163"></A>
 
 </P>
 <P>
@@ -187,7 +187,7 @@ never try to <EM>solve</EM> a team's problem on your own.
 </P>
 
 
-<H2><A NAME="SEC215" HREF="gettext_toc.html#TOC215">13.3  Invoking the <CODE>gettextize</CODE> Program</A></H2>
+<H2><A NAME="SEC216" HREF="gettext_toc.html#TOC216">13.3  Invoking the <CODE>gettextize</CODE> Program</A></H2>
 
 <P>
 The <CODE>gettextize</CODE> program is an interactive tool that helps the
@@ -222,7 +222,7 @@ GNU <CODE>gettext</CODE>.
 
 <LI>It performs as many of the tasks mentioned in the next section
 
-section <A HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A> as can be performed automatically.
+section <A HREF="gettext_13.html#SEC217">13.4  Files You Must Create or Alter</A> as can be performed automatically.
 
 <LI>It removes obsolete files and idioms used for previous GNU
 
@@ -239,8 +239,8 @@ It can be invoked as follows:
 
 </P>
 <P>
-<A NAME="IDX1147"></A>
-<A NAME="IDX1148"></A>
+<A NAME="IDX1164"></A>
+<A NAME="IDX1165"></A>
 
 <PRE>
 gettextize [ <VAR>option</VAR>... ] [ <VAR>directory</VAR> ]
@@ -256,13 +256,13 @@ and accepts the following options:
 <DD>
 <DT><SAMP>&lsquo;--force&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1149"></A>
-<A NAME="IDX1150"></A>
+<A NAME="IDX1166"></A>
+<A NAME="IDX1167"></A>
 Force replacement of files which already exist.
 
 <DT><SAMP>&lsquo;--intl&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1151"></A>
+<A NAME="IDX1168"></A>
 Install the libintl sources in a subdirectory named <TT>&lsquo;intl/&rsquo;</TT>.
 This libintl will be used to provide internationalization on systems
 that don't have GNU libintl installed.  If this option is omitted,
@@ -272,7 +272,7 @@ be enabled on systems lacking GNU gettext.
 
 <DT><SAMP>&lsquo;--po-dir=<VAR>dir</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1152"></A>
+<A NAME="IDX1169"></A>
 Specify a directory containing PO files.  Such a directory contains the
 translations into various languages of a particular POT file.  This
 option can be specified multiple times, once for each translation domain.
@@ -280,14 +280,14 @@ If it is not specified, the directory named <TT>&lsquo;po/&rsquo;</TT> is update
 
 <DT><SAMP>&lsquo;--no-changelog&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1153"></A>
+<A NAME="IDX1170"></A>
 Don't update or create ChangeLog files.  By default, <CODE>gettextize</CODE>
 logs all changes (file additions, modifications and removals) in a
 file called <SAMP>&lsquo;ChangeLog&rsquo;</SAMP> in each affected directory.
 
 <DT><SAMP>&lsquo;--symlink&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1154"></A>
+<A NAME="IDX1171"></A>
 Make symbolic links instead of copying the needed files.  This can be
 useful to save a few kilobytes of disk space, but it requires extra
 effort to create self-contained tarballs, it may disturb some mechanism
@@ -298,20 +298,20 @@ bugs when a newer version of <CODE>gettext</CODE> is installed on the system.
 <DD>
 <DT><SAMP>&lsquo;--dry-run&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1155"></A>
-<A NAME="IDX1156"></A>
+<A NAME="IDX1172"></A>
+<A NAME="IDX1173"></A>
 Print modifications but don't perform them.  All actions that
 <CODE>gettextize</CODE> would normally execute are inhibited and instead only
 listed on standard output.
 
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1157"></A>
+<A NAME="IDX1174"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1158"></A>
+<A NAME="IDX1175"></A>
 Output version information and exit.
 
 </DL>
@@ -417,14 +417,14 @@ It is important to understand that <CODE>gettextize</CODE> can not do the
 entire job of adapting a package for using GNU <CODE>gettext</CODE>.  The
 amount of remaining work depends on whether the package uses GNU
 <CODE>automake</CODE> or not.  But in any case, the maintainer should still
-read the section section <A HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A> after invoking <CODE>gettextize</CODE>.
+read the section section <A HREF="gettext_13.html#SEC217">13.4  Files You Must Create or Alter</A> after invoking <CODE>gettextize</CODE>.
 
 </P>
 <P>
 In particular, if after using <SAMP>&lsquo;gettexize&rsquo;</SAMP>, you get an error
 <SAMP>&lsquo;AC_COMPILE_IFELSE was called before AC_GNU_SOURCE&rsquo;</SAMP> or
 <SAMP>&lsquo;AC_RUN_IFELSE was called before AC_GNU_SOURCE&rsquo;</SAMP>, you can fix it
-by modifying <TT>&lsquo;configure.ac&rsquo;</TT>, as described in section <A HREF="gettext_13.html#SEC221">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>.
+by modifying <TT>&lsquo;configure.ac&rsquo;</TT>, as described in section <A HREF="gettext_13.html#SEC222">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>.
 
 </P>
 <P>
@@ -432,14 +432,14 @@ It is also important to understand that <CODE>gettextize</CODE> is not part
 of the GNU build system, in the sense that it should not be invoked
 automatically, and not be invoked by someone who doesn't assume the
 responsibilities of a package maintainer.  For the latter purpose, a
-separate tool is provided, see section <A HREF="gettext_13.html#SEC242">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A>.
+separate tool is provided, see section <A HREF="gettext_13.html#SEC243">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A>.
 
 </P>
 
 
-<H2><A NAME="SEC216" HREF="gettext_toc.html#TOC216">13.4  Files You Must Create or Alter</A></H2>
+<H2><A NAME="SEC217" HREF="gettext_toc.html#TOC217">13.4  Files You Must Create or Alter</A></H2>
 <P>
-<A NAME="IDX1159"></A>
+<A NAME="IDX1176"></A>
 
 </P>
 <P>
@@ -454,20 +454,19 @@ changes needed in each.
 <P>
 So, here comes a list of files, each one followed by a description of
 all alterations it needs.  Many examples are taken out from the GNU
-<CODE>gettext</CODE> 0.19.4 distribution itself, or from the GNU
-<CODE>hello</CODE> distribution (<A HREF="http://www.franken.de/users/gnu/ke/hello">http://www.franken.de/users/gnu/ke/hello</A>
-or <A HREF="http://www.gnu.franken.de/ke/hello/">http://www.gnu.franken.de/ke/hello/</A>)  You may indeed
-refer to the source code of the GNU <CODE>gettext</CODE> and GNU <CODE>hello</CODE>
-packages, as they are intended to be good examples for using GNU
-gettext functionality.
+<CODE>gettext</CODE> 0.19.7 distribution itself, or from the GNU
+<CODE>hello</CODE> distribution (<A HREF="http://www.gnu.org/software/hello">http://www.gnu.org/software/hello</A>).
+You may indeed refer to the source code of the GNU <CODE>gettext</CODE> and
+GNU <CODE>hello</CODE> packages, as they are intended to be good examples for
+using GNU gettext functionality.
 
 </P>
 
 
 
-<H3><A NAME="SEC217" HREF="gettext_toc.html#TOC217">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC218" HREF="gettext_toc.html#TOC218">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1160"></A>
+<A NAME="IDX1177"></A>
 
 </P>
 <P>
@@ -511,9 +510,9 @@ case of <CODE>bison</CODE>), not the generated C file.
 </P>
 
 
-<H3><A NAME="SEC218" HREF="gettext_toc.html#TOC218">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC219" HREF="gettext_toc.html#TOC219">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1161"></A>
+<A NAME="IDX1178"></A>
 
 </P>
 <P>
@@ -535,7 +534,7 @@ that these languages are currently supported by your package.  If you
 want to further restrict, at installation time, the set of installed
 languages, this should not be done by modifying the <TT>&lsquo;LINGUAS&rsquo;</TT> file,
 but rather by using the <CODE>LINGUAS</CODE> environment variable
-(see section <A HREF="gettext_14.html#SEC246">14  The Installer's and Distributor's View</A>).
+(see section <A HREF="gettext_14.html#SEC247">14  The Installer's and Distributor's View</A>).
 
 </P>
 <P>
@@ -560,9 +559,9 @@ directory; they are also installed by running <CODE>gettextize</CODE>.
 </P>
 
 
-<H3><A NAME="SEC219" HREF="gettext_toc.html#TOC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC220" HREF="gettext_toc.html#TOC220">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1162"></A>
+<A NAME="IDX1179"></A>
 
 </P>
 <P>
@@ -584,14 +583,14 @@ locations need to adjust the three first variables defined in
 <P>
 As an alternative to the <CODE>XGETTEXT_OPTIONS</CODE> variables, it is also
 possible to specify <CODE>xgettext</CODE> options through the
-<CODE>AM_XGETTEXT_OPTION</CODE> autoconf macro.  See section <A HREF="gettext_13.html#SEC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
+<CODE>AM_XGETTEXT_OPTION</CODE> autoconf macro.  See section <A HREF="gettext_13.html#SEC237">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
 
 </P>
 
 
-<H3><A NAME="SEC220" HREF="gettext_toc.html#TOC220">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC221" HREF="gettext_toc.html#TOC221">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1163"></A>
+<A NAME="IDX1180"></A>
 
 </P>
 <P>
@@ -602,8 +601,8 @@ with <TT>&lsquo;po/Makefile.in.in&rsquo;</TT>.
 
 </P>
 <P>
-<A NAME="IDX1164"></A>
-<A NAME="IDX1165"></A>
+<A NAME="IDX1181"></A>
+<A NAME="IDX1182"></A>
 GNU gettext comes with a <TT>&lsquo;Rules-quot&rsquo;</TT> file, containing rules for
 building catalogs <TT>&lsquo;en@quot.po&rsquo;</TT> and <TT>&lsquo;en@boldquot.po&rsquo;</TT>.  The
 effect of <TT>&lsquo;en@quot.po&rsquo;</TT> is that people who set their <CODE>LANGUAGE</CODE>
@@ -628,7 +627,7 @@ letters.  See section <A HREF="gettext_9.html#SEC102">9.4  Invoking the <CODE>ms
 </P>
 
 
-<H3><A NAME="SEC221" HREF="gettext_toc.html#TOC221">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC222" HREF="gettext_toc.html#TOC222">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A></H3>
 
 <P>
 <TT>&lsquo;configure.ac&rsquo;</TT> or <TT>&lsquo;configure.in&rsquo;</TT> - this is the source from which
@@ -639,14 +638,14 @@ letters.  See section <A HREF="gettext_9.html#SEC102">9.4  Invoking the <CODE>ms
 <OL>
 <LI>Declare the package and version.
 
-<A NAME="IDX1166"></A>
+<A NAME="IDX1183"></A>
 
 This is done by a set of lines like these:
 
 
 <PRE>
 PACKAGE=gettext
-VERSION=0.19.4
+VERSION=0.19.7
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
@@ -657,13 +656,13 @@ or, if you are using GNU <CODE>automake</CODE>, by a line like this:
 
 
 <PRE>
-AM_INIT_AUTOMAKE(gettext, 0.19.4)
+AM_INIT_AUTOMAKE(gettext, 0.19.7)
 </PRE>
 
 Of course, you replace <SAMP>&lsquo;gettext&rsquo;</SAMP> with the name of your package,
-and <SAMP>&lsquo;0.19.4&rsquo;</SAMP> by its version numbers, exactly as they
+and <SAMP>&lsquo;0.19.7&rsquo;</SAMP> by its version numbers, exactly as they
 should appear in the packaged <CODE>tar</CODE> file name of your distribution
-(<TT>&lsquo;gettext-0.19.4.tar.gz&rsquo;</TT>, here).
+(<TT>&lsquo;gettext-0.19.7.tar.gz&rsquo;</TT>, here).
 
 <LI>Check for internationalization support.
 
@@ -736,7 +735,7 @@ by GNU autoconf.
 </P>
 
 
-<H3><A NAME="SEC222" HREF="gettext_toc.html#TOC222">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC223" HREF="gettext_toc.html#TOC223">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A></H3>
 
 <P>
 If you haven't suppressed the <TT>&lsquo;intl/&rsquo;</TT> subdirectory,
@@ -777,9 +776,9 @@ AC_CONFIG_AUX_DIR([<VAR>subdir</VAR>])
 
 
 
-<H3><A NAME="SEC223" HREF="gettext_toc.html#TOC223">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC224" HREF="gettext_toc.html#TOC224">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1167"></A>
+<A NAME="IDX1184"></A>
 
 </P>
 <P>
@@ -791,9 +790,9 @@ automake 1.9.
 </P>
 
 
-<H3><A NAME="SEC224" HREF="gettext_toc.html#TOC224">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC225" HREF="gettext_toc.html#TOC225">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1168"></A>
+<A NAME="IDX1185"></A>
 
 </P>
 <P>
@@ -871,9 +870,9 @@ piece of <CODE>m4</CODE> code will be the same for all projects using GNU
 </P>
 
 
-<H3><A NAME="SEC225" HREF="gettext_toc.html#TOC225">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC226" HREF="gettext_toc.html#TOC226">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1169"></A>
+<A NAME="IDX1186"></A>
 
 </P>
 <P>
@@ -887,9 +886,9 @@ independently from the <TT>&lsquo;intl/&rsquo;</TT> directory.
 </P>
 
 
-<H3><A NAME="SEC226" HREF="gettext_toc.html#TOC226">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC227" HREF="gettext_toc.html#TOC227">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A></H3>
 <P>
-<A NAME="IDX1170"></A>
+<A NAME="IDX1187"></A>
 
 </P>
 <P>
@@ -936,7 +935,7 @@ following lines to <TT>&lsquo;config.h.in&rsquo;</TT>:
 
 
 
-<H3><A NAME="SEC227" HREF="gettext_toc.html#TOC227">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A></H3>
+<H3><A NAME="SEC228" HREF="gettext_toc.html#TOC228">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A></H3>
 
 <P>
 Here are a few modifications you need to make to your main, top-level
@@ -1023,7 +1022,7 @@ to <TT>&lsquo;Makefile.am&rsquo;</TT> are already made by running <SAMP>&lsquo;g
 </P>
 
 
-<H3><A NAME="SEC228" HREF="gettext_toc.html#TOC228">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC229" HREF="gettext_toc.html#TOC229">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A></H3>
 
 <P>
 Some of the modifications made in the main <TT>&lsquo;Makefile.in&rsquo;</TT> will
@@ -1225,11 +1224,11 @@ AM_CPPFLAGS = -I../intl -I$(top_srcdir)/intl
 
 
 
-<H3><A NAME="SEC229" HREF="gettext_toc.html#TOC229">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A></H3>
+<H3><A NAME="SEC230" HREF="gettext_toc.html#TOC230">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A></H3>
 <P>
-<A NAME="IDX1171"></A>
-<A NAME="IDX1172"></A>
-<A NAME="IDX1173"></A>
+<A NAME="IDX1188"></A>
+<A NAME="IDX1189"></A>
+<A NAME="IDX1190"></A>
 
 </P>
 <P>
@@ -1266,7 +1265,7 @@ to 0 in C preprocessor expressions.
 
 </P>
 <P>
-<A NAME="IDX1174"></A>
+<A NAME="IDX1191"></A>
 <TT>&lsquo;gettext.h&rsquo;</TT> is a convenience header file for conditional use of
 <TT>&lsquo;&#60;libintl.h&#62;&rsquo;</TT>, depending on the <CODE>ENABLE_NLS</CODE> macro.  If
 <CODE>ENABLE_NLS</CODE> is set, it includes <TT>&lsquo;&#60;libintl.h&#62;&rsquo;</TT>; otherwise it
@@ -1305,9 +1304,9 @@ package that needs it should contain a copy of it on its own.
 </P>
 
 
-<H2><A NAME="SEC230" HREF="gettext_toc.html#TOC230">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A></H2>
+<H2><A NAME="SEC231" HREF="gettext_toc.html#TOC231">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A></H2>
 <P>
-<A NAME="IDX1175"></A>
+<A NAME="IDX1192"></A>
 
 </P>
 <P>
@@ -1320,10 +1319,10 @@ The primary macro is, of course, <CODE>AM_GNU_GETTEXT</CODE>.
 
 
 
-<H3><A NAME="SEC231" HREF="gettext_toc.html#TOC231">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC232" HREF="gettext_toc.html#TOC232">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1176"></A>
+<A NAME="IDX1193"></A>
 The <CODE>AM_GNU_GETTEXT</CODE> macro tests for the presence of the GNU gettext
 function family in either the C library or a separate <CODE>libintl</CODE>
 library (shared or static libraries are both supported) or in the package's
@@ -1393,7 +1392,7 @@ The complexities that <CODE>AM_GNU_GETTEXT</CODE> deals with are the following:
 <UL>
 <LI>
 
-<A NAME="IDX1177"></A>
+<A NAME="IDX1194"></A>
 Some operating systems have <CODE>gettext</CODE> in the C library, for example
 glibc.  Some have it in a separate library <CODE>libintl</CODE>.  GNU <CODE>libintl</CODE>
 might have been installed as part of the GNU <CODE>gettext</CODE> package.
@@ -1429,25 +1428,25 @@ and <CODE>LTLIBINTL</CODE> variables.
 
 
 
-<H3><A NAME="SEC232" HREF="gettext_toc.html#TOC232">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC233" HREF="gettext_toc.html#TOC233">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1178"></A>
+<A NAME="IDX1195"></A>
 The <CODE>AM_GNU_GETTEXT_VERSION</CODE> macro declares the version number of
 the GNU gettext infrastructure that is used by the package.
 
 </P>
 <P>
 The use of this macro is optional; only the <CODE>autopoint</CODE> program makes
-use of it (see section <A HREF="gettext_13.html#SEC238">13.6  Integrating with Version Control Systems</A>).
+use of it (see section <A HREF="gettext_13.html#SEC239">13.6  Integrating with Version Control Systems</A>).
 
 </P>
 
 
-<H3><A NAME="SEC233" HREF="gettext_toc.html#TOC233">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC234" HREF="gettext_toc.html#TOC234">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1179"></A>
+<A NAME="IDX1196"></A>
 The <CODE>AM_GNU_GETTEXT_NEED</CODE> macro declares a constraint regarding the
 GNU gettext implementation.  The syntax is
 
@@ -1477,10 +1476,10 @@ the <CODE>AM_GNU_GETTEXT</CODE> invocation; the order doesn't matter.
 </P>
 
 
-<H3><A NAME="SEC234" HREF="gettext_toc.html#TOC234">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC235" HREF="gettext_toc.html#TOC235">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1180"></A>
+<A NAME="IDX1197"></A>
 The <CODE>AM_GNU_GETTEXT_INTL_SUBDIR</CODE> macro specifies that the
 <CODE>AM_GNU_GETTEXT</CODE> macro, although invoked with the first argument
 <SAMP>&lsquo;external&rsquo;</SAMP>, should also prepare for building the <TT>&lsquo;intl/&rsquo;</TT>
@@ -1499,14 +1498,14 @@ GNU autoconf 2.61 or newer.
 </P>
 
 
-<H3><A NAME="SEC235" HREF="gettext_toc.html#TOC235">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC236" HREF="gettext_toc.html#TOC236">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1181"></A>
+<A NAME="IDX1198"></A>
 The <CODE>AM_PO_SUBDIRS</CODE> macro prepares the <TT>&lsquo;po/&rsquo;</TT> directories of the
 package for building.  This macro should be used in internationalized
 programs written in other programming languages than C, C++, Objective C,
-for example <CODE>sh</CODE>, <CODE>Python</CODE>, <CODE>Lisp</CODE>.  See section <A HREF="gettext_15.html#SEC247">15  Other Programming Languages</A> for a list of programming languages that support localization
+for example <CODE>sh</CODE>, <CODE>Python</CODE>, <CODE>Lisp</CODE>.  See section <A HREF="gettext_15.html#SEC248">15  Other Programming Languages</A> for a list of programming languages that support localization
 through PO files.
 
 </P>
@@ -1519,10 +1518,10 @@ variables in each <TT>&lsquo;po/&rsquo;</TT> directory.
 </P>
 
 
-<H3><A NAME="SEC236" HREF="gettext_toc.html#TOC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC237" HREF="gettext_toc.html#TOC237">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1182"></A>
+<A NAME="IDX1199"></A>
 The <CODE>AM_XGETTEXT_OPTION</CODE> macro registers a command-line option to be
 used in the invocations of <CODE>xgettext</CODE> in the <TT>&lsquo;po/&rsquo;</TT> directories
 of the package.
@@ -1553,10 +1552,10 @@ The use of this macro is an alternative to the use of the
 </P>
 
 
-<H3><A NAME="SEC237" HREF="gettext_toc.html#TOC237">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A></H3>
+<H3><A NAME="SEC238" HREF="gettext_toc.html#TOC238">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A></H3>
 
 <P>
-<A NAME="IDX1183"></A>
+<A NAME="IDX1200"></A>
 The <CODE>AM_ICONV</CODE> macro tests for the presence of the POSIX/XSI
 <CODE>iconv</CODE> function family in either the C library or a separate
 <CODE>libiconv</CODE> library.  If found, it sets the <CODE>am_cv_func_iconv</CODE>
@@ -1580,7 +1579,7 @@ The complexities that <CODE>AM_ICONV</CODE> deals with are the following:
 <UL>
 <LI>
 
-<A NAME="IDX1184"></A>
+<A NAME="IDX1201"></A>
 Some operating systems have <CODE>iconv</CODE> in the C library, for example
 glibc.  Some have it in a separate library <CODE>libiconv</CODE>, for example
 OSF/1 or FreeBSD.  Regardless of the operating system, GNU <CODE>libiconv</CODE>
@@ -1617,7 +1616,7 @@ library support, like SCO.
 </P>
 
 
-<H2><A NAME="SEC238" HREF="gettext_toc.html#TOC238">13.6  Integrating with Version Control Systems</A></H2>
+<H2><A NAME="SEC239" HREF="gettext_toc.html#TOC239">13.6  Integrating with Version Control Systems</A></H2>
 
 <P>
 Many projects use version control systems for distributed development
@@ -1629,13 +1628,13 @@ version controlled files.
 
 
 
-<H3><A NAME="SEC239" HREF="gettext_toc.html#TOC239">13.6.1  Avoiding version mismatch in distributed development</A></H3>
+<H3><A NAME="SEC240" HREF="gettext_toc.html#TOC240">13.6.1  Avoiding version mismatch in distributed development</A></H3>
 
 <P>
 In a project development with multiple developers, there should be a
 single developer who occasionally - when there is desire to upgrade to
 a new <CODE>gettext</CODE> version - runs <CODE>gettextize</CODE> and performs the
-changes listed in section <A HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A>, and then commits his changes
+changes listed in section <A HREF="gettext_13.html#SEC217">13.4  Files You Must Create or Alter</A>, and then commits his changes
 to the repository.
 
 </P>
@@ -1677,7 +1676,7 @@ undiscovered due to this constellation.
 
 
 
-<H3><A NAME="SEC240" HREF="gettext_toc.html#TOC240">13.6.2  Files to put under version control</A></H3>
+<H3><A NAME="SEC241" HREF="gettext_toc.html#TOC241">13.6.2  Files to put under version control</A></H3>
 
 <P>
 There are basically three ways to deal with generated files in the
@@ -1752,7 +1751,7 @@ form
 </P>
 
 <PRE>
-AM_GNU_GETTEXT_VERSION(0.19.4)
+AM_GNU_GETTEXT_VERSION(0.19.7)
 </PRE>
 
 <P>
@@ -1778,7 +1777,7 @@ installed.
 </P>
 
 
-<H3><A NAME="SEC241" HREF="gettext_toc.html#TOC241">13.6.3  Put PO Files under Version Control</A></H3>
+<H3><A NAME="SEC242" HREF="gettext_toc.html#TOC242">13.6.3  Put PO Files under Version Control</A></H3>
 
 <P>
 Since translations are valuable assets as well as the source code, it
@@ -1839,11 +1838,11 @@ recover the location comments by running <CODE>msgmerge</CODE> again.
 
 
 
-<H3><A NAME="SEC242" HREF="gettext_toc.html#TOC242">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A></H3>
+<H3><A NAME="SEC243" HREF="gettext_toc.html#TOC243">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A></H3>
 
 <P>
-<A NAME="IDX1185"></A>
-<A NAME="IDX1186"></A>
+<A NAME="IDX1202"></A>
+<A NAME="IDX1203"></A>
 
 <PRE>
 autopoint [<VAR>option</VAR>]...
@@ -1858,9 +1857,18 @@ used by the package, and copies the infrastructure files belonging to
 this version into the package.
 
 </P>
+<P>
+To extract the latest available infrastructure which satisfies a version
+requirement, then you can use the form
+<CODE>AM_GNU_GETTEXT_REQUIRE_VERSION(<VAR>version</VAR>)</CODE> instead.  For
+example, if gettext 0.19.7 is installed on your system
+and <CODE>0.19.1</CODE> is requested, then the infrastructure files of version
+0.19.7 will be copied into a source package.
+
+</P>
 
 
-<H4><A NAME="SEC243" HREF="gettext_toc.html#TOC243">13.6.4.1  Options</A></H4>
+<H4><A NAME="SEC244" HREF="gettext_toc.html#TOC244">13.6.4.1  Options</A></H4>
 
 <DL COMPACT>
 
@@ -1868,16 +1876,16 @@ this version into the package.
 <DD>
 <DT><SAMP>&lsquo;--force&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1187"></A>
-<A NAME="IDX1188"></A>
+<A NAME="IDX1204"></A>
+<A NAME="IDX1205"></A>
 Force overwriting of files that already exist.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--dry-run&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1189"></A>
-<A NAME="IDX1190"></A>
+<A NAME="IDX1206"></A>
+<A NAME="IDX1207"></A>
 Print modifications but don't perform them.  All file copying actions that
 <CODE>autopoint</CODE> would normally execute are inhibited and instead only
 listed on standard output.
@@ -1886,27 +1894,28 @@ listed on standard output.
 
 
 
-<H4><A NAME="SEC244" HREF="gettext_toc.html#TOC244">13.6.4.2  Informative output</A></H4>
+<H4><A NAME="SEC245" HREF="gettext_toc.html#TOC245">13.6.4.2  Informative output</A></H4>
 
 <DL COMPACT>
 
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1191"></A>
+<A NAME="IDX1208"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1192"></A>
+<A NAME="IDX1209"></A>
 Output version information and exit.
 
 </DL>
 
 <P>
-<CODE>autopoint</CODE> supports the GNU <CODE>gettext</CODE> versions from 0.10.35 to
-the current one, 0.19.4.  In order to apply <CODE>autopoint</CODE> to
-a package using a <CODE>gettext</CODE> version newer than 0.19.4, you
-need to install this same version of GNU <CODE>gettext</CODE> at least.
+<CODE>autopoint</CODE> supports the GNU <CODE>gettext</CODE> versions from 0.10.35
+to the current one, 0.19.7.  In order to apply
+<CODE>autopoint</CODE> to a package using a <CODE>gettext</CODE> version newer than
+0.19.7, you need to install this same version of GNU
+<CODE>gettext</CODE> at least.
 
 </P>
 <P>
@@ -1927,11 +1936,11 @@ the tool copies or updates mostly files in the <TT>&lsquo;po&rsquo;</TT>, <TT>&l
 </P>
 
 
-<H2><A NAME="SEC245" HREF="gettext_toc.html#TOC245">13.7  Creating a Distribution Tarball</A></H2>
+<H2><A NAME="SEC246" HREF="gettext_toc.html#TOC246">13.7  Creating a Distribution Tarball</A></H2>
 
 <P>
-<A NAME="IDX1193"></A>
-<A NAME="IDX1194"></A>
+<A NAME="IDX1210"></A>
+<A NAME="IDX1211"></A>
 In projects that use GNU <CODE>automake</CODE>, the usual commands for creating
 a distribution tarball, <SAMP>&lsquo;make dist&rsquo;</SAMP> or <SAMP>&lsquo;make distcheck&rsquo;</SAMP>,
 automatically update the PO files as needed.
diff --git a/gettext-tools/doc/gettext_14.html b/gettext-tools/doc/gettext_14.html
index 75f39ed..c4632f0 100644
--- a/gettext-tools/doc/gettext_14.html
+++ b/gettext-tools/doc/gettext_14.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 14  The Installer's and Distributor's View</TITLE>
@@ -11,12 +11,12 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_13.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC246" HREF="gettext_toc.html#TOC246">14  The Installer's and Distributor's View</A></H1>
+<H1><A NAME="SEC247" HREF="gettext_toc.html#TOC247">14  The Installer's and Distributor's View</A></H1>
 <P>
-<A NAME="IDX1195"></A>
-<A NAME="IDX1196"></A>
-<A NAME="IDX1197"></A>
-<A NAME="IDX1198"></A>
+<A NAME="IDX1212"></A>
+<A NAME="IDX1213"></A>
+<A NAME="IDX1214"></A>
+<A NAME="IDX1215"></A>
 
 </P>
 <P>
@@ -35,7 +35,7 @@ produces programs totally unable to translate messages.
 
 </P>
 <P>
-<A NAME="IDX1199"></A>
+<A NAME="IDX1216"></A>
 Internationalized packages have usually many <TT>&lsquo;<VAR>ll</VAR>.po&rsquo;</TT>
 files.  Unless
 translations are disabled, all those available are installed together
diff --git a/gettext-tools/doc/gettext_15.html b/gettext-tools/doc/gettext_15.html
index 9f94ca6..ccd7f2b 100644
--- a/gettext-tools/doc/gettext_15.html
+++ b/gettext-tools/doc/gettext_15.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 15  Other Programming Languages</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_14.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC247" HREF="gettext_toc.html#TOC247">15  Other Programming Languages</A></H1>
+<H1><A NAME="SEC248" HREF="gettext_toc.html#TOC248">15  Other Programming Languages</A></H1>
 
 <P>
 While the presentation of <CODE>gettext</CODE> focuses mostly on C and
@@ -24,10 +24,10 @@ approach.
 
 
 
-<H2><A NAME="SEC248" HREF="gettext_toc.html#TOC248">15.1  The Language Implementor's View</A></H2>
+<H2><A NAME="SEC249" HREF="gettext_toc.html#TOC249">15.1  The Language Implementor's View</A></H2>
 <P>
-<A NAME="IDX1200"></A>
-<A NAME="IDX1201"></A>
+<A NAME="IDX1217"></A>
+<A NAME="IDX1218"></A>
 
 </P>
 <P>
@@ -125,7 +125,7 @@ different effects on portability and copyright:
 <LI>
 
 You may integrate the GNU <CODE>gettext</CODE>'s <TT>&lsquo;intl/&rsquo;</TT> directory in
-your package, as described in section <A HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>.  This allows you to
+your package, as described in section <A HREF="gettext_13.html#SEC213">13  The Maintainer's View</A>.  This allows you to
 have internationalization on all kinds of platforms.  Note that when you
 then distribute your package, it legally falls under the GNU General
 Public License, and the GNU project will be glad about your contribution
@@ -151,7 +151,7 @@ and plural handling).
 
 
 
-<H2><A NAME="SEC249" HREF="gettext_toc.html#TOC249">15.2  The Programmer's View</A></H2>
+<H2><A NAME="SEC250" HREF="gettext_toc.html#TOC250">15.2  The Programmer's View</A></H2>
 
 <P>
 For the programmer, the general procedure is the same as for the C
@@ -164,7 +164,7 @@ underlying language runtime.
 </P>
 
 
-<H2><A NAME="SEC250" HREF="gettext_toc.html#TOC250">15.3  The Translator's View</A></H2>
+<H2><A NAME="SEC251" HREF="gettext_toc.html#TOC251">15.3  The Translator's View</A></H2>
 
 <P>
 The translator works exactly as in the C language case.  The only
@@ -176,7 +176,7 @@ strings.
 
 
 
-<H3><A NAME="SEC251" HREF="gettext_toc.html#TOC251">15.3.1  C Format Strings</A></H3>
+<H3><A NAME="SEC252" HREF="gettext_toc.html#TOC252">15.3.1  C Format Strings</A></H3>
 
 <P>
 C format strings are described in POSIX (IEEE P1003.1 2001), section
@@ -214,8 +214,8 @@ activates these replacement functions automatically.
 
 </P>
 <P>
-<A NAME="IDX1202"></A>
-<A NAME="IDX1203"></A>
+<A NAME="IDX1219"></A>
+<A NAME="IDX1220"></A>
 As a special feature for Farsi (Persian) and maybe Arabic, translators can
 insert an <SAMP>&lsquo;I&rsquo;</SAMP> flag into numeric format directives.  For example, the
 translation of <CODE>"%d"</CODE> can be <CODE>"%Id"</CODE>.  The effect of this flag,
@@ -234,7 +234,7 @@ glibc when NLS is disabled.)
 </P>
 
 
-<H3><A NAME="SEC252" HREF="gettext_toc.html#TOC252">15.3.2  Objective C Format Strings</A></H3>
+<H3><A NAME="SEC253" HREF="gettext_toc.html#TOC253">15.3.2  Objective C Format Strings</A></H3>
 
 <P>
 Objective C format strings are like C format strings.  They support an
@@ -244,7 +244,7 @@ of type <CODE>Object *</CODE>.
 </P>
 
 
-<H3><A NAME="SEC253" HREF="gettext_toc.html#TOC253">15.3.3  Shell Format Strings</A></H3>
+<H3><A NAME="SEC254" HREF="gettext_toc.html#TOC254">15.3.3  Shell Format Strings</A></H3>
 
 <P>
 Shell format strings, as supported by GNU gettext and the <SAMP>&lsquo;envsubst&rsquo;</SAMP>
@@ -266,7 +266,7 @@ a variable reference is ignored.
 </P>
 
 
-<H3><A NAME="SEC254" HREF="gettext_toc.html#TOC254">15.3.4  Python Format Strings</A></H3>
+<H3><A NAME="SEC255" HREF="gettext_toc.html#TOC255">15.3.4  Python Format Strings</A></H3>
 
 <P>
 There are two kinds of format strings in Python: those acceptable to
@@ -278,11 +278,10 @@ of the <SAMP>&lsquo;str&rsquo;</SAMP> object.
 <P>
 Python <CODE>%</CODE> format strings are described in
 Python Library reference /
-2. Built-in Types, Exceptions and Functions /
-2.2. Built-in Types /
-2.2.6. Sequence Types /
-2.2.6.2. String Formatting Operations.
-<A HREF="http://www.python.org/doc/2.2.1/lib/typesseq-strings.html">http://www.python.org/doc/2.2.1/lib/typesseq-strings.html</A>.
+5. Built-in Types /
+5.6. Sequence Types /
+5.6.2. String Formatting Operations.
+<A HREF="http://docs.python.org/2/library/stdtypes.html#string-formatting-operations">http://docs.python.org/2/library/stdtypes.html#string-formatting-operations</A>.
 
 </P>
 <P>
@@ -292,7 +291,7 @@ String Formatting, <A HREF="http://www.python.org/dev/peps/pep-3101/">http://www
 </P>
 
 
-<H3><A NAME="SEC255" HREF="gettext_toc.html#TOC255">15.3.5  Lisp Format Strings</A></H3>
+<H3><A NAME="SEC256" HREF="gettext_toc.html#TOC256">15.3.5  Lisp Format Strings</A></H3>
 
 <P>
 Lisp format strings are described in the Common Lisp HyperSpec,
@@ -302,7 +301,7 @@ chapter 22.3 Formatted Output,
 </P>
 
 
-<H3><A NAME="SEC256" HREF="gettext_toc.html#TOC256">15.3.6  Emacs Lisp Format Strings</A></H3>
+<H3><A NAME="SEC257" HREF="gettext_toc.html#TOC257">15.3.6  Emacs Lisp Format Strings</A></H3>
 
 <P>
 Emacs Lisp format strings are documented in the Emacs Lisp reference,
@@ -314,7 +313,7 @@ in format strings while FSF Emacs doesn't.
 </P>
 
 
-<H3><A NAME="SEC257" HREF="gettext_toc.html#TOC257">15.3.7  librep Format Strings</A></H3>
+<H3><A NAME="SEC258" HREF="gettext_toc.html#TOC258">15.3.7  librep Format Strings</A></H3>
 
 <P>
 librep format strings are documented in the librep manual, section
@@ -325,7 +324,7 @@ Formatted Output,
 </P>
 
 
-<H3><A NAME="SEC258" HREF="gettext_toc.html#TOC258">15.3.8  Scheme Format Strings</A></H3>
+<H3><A NAME="SEC259" HREF="gettext_toc.html#TOC259">15.3.8  Scheme Format Strings</A></H3>
 
 <P>
 Scheme format strings are documented in the SLIB manual, section
@@ -334,7 +333,7 @@ Format Specification.
 </P>
 
 
-<H3><A NAME="SEC259" HREF="gettext_toc.html#TOC259">15.3.9  Smalltalk Format Strings</A></H3>
+<H3><A NAME="SEC260" HREF="gettext_toc.html#TOC260">15.3.9  Smalltalk Format Strings</A></H3>
 
 <P>
 Smalltalk format strings are described in the GNU Smalltalk documentation,
@@ -347,7 +346,7 @@ or a nonzero digit (<SAMP>&lsquo;1&rsquo;</SAMP> to <SAMP>&lsquo;9&rsquo;</SAMP>
 </P>
 
 
-<H3><A NAME="SEC260" HREF="gettext_toc.html#TOC260">15.3.10  Java Format Strings</A></H3>
+<H3><A NAME="SEC261" HREF="gettext_toc.html#TOC261">15.3.10  Java Format Strings</A></H3>
 
 <P>
 Java format strings are described in the JDK documentation for class
@@ -359,7 +358,7 @@ See also the ICU documentation
 </P>
 
 
-<H3><A NAME="SEC261" HREF="gettext_toc.html#TOC261">15.3.11  C# Format Strings</A></H3>
+<H3><A NAME="SEC262" HREF="gettext_toc.html#TOC262">15.3.11  C# Format Strings</A></H3>
 
 <P>
 C# format strings are described in the .NET documentation for class
@@ -369,7 +368,7 @@ C# format strings are described in the .NET documentation for class
 </P>
 
 
-<H3><A NAME="SEC262" HREF="gettext_toc.html#TOC262">15.3.12  awk Format Strings</A></H3>
+<H3><A NAME="SEC263" HREF="gettext_toc.html#TOC263">15.3.12  awk Format Strings</A></H3>
 
 <P>
 awk format strings are described in the gawk documentation, section
@@ -379,7 +378,7 @@ Printf,
 </P>
 
 
-<H3><A NAME="SEC263" HREF="gettext_toc.html#TOC263">15.3.13  Object Pascal Format Strings</A></H3>
+<H3><A NAME="SEC264" HREF="gettext_toc.html#TOC264">15.3.13  Object Pascal Format Strings</A></H3>
 
 <P>
 Object Pascal format strings are described in the documentation of the
@@ -389,7 +388,7 @@ Free Pascal runtime library, section Format,
 </P>
 
 
-<H3><A NAME="SEC264" HREF="gettext_toc.html#TOC264">15.3.14  YCP Format Strings</A></H3>
+<H3><A NAME="SEC265" HREF="gettext_toc.html#TOC265">15.3.14  YCP Format Strings</A></H3>
 
 <P>
 YCP sformat strings are described in the libycp documentation
@@ -400,7 +399,7 @@ or a nonzero digit (<SAMP>&lsquo;1&rsquo;</SAMP> to <SAMP>&lsquo;9&rsquo;</SAMP>
 </P>
 
 
-<H3><A NAME="SEC265" HREF="gettext_toc.html#TOC265">15.3.15  Tcl Format Strings</A></H3>
+<H3><A NAME="SEC266" HREF="gettext_toc.html#TOC266">15.3.15  Tcl Format Strings</A></H3>
 
 <P>
 Tcl format strings are described in the <TT>&lsquo;format.n&rsquo;</TT> manual page,
@@ -409,7 +408,7 @@ Tcl format strings are described in the <TT>&lsquo;format.n&rsquo;</TT> manual p
 </P>
 
 
-<H3><A NAME="SEC266" HREF="gettext_toc.html#TOC266">15.3.16  Perl Format Strings</A></H3>
+<H3><A NAME="SEC267" HREF="gettext_toc.html#TOC267">15.3.16  Perl Format Strings</A></H3>
 
 <P>
 There are two kinds format strings in Perl: those acceptable to the
@@ -433,7 +432,7 @@ of simple identifiers.
 </P>
 
 
-<H3><A NAME="SEC267" HREF="gettext_toc.html#TOC267">15.3.17  PHP Format Strings</A></H3>
+<H3><A NAME="SEC268" HREF="gettext_toc.html#TOC268">15.3.17  PHP Format Strings</A></H3>
 
 <P>
 PHP format strings are described in the documentation of the PHP function
@@ -443,7 +442,7 @@ PHP format strings are described in the documentation of the PHP function
 </P>
 
 
-<H3><A NAME="SEC268" HREF="gettext_toc.html#TOC268">15.3.18  GCC internal Format Strings</A></H3>
+<H3><A NAME="SEC269" HREF="gettext_toc.html#TOC269">15.3.18  GCC internal Format Strings</A></H3>
 
 <P>
 These format strings are used inside the GCC sources.  In such a format
@@ -464,7 +463,7 @@ operator, <SAMP>&lsquo;V&rsquo;</SAMP> denotes a const/volatile qualifier.
 </P>
 
 
-<H3><A NAME="SEC269" HREF="gettext_toc.html#TOC269">15.3.19  GFC internal Format Strings</A></H3>
+<H3><A NAME="SEC270" HREF="gettext_toc.html#TOC270">15.3.19  GFC internal Format Strings</A></H3>
 
 <P>
 These format strings are used inside the GNU Fortran Compiler sources,
@@ -479,7 +478,7 @@ denote an integer, <SAMP>&lsquo;u&rsquo;</SAMP> denotes an unsigned integer.  <S
 </P>
 
 
-<H3><A NAME="SEC270" HREF="gettext_toc.html#TOC270">15.3.20  Qt Format Strings</A></H3>
+<H3><A NAME="SEC271" HREF="gettext_toc.html#TOC271">15.3.20  Qt Format Strings</A></H3>
 
 <P>
 Qt format strings are described in the documentation of the QString class
@@ -490,7 +489,7 @@ directive cannot occur more than once in a format string.
 </P>
 
 
-<H3><A NAME="SEC271" HREF="gettext_toc.html#TOC271">15.3.21  Qt Format Strings</A></H3>
+<H3><A NAME="SEC272" HREF="gettext_toc.html#TOC272">15.3.21  Qt Format Strings</A></H3>
 
 <P>
 Qt format strings are described in the documentation of the QObject::tr method
@@ -500,7 +499,7 @@ In summary, the only allowed directive is <SAMP>&lsquo;%n&rsquo;</SAMP>.
 </P>
 
 
-<H3><A NAME="SEC272" HREF="gettext_toc.html#TOC272">15.3.22  KDE Format Strings</A></H3>
+<H3><A NAME="SEC273" HREF="gettext_toc.html#TOC273">15.3.22  KDE Format Strings</A></H3>
 
 <P>
 KDE 4 format strings are defined as follows:
@@ -511,7 +510,24 @@ must occur as well, except possibly one of them.
 </P>
 
 
-<H3><A NAME="SEC273" HREF="gettext_toc.html#TOC273">15.3.23  Boost Format Strings</A></H3>
+<H3><A NAME="SEC274" HREF="gettext_toc.html#TOC274">15.3.23  KUIT Format Strings</A></H3>
+
+<P>
+KUIT (KDE User Interface Text) is compatible with KDE 4 format strings,
+while it also allows programmers to add semantic information to a format
+string, through XML markup tags.  For example, if the first format
+directive in a string is a filename, programmers could indicate that
+with a <SAMP>&lsquo;filename&rsquo;</SAMP> tag, like <SAMP>&lsquo;&#60;filename&#62;%1&#60;/filename&#62;&rsquo;</SAMP>.
+
+</P>
+<P>
+KUIT format strings are described in
+<A HREF="http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/prg_guide.html#kuit_markup">http://api.kde.org/frameworks-api/frameworks5-apidocs/ki18n/html/prg_guide.html#kuit_markup</A>.
+
+</P>
+
+
+<H3><A NAME="SEC275" HREF="gettext_toc.html#TOC275">15.3.24  Boost Format Strings</A></H3>
 
 <P>
 Boost format strings are described in the documentation of the
@@ -525,7 +541,7 @@ between percent signs, such as <SAMP>&lsquo;%1%&rsquo;</SAMP>.
 </P>
 
 
-<H3><A NAME="SEC274" HREF="gettext_toc.html#TOC274">15.3.24  Lua Format Strings</A></H3>
+<H3><A NAME="SEC276" HREF="gettext_toc.html#TOC276">15.3.25  Lua Format Strings</A></H3>
 
 <P>
 Lua format strings are described in the Lua reference manual, section String Manipulation,
@@ -534,7 +550,7 @@ Lua format strings are described in the Lua reference manual, section String Man
 </P>
 
 
-<H3><A NAME="SEC275" HREF="gettext_toc.html#TOC275">15.3.25  JavaScript Format Strings</A></H3>
+<H3><A NAME="SEC277" HREF="gettext_toc.html#TOC277">15.3.26  JavaScript Format Strings</A></H3>
 
 <P>
 Although JavaScript specification itself does not define any format
@@ -552,7 +568,7 @@ object.
 
 
 
-<H2><A NAME="SEC276" HREF="gettext_toc.html#TOC276">15.4  The Maintainer's View</A></H2>
+<H2><A NAME="SEC278" HREF="gettext_toc.html#TOC278">15.4  The Maintainer's View</A></H2>
 
 <P>
 For the maintainer, the general procedure differs from the C language
@@ -572,7 +588,7 @@ invokes the <CODE>AM_GNU_GETTEXT</CODE> autoconf macro via
 <LI>
 
 If only a single programming language is used, the <CODE>XGETTEXT_OPTIONS</CODE>
-variable in <TT>&lsquo;po/Makevars&rsquo;</TT> (see section <A HREF="gettext_13.html#SEC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>) should be adjusted to
+variable in <TT>&lsquo;po/Makevars&rsquo;</TT> (see section <A HREF="gettext_13.html#SEC220">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>) should be adjusted to
 match the <CODE>xgettext</CODE> options for that particular programming language.
 If the package uses more than one programming language with <CODE>gettext</CODE>
 support, it becomes necessary to change the POT file construction rule
@@ -583,13 +599,13 @@ that language, and to combine the resulting files using <CODE>msgcat</CODE>.
 
 
 
-<H2><A NAME="SEC277" HREF="gettext_toc.html#TOC277">15.5  Individual Programming Languages</A></H2>
+<H2><A NAME="SEC279" HREF="gettext_toc.html#TOC279">15.5  Individual Programming Languages</A></H2>
 
 
 
-<H3><A NAME="SEC278" HREF="gettext_toc.html#TOC278">15.5.1  C, C++, Objective C</A></H3>
+<H3><A NAME="SEC280" HREF="gettext_toc.html#TOC280">15.5.1  C, C++, Objective C</A></H3>
 <P>
-<A NAME="IDX1204"></A>
+<A NAME="IDX1221"></A>
 
 </P>
 <DL COMPACT>
@@ -667,9 +683,9 @@ The following examples are available in the <TT>&lsquo;examples&rsquo;</TT> dire
 </P>
 
 
-<H3><A NAME="SEC279" HREF="gettext_toc.html#TOC279">15.5.2  sh - Shell Script</A></H3>
+<H3><A NAME="SEC281" HREF="gettext_toc.html#TOC281">15.5.2  sh - Shell Script</A></H3>
 <P>
-<A NAME="IDX1205"></A>
+<A NAME="IDX1222"></A>
 
 </P>
 <DL COMPACT>
@@ -692,19 +708,19 @@ bash, gettext
 
 <DT>gettext/ngettext functions
 <DD>
-<A NAME="IDX1206"></A>
-<A NAME="IDX1207"></A>
+<A NAME="IDX1223"></A>
+<A NAME="IDX1224"></A>
 <CODE>gettext</CODE>, <CODE>ngettext</CODE> programs
 <BR><CODE>eval_gettext</CODE>, <CODE>eval_ngettext</CODE> shell functions
 
 <DT>textdomain
 <DD>
-<A NAME="IDX1208"></A>
+<A NAME="IDX1225"></A>
 environment variable <CODE>TEXTDOMAIN</CODE>
 
 <DT>bindtextdomain
 <DD>
-<A NAME="IDX1209"></A>
+<A NAME="IDX1226"></A>
 environment variable <CODE>TEXTDOMAINDIR</CODE>
 
 <DT>setlocale
@@ -743,9 +759,9 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 
 
 
-<H4><A NAME="SEC280" HREF="gettext_toc.html#TOC280">15.5.2.1  Preparing Shell Scripts for Internationalization</A></H4>
+<H4><A NAME="SEC282" HREF="gettext_toc.html#TOC282">15.5.2.1  Preparing Shell Scripts for Internationalization</A></H4>
 <P>
-<A NAME="IDX1210"></A>
+<A NAME="IDX1227"></A>
 
 </P>
 <P>
@@ -767,8 +783,8 @@ Insert the line
 
 near the top of the script.  <CODE>gettext.sh</CODE> is a shell function library
 that provides the functions
-<CODE>eval_gettext</CODE> (see section <A HREF="gettext_15.html#SEC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>) and
-<CODE>eval_ngettext</CODE> (see section <A HREF="gettext_15.html#SEC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>).
+<CODE>eval_gettext</CODE> (see section <A HREF="gettext_15.html#SEC287">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>) and
+<CODE>eval_ngettext</CODE> (see section <A HREF="gettext_15.html#SEC288">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>).
 You have to ensure that <CODE>gettext.sh</CODE> can be found in the <CODE>PATH</CODE>.
 
 <LI>
@@ -883,7 +899,7 @@ error "`eval_gettext \"file not found: \\\$filename\"`"
 
 
 
-<H4><A NAME="SEC281" HREF="gettext_toc.html#TOC281">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A></H4>
+<H4><A NAME="SEC283" HREF="gettext_toc.html#TOC283">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A></H4>
 
 <P>
 <CODE>gettext.sh</CODE>, contained in the run-time package of GNU gettext, provides
@@ -899,20 +915,20 @@ and a newline, without interpreting backslashes in the argument string.
 
 <LI>eval_gettext
 
-See section <A HREF="gettext_15.html#SEC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>.
+See section <A HREF="gettext_15.html#SEC287">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>.
 
 <LI>eval_ngettext
 
-See section <A HREF="gettext_15.html#SEC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>.
+See section <A HREF="gettext_15.html#SEC288">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>.
 </UL>
 
 
 
-<H4><A NAME="SEC282" HREF="gettext_toc.html#TOC282">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A></H4>
+<H4><A NAME="SEC284" HREF="gettext_toc.html#TOC284">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A></H4>
 
 <P>
-<A NAME="IDX1211"></A>
-<A NAME="IDX1212"></A>
+<A NAME="IDX1228"></A>
+<A NAME="IDX1229"></A>
 
 <PRE>
 gettext [<VAR>option</VAR>] [[<VAR>textdomain</VAR>] <VAR>msgid</VAR>]
@@ -920,7 +936,7 @@ gettext [<VAR>option</VAR>] -s [<VAR>msgid</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX1213"></A>
+<A NAME="IDX1230"></A>
 The <CODE>gettext</CODE> program displays the native language translation of a
 textual message.
 
@@ -935,14 +951,14 @@ textual message.
 <DD>
 <DT><SAMP>&lsquo;--domain=<VAR>textdomain</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1214"></A>
-<A NAME="IDX1215"></A>
+<A NAME="IDX1231"></A>
+<A NAME="IDX1232"></A>
 Retrieve translated messages from <VAR>textdomain</VAR>.  Usually a <VAR>textdomain</VAR>
 corresponds to a package, a program, or a module of a program.
 
 <DT><SAMP>&lsquo;-e&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1216"></A>
+<A NAME="IDX1233"></A>
 Enable expansion of some escape sequences.  This option is for compatibility
 with the <SAMP>&lsquo;echo&rsquo;</SAMP> program or shell built-in.  The escape sequences
 <SAMP>&lsquo;\a&rsquo;</SAMP>, <SAMP>&lsquo;\b&rsquo;</SAMP>, <SAMP>&lsquo;\c&rsquo;</SAMP>, <SAMP>&lsquo;\f&rsquo;</SAMP>, <SAMP>&lsquo;\n&rsquo;</SAMP>, <SAMP>&lsquo;\r&rsquo;</SAMP>, <SAMP>&lsquo;\t&rsquo;</SAMP>,
@@ -951,7 +967,7 @@ interpreted like the System V <SAMP>&lsquo;echo&rsquo;</SAMP> program did.
 
 <DT><SAMP>&lsquo;-E&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1217"></A>
+<A NAME="IDX1234"></A>
 This option is only for compatibility with the <SAMP>&lsquo;echo&rsquo;</SAMP> program or shell
 built-in.  It has no effect.
 
@@ -959,13 +975,13 @@ built-in.  It has no effect.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1218"></A>
-<A NAME="IDX1219"></A>
+<A NAME="IDX1235"></A>
+<A NAME="IDX1236"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1220"></A>
+<A NAME="IDX1237"></A>
 Suppress trailing newline.  By default, <CODE>gettext</CODE> adds a newline to
 the output.
 
@@ -973,8 +989,8 @@ the output.
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1221"></A>
-<A NAME="IDX1222"></A>
+<A NAME="IDX1238"></A>
+<A NAME="IDX1239"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;[<VAR>textdomain</VAR>] <VAR>msgid</VAR>&rsquo;</SAMP>
@@ -1004,18 +1020,18 @@ Note: <CODE>xgettext</CODE> supports only the one-argument form of the
 </P>
 
 
-<H4><A NAME="SEC283" HREF="gettext_toc.html#TOC283">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A></H4>
+<H4><A NAME="SEC285" HREF="gettext_toc.html#TOC285">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A></H4>
 
 <P>
-<A NAME="IDX1223"></A>
-<A NAME="IDX1224"></A>
+<A NAME="IDX1240"></A>
+<A NAME="IDX1241"></A>
 
 <PRE>
 ngettext [<VAR>option</VAR>] [<VAR>textdomain</VAR>] <VAR>msgid</VAR> <VAR>msgid-plural</VAR> <VAR>count</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX1225"></A>
+<A NAME="IDX1242"></A>
 The <CODE>ngettext</CODE> program displays the native language translation of a
 textual message whose grammatical form depends on a number.
 
@@ -1030,14 +1046,14 @@ textual message whose grammatical form depends on a number.
 <DD>
 <DT><SAMP>&lsquo;--domain=<VAR>textdomain</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1226"></A>
-<A NAME="IDX1227"></A>
+<A NAME="IDX1243"></A>
+<A NAME="IDX1244"></A>
 Retrieve translated messages from <VAR>textdomain</VAR>.  Usually a <VAR>textdomain</VAR>
 corresponds to a package, a program, or a module of a program.
 
 <DT><SAMP>&lsquo;-e&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1228"></A>
+<A NAME="IDX1245"></A>
 Enable expansion of some escape sequences.  This option is for compatibility
 with the <SAMP>&lsquo;gettext&rsquo;</SAMP> program.  The escape sequences
 <SAMP>&lsquo;\a&rsquo;</SAMP>, <SAMP>&lsquo;\b&rsquo;</SAMP>, <SAMP>&lsquo;\c&rsquo;</SAMP>, <SAMP>&lsquo;\f&rsquo;</SAMP>, <SAMP>&lsquo;\n&rsquo;</SAMP>, <SAMP>&lsquo;\r&rsquo;</SAMP>, <SAMP>&lsquo;\t&rsquo;</SAMP>,
@@ -1046,7 +1062,7 @@ interpreted like the System V <SAMP>&lsquo;echo&rsquo;</SAMP> program did.
 
 <DT><SAMP>&lsquo;-E&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1229"></A>
+<A NAME="IDX1246"></A>
 This option is only for compatibility with the <SAMP>&lsquo;gettext&rsquo;</SAMP> program.  It has
 no effect.
 
@@ -1054,16 +1070,16 @@ no effect.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1230"></A>
-<A NAME="IDX1231"></A>
+<A NAME="IDX1247"></A>
+<A NAME="IDX1248"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1232"></A>
-<A NAME="IDX1233"></A>
+<A NAME="IDX1249"></A>
+<A NAME="IDX1250"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;<VAR>textdomain</VAR>&rsquo;</SAMP>
@@ -1095,20 +1111,20 @@ Note: <CODE>xgettext</CODE> supports only the three-arguments form of the
 </P>
 
 
-<H4><A NAME="SEC284" HREF="gettext_toc.html#TOC284">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A></H4>
+<H4><A NAME="SEC286" HREF="gettext_toc.html#TOC286">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A></H4>
 
 <P>
-<A NAME="IDX1234"></A>
-<A NAME="IDX1235"></A>
+<A NAME="IDX1251"></A>
+<A NAME="IDX1252"></A>
 
 <PRE>
 envsubst [<VAR>option</VAR>] [<VAR>shell-format</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX1236"></A>
-<A NAME="IDX1237"></A>
-<A NAME="IDX1238"></A>
+<A NAME="IDX1253"></A>
+<A NAME="IDX1254"></A>
+<A NAME="IDX1255"></A>
 The <CODE>envsubst</CODE> program substitutes the values of environment variables.
 
 </P>
@@ -1122,8 +1138,8 @@ The <CODE>envsubst</CODE> program substitutes the values of environment variable
 <DD>
 <DT><SAMP>&lsquo;--variables&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1239"></A>
-<A NAME="IDX1240"></A>
+<A NAME="IDX1256"></A>
+<A NAME="IDX1257"></A>
 Output the variables occurring in <VAR>shell-format</VAR>.
 
 </DL>
@@ -1138,16 +1154,16 @@ Output the variables occurring in <VAR>shell-format</VAR>.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1241"></A>
-<A NAME="IDX1242"></A>
+<A NAME="IDX1258"></A>
+<A NAME="IDX1259"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX1243"></A>
-<A NAME="IDX1244"></A>
+<A NAME="IDX1260"></A>
+<A NAME="IDX1261"></A>
 Output version information and exit.
 
 </DL>
@@ -1177,17 +1193,17 @@ consists of the environment variables that are referenced in
 </P>
 
 
-<H4><A NAME="SEC285" HREF="gettext_toc.html#TOC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A></H4>
+<H4><A NAME="SEC287" HREF="gettext_toc.html#TOC287">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A></H4>
 
 <P>
-<A NAME="IDX1245"></A>
+<A NAME="IDX1262"></A>
 
 <PRE>
 eval_gettext <VAR>msgid</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX1246"></A>
+<A NAME="IDX1263"></A>
 This function outputs the native language translation of a textual message,
 performing dollar-substitution on the result.  Note that only shell variables
 mentioned in <VAR>msgid</VAR> will be dollar-substituted in the result.
@@ -1195,17 +1211,17 @@ mentioned in <VAR>msgid</VAR> will be dollar-substituted in the result.
 </P>
 
 
-<H4><A NAME="SEC286" HREF="gettext_toc.html#TOC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A></H4>
+<H4><A NAME="SEC288" HREF="gettext_toc.html#TOC288">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A></H4>
 
 <P>
-<A NAME="IDX1247"></A>
+<A NAME="IDX1264"></A>
 
 <PRE>
 eval_ngettext <VAR>msgid</VAR> <VAR>msgid-plural</VAR> <VAR>count</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX1248"></A>
+<A NAME="IDX1265"></A>
 This function outputs the native language translation of a textual message
 whose grammatical form depends on a number, performing dollar-substitution
 on the result.  Note that only shell variables mentioned in <VAR>msgid</VAR> or
@@ -1214,9 +1230,9 @@ on the result.  Note that only shell variables mentioned in <VAR>msgid</VAR> or
 </P>
 
 
-<H3><A NAME="SEC287" HREF="gettext_toc.html#TOC287">15.5.3  bash - Bourne-Again Shell Script</A></H3>
+<H3><A NAME="SEC289" HREF="gettext_toc.html#TOC289">15.5.3  bash - Bourne-Again Shell Script</A></H3>
 <P>
-<A NAME="IDX1249"></A>
+<A NAME="IDX1266"></A>
 
 </P>
 <P>
@@ -1265,9 +1281,9 @@ that don't have the <CODE>gettext()</CODE> function in libc.
 </P>
 
 
-<H3><A NAME="SEC288" HREF="gettext_toc.html#TOC288">15.5.4  Python</A></H3>
+<H3><A NAME="SEC290" HREF="gettext_toc.html#TOC290">15.5.4  Python</A></H3>
 <P>
-<A NAME="IDX1250"></A>
+<A NAME="IDX1267"></A>
 
 </P>
 <DL COMPACT>
@@ -1379,11 +1395,11 @@ verifies that the format string uses all supplied arguments.)
 
 
 
-<H3><A NAME="SEC289" HREF="gettext_toc.html#TOC289">15.5.5  GNU clisp - Common Lisp</A></H3>
+<H3><A NAME="SEC291" HREF="gettext_toc.html#TOC291">15.5.5  GNU clisp - Common Lisp</A></H3>
 <P>
-<A NAME="IDX1251"></A>
-<A NAME="IDX1252"></A>
-<A NAME="IDX1253"></A>
+<A NAME="IDX1268"></A>
+<A NAME="IDX1269"></A>
+<A NAME="IDX1270"></A>
 
 </P>
 <DL COMPACT>
@@ -1451,9 +1467,9 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC290" HREF="gettext_toc.html#TOC290">15.5.6  GNU clisp C sources</A></H3>
+<H3><A NAME="SEC292" HREF="gettext_toc.html#TOC292">15.5.6  GNU clisp C sources</A></H3>
 <P>
-<A NAME="IDX1254"></A>
+<A NAME="IDX1271"></A>
 
 </P>
 <DL COMPACT>
@@ -1519,9 +1535,9 @@ On platforms without gettext, no translation.
 
 
 
-<H3><A NAME="SEC291" HREF="gettext_toc.html#TOC291">15.5.7  Emacs Lisp</A></H3>
+<H3><A NAME="SEC293" HREF="gettext_toc.html#TOC293">15.5.7  Emacs Lisp</A></H3>
 <P>
-<A NAME="IDX1255"></A>
+<A NAME="IDX1272"></A>
 
 </P>
 <DL COMPACT>
@@ -1585,9 +1601,9 @@ Only XEmacs.  Without <CODE>I18N3</CODE> defined at build time, no translation.
 
 
 
-<H3><A NAME="SEC292" HREF="gettext_toc.html#TOC292">15.5.8  librep</A></H3>
+<H3><A NAME="SEC294" HREF="gettext_toc.html#TOC294">15.5.8  librep</A></H3>
 <P>
-<A NAME="IDX1256"></A>
+<A NAME="IDX1273"></A>
 
 </P>
 <DL COMPACT>
@@ -1655,10 +1671,10 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC293" HREF="gettext_toc.html#TOC293">15.5.9  GNU guile - Scheme</A></H3>
+<H3><A NAME="SEC295" HREF="gettext_toc.html#TOC295">15.5.9  GNU guile - Scheme</A></H3>
 <P>
-<A NAME="IDX1257"></A>
-<A NAME="IDX1258"></A>
+<A NAME="IDX1274"></A>
+<A NAME="IDX1275"></A>
 
 </P>
 <DL COMPACT>
@@ -1726,9 +1742,9 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC294" HREF="gettext_toc.html#TOC294">15.5.10  GNU Smalltalk</A></H3>
+<H3><A NAME="SEC296" HREF="gettext_toc.html#TOC296">15.5.10  GNU Smalltalk</A></H3>
 <P>
-<A NAME="IDX1259"></A>
+<A NAME="IDX1276"></A>
 
 </P>
 <DL COMPACT>
@@ -1799,9 +1815,9 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory:
 </P>
 
 
-<H3><A NAME="SEC295" HREF="gettext_toc.html#TOC295">15.5.11  Java</A></H3>
+<H3><A NAME="SEC297" HREF="gettext_toc.html#TOC297">15.5.11  Java</A></H3>
 <P>
-<A NAME="IDX1260"></A>
+<A NAME="IDX1277"></A>
 
 </P>
 <DL COMPACT>
@@ -1935,7 +1951,7 @@ This has the advantage of having the <CODE>ngettext</CODE> function for plural
 handling and the <CODE>pgettext</CODE> and <CODE>npgettext</CODE> for strings constraint
 to a particular context.
 
-<A NAME="IDX1261"></A>
+<A NAME="IDX1278"></A>
 To use this API, one needs the <CODE>libintl.jar</CODE> file which is part of
 the GNU gettext package and distributed under the LGPL.
 </OL>
@@ -2042,9 +2058,9 @@ than a class with a single-letter name.
 </P>
 
 
-<H3><A NAME="SEC296" HREF="gettext_toc.html#TOC296">15.5.12  C#</A></H3>
+<H3><A NAME="SEC298" HREF="gettext_toc.html#TOC298">15.5.12  C#</A></H3>
 <P>
-<A NAME="IDX1262"></A>
+<A NAME="IDX1279"></A>
 
 </P>
 <DL COMPACT>
@@ -2283,7 +2299,7 @@ The <CODE>GetParticularPluralString</CODE> function returns a string translation
 specific to a particular context, with plural handling, like the
 <CODE>npgettext</CODE> function in C.
 
-<A NAME="IDX1263"></A>
+<A NAME="IDX1280"></A>
 To use this API, one needs the <CODE>GNU.Gettext.dll</CODE> file which is part of
 the GNU gettext package and distributed under the LGPL.
 </OL>
@@ -2368,10 +2384,10 @@ with a single-letter name.
 </P>
 
 
-<H3><A NAME="SEC297" HREF="gettext_toc.html#TOC297">15.5.13  GNU awk</A></H3>
+<H3><A NAME="SEC299" HREF="gettext_toc.html#TOC299">15.5.13  GNU awk</A></H3>
 <P>
-<A NAME="IDX1264"></A>
-<A NAME="IDX1265"></A>
+<A NAME="IDX1281"></A>
+<A NAME="IDX1282"></A>
 
 </P>
 <DL COMPACT>
@@ -2382,7 +2398,9 @@ gawk 3.1 or newer
 
 <DT>File extension
 <DD>
-<CODE>awk</CODE>
+<CODE>awk</CODE>, <CODE>gawk</CODE>, <CODE>twjr</CODE>.
+The file extension <CODE>twjr</CODE> is used by TexiWeb Jr
+(<A HREF="https://github.com/arnoldrobbins/texiwebjr">https://github.com/arnoldrobbins/texiwebjr</A>).
 
 <DT>String syntax
 <DD>
@@ -2441,11 +2459,11 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC298" HREF="gettext_toc.html#TOC298">15.5.14  Pascal - Free Pascal Compiler</A></H3>
+<H3><A NAME="SEC300" HREF="gettext_toc.html#TOC300">15.5.14  Pascal - Free Pascal Compiler</A></H3>
 <P>
-<A NAME="IDX1266"></A>
-<A NAME="IDX1267"></A>
-<A NAME="IDX1268"></A>
+<A NAME="IDX1283"></A>
+<A NAME="IDX1284"></A>
+<A NAME="IDX1285"></A>
 
 </P>
 <DL COMPACT>
@@ -2522,9 +2540,9 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC299" HREF="gettext_toc.html#TOC299">15.5.15  wxWidgets library</A></H3>
+<H3><A NAME="SEC301" HREF="gettext_toc.html#TOC301">15.5.15  wxWidgets library</A></H3>
 <P>
-<A NAME="IDX1269"></A>
+<A NAME="IDX1286"></A>
 
 </P>
 <DL COMPACT>
@@ -2590,10 +2608,10 @@ yes
 
 
 
-<H3><A NAME="SEC300" HREF="gettext_toc.html#TOC300">15.5.16  YCP - YaST2 scripting language</A></H3>
+<H3><A NAME="SEC302" HREF="gettext_toc.html#TOC302">15.5.16  YCP - YaST2 scripting language</A></H3>
 <P>
-<A NAME="IDX1270"></A>
-<A NAME="IDX1271"></A>
+<A NAME="IDX1287"></A>
+<A NAME="IDX1288"></A>
 
 </P>
 <DL COMPACT>
@@ -2661,10 +2679,10 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC301" HREF="gettext_toc.html#TOC301">15.5.17  Tcl - Tk's scripting language</A></H3>
+<H3><A NAME="SEC303" HREF="gettext_toc.html#TOC303">15.5.17  Tcl - Tk's scripting language</A></H3>
 <P>
-<A NAME="IDX1272"></A>
-<A NAME="IDX1273"></A>
+<A NAME="IDX1289"></A>
+<A NAME="IDX1290"></A>
 
 </P>
 <DL COMPACT>
@@ -2747,9 +2765,9 @@ argument is given.
 </P>
 
 
-<H3><A NAME="SEC302" HREF="gettext_toc.html#TOC302">15.5.18  Perl</A></H3>
+<H3><A NAME="SEC304" HREF="gettext_toc.html#TOC304">15.5.18  Perl</A></H3>
 <P>
-<A NAME="IDX1274"></A>
+<A NAME="IDX1291"></A>
 
 </P>
 <DL COMPACT>
@@ -2862,7 +2880,7 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 
 </P>
 <P>
-<A NAME="IDX1275"></A>
+<A NAME="IDX1292"></A>
 
 </P>
 <P>
@@ -2877,7 +2895,7 @@ worst probably being its imperfectness.
 
 
 
-<H4><A NAME="SEC303" HREF="gettext_toc.html#TOC303">15.5.18.1  General Problems Parsing Perl Code</A></H4>
+<H4><A NAME="SEC305" HREF="gettext_toc.html#TOC305">15.5.18.1  General Problems Parsing Perl Code</A></H4>
 
 <P>
 It is often heard that only Perl can parse Perl.  This is not true.
@@ -3082,9 +3100,9 @@ about such constructs.
 </P>
 
 
-<H4><A NAME="SEC304" HREF="gettext_toc.html#TOC304">15.5.18.2  Which keywords will xgettext look for?</A></H4>
+<H4><A NAME="SEC306" HREF="gettext_toc.html#TOC306">15.5.18.2  Which keywords will xgettext look for?</A></H4>
 <P>
-<A NAME="IDX1276"></A>
+<A NAME="IDX1293"></A>
 
 </P>
 <P>
@@ -3131,9 +3149,9 @@ The keys of lookups into the hash reference <CODE>$gettext</CODE> will be extrac
 
 
 
-<H4><A NAME="SEC305" HREF="gettext_toc.html#TOC305">15.5.18.3  How to Extract Hash Keys</A></H4>
+<H4><A NAME="SEC307" HREF="gettext_toc.html#TOC307">15.5.18.3  How to Extract Hash Keys</A></H4>
 <P>
-<A NAME="IDX1277"></A>
+<A NAME="IDX1294"></A>
 
 </P>
 <P>
@@ -3186,9 +3204,9 @@ are <EM>not</EM> allowed, regardless of the <CODE>use utf8</CODE> pragma.
 </P>
 
 
-<H4><A NAME="SEC306" HREF="gettext_toc.html#TOC306">15.5.18.4  What are Strings And Quote-like Expressions?</A></H4>
+<H4><A NAME="SEC308" HREF="gettext_toc.html#TOC308">15.5.18.4  What are Strings And Quote-like Expressions?</A></H4>
 <P>
-<A NAME="IDX1278"></A>
+<A NAME="IDX1295"></A>
 
 </P>
 <P>
@@ -3286,9 +3304,9 @@ Delimiters that start with a digit are not supported!
 
 
 
-<H4><A NAME="SEC307" HREF="gettext_toc.html#TOC307">15.5.18.5  Invalid Uses Of String Interpolation</A></H4>
+<H4><A NAME="SEC309" HREF="gettext_toc.html#TOC309">15.5.18.5  Invalid Uses Of String Interpolation</A></H4>
 <P>
-<A NAME="IDX1279"></A>
+<A NAME="IDX1296"></A>
 
 </P>
 <P>
@@ -3424,9 +3442,9 @@ well write what you mean.
 </P>
 
 
-<H4><A NAME="SEC308" HREF="gettext_toc.html#TOC308">15.5.18.6  Valid Uses Of String Interpolation</A></H4>
+<H4><A NAME="SEC310" HREF="gettext_toc.html#TOC310">15.5.18.6  Valid Uses Of String Interpolation</A></H4>
 <P>
-<A NAME="IDX1280"></A>
+<A NAME="IDX1297"></A>
 
 </P>
 <P>
@@ -3512,9 +3530,9 @@ s/$gettext{"U. S. A."}/$gettext{"U. S. A."} $gettext{"(dial +0)"}/g;
 
 
 
-<H4><A NAME="SEC309" HREF="gettext_toc.html#TOC309">15.5.18.7  When To Use Parentheses</A></H4>
+<H4><A NAME="SEC311" HREF="gettext_toc.html#TOC311">15.5.18.7  When To Use Parentheses</A></H4>
 <P>
-<A NAME="IDX1281"></A>
+<A NAME="IDX1298"></A>
 
 </P>
 <P>
@@ -3558,9 +3576,9 @@ print dngettext 'package', ("one cake", "several cakes", $n), $discarded;
 
 
 
-<H4><A NAME="SEC310" HREF="gettext_toc.html#TOC310">15.5.18.8  How To Grok with Long Lines</A></H4>
+<H4><A NAME="SEC312" HREF="gettext_toc.html#TOC312">15.5.18.8  How To Grok with Long Lines</A></H4>
 <P>
-<A NAME="IDX1282"></A>
+<A NAME="IDX1299"></A>
 
 </P>
 <P>
@@ -3632,9 +3650,9 @@ the resulting POT file.
 </P>
 
 
-<H4><A NAME="SEC311" HREF="gettext_toc.html#TOC311">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A></H4>
+<H4><A NAME="SEC313" HREF="gettext_toc.html#TOC313">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A></H4>
 <P>
-<A NAME="IDX1283"></A>
+<A NAME="IDX1300"></A>
 
 </P>
 <P>
@@ -3784,9 +3802,9 @@ get executed.  Most of the time you will happily get along with
 </P>
 
 
-<H3><A NAME="SEC312" HREF="gettext_toc.html#TOC312">15.5.19  PHP Hypertext Preprocessor</A></H3>
+<H3><A NAME="SEC314" HREF="gettext_toc.html#TOC314">15.5.19  PHP Hypertext Preprocessor</A></H3>
 <P>
-<A NAME="IDX1284"></A>
+<A NAME="IDX1301"></A>
 
 </P>
 <DL COMPACT>
@@ -3855,9 +3873,9 @@ An example is available in the <TT>&lsquo;examples&rsquo;</TT> directory: <CODE>
 </P>
 
 
-<H3><A NAME="SEC313" HREF="gettext_toc.html#TOC313">15.5.20  Pike</A></H3>
+<H3><A NAME="SEC315" HREF="gettext_toc.html#TOC315">15.5.20  Pike</A></H3>
 <P>
-<A NAME="IDX1285"></A>
+<A NAME="IDX1302"></A>
 
 </P>
 <DL COMPACT>
@@ -3921,9 +3939,9 @@ On platforms without gettext, the functions are not available.
 
 
 
-<H3><A NAME="SEC314" HREF="gettext_toc.html#TOC314">15.5.21  GNU Compiler Collection sources</A></H3>
+<H3><A NAME="SEC316" HREF="gettext_toc.html#TOC316">15.5.21  GNU Compiler Collection sources</A></H3>
 <P>
-<A NAME="IDX1286"></A>
+<A NAME="IDX1303"></A>
 
 </P>
 <DL COMPACT>
@@ -3988,7 +4006,7 @@ yes
 
 
 
-<H3><A NAME="SEC315" HREF="gettext_toc.html#TOC315">15.5.22  Lua</A></H3>
+<H3><A NAME="SEC317" HREF="gettext_toc.html#TOC317">15.5.22  Lua</A></H3>
 
 <DL COMPACT>
 
@@ -4067,7 +4085,7 @@ On platforms without gettext, the functions are not available.
 
 
 
-<H3><A NAME="SEC316" HREF="gettext_toc.html#TOC316">15.5.23  JavaScript</A></H3>
+<H3><A NAME="SEC318" HREF="gettext_toc.html#TOC318">15.5.23  JavaScript</A></H3>
 
 <DL COMPACT>
 
@@ -4138,7 +4156,78 @@ On platforms without gettext, the functions are not available.
 
 
 
-<H2><A NAME="SEC317" HREF="gettext_toc.html#TOC317">15.6  Internationalizable Data</A></H2>
+<H3><A NAME="SEC319" HREF="gettext_toc.html#TOC319">15.5.24  Vala</A></H3>
+
+<DL COMPACT>
+
+<DT>RPMs
+<DD>
+vala
+
+<DT>File extension
+<DD>
+<CODE>vala</CODE>
+
+<DT>String syntax
+<DD>
+
+<UL>
+
+<LI><CODE>"abc"</CODE>
+
+<LI><CODE>"""abc"""</CODE>
+
+</UL>
+
+<DT>gettext shorthand
+<DD>
+<CODE>_("abc")</CODE>
+
+<DT>gettext/ngettext functions
+<DD>
+<CODE>gettext</CODE>, <CODE>dgettext</CODE>, <CODE>dcgettext</CODE>, <CODE>ngettext</CODE>,
+<CODE>dngettext</CODE>, <CODE>dpgettext</CODE>, <CODE>dpgettext2</CODE>
+
+<DT>textdomain
+<DD>
+<CODE>textdomain</CODE> function, defined under the <CODE>Intl</CODE> namespace
+
+<DT>bindtextdomain
+<DD>
+<CODE>bindtextdomain</CODE> function, defined under the <CODE>Intl</CODE> namespace
+
+<DT>setlocale
+<DD>
+Programmer must call <CODE>Intl.setlocale (LocaleCategory.ALL, "")</CODE>
+
+<DT>Prerequisite
+<DD>
+---
+
+<DT>Use or emulate GNU gettext
+<DD>
+Use
+
+<DT>Extractor
+<DD>
+<CODE>xgettext</CODE>
+
+<DT>Formatting with positions
+<DD>
+Same as for the C language.
+
+<DT>Portability
+<DD>
+autoconf (gettext.m4) and #if ENABLE_NLS
+
+<DT>po-mode marking
+<DD>
+yes
+</DL>
+
+
+
+<H2><A NAME="SEC320" HREF="gettext_toc.html#TOC320">15.6  Internationalizable Data</A></H2>
 
 <P>
 Here is a list of other data formats which can be internationalized
@@ -4148,7 +4237,7 @@ using GNU gettext.
 
 
 
-<H3><A NAME="SEC318" HREF="gettext_toc.html#TOC318">15.6.1  POT - Portable Object Template</A></H3>
+<H3><A NAME="SEC321" HREF="gettext_toc.html#TOC321">15.6.1  POT - Portable Object Template</A></H3>
 
 <DL COMPACT>
 
@@ -4167,9 +4256,9 @@ gettext
 
 
 
-<H3><A NAME="SEC319" HREF="gettext_toc.html#TOC319">15.6.2  Resource String Table</A></H3>
+<H3><A NAME="SEC322" HREF="gettext_toc.html#TOC322">15.6.2  Resource String Table</A></H3>
 <P>
-<A NAME="IDX1287"></A>
+<A NAME="IDX1304"></A>
 
 </P>
 <DL COMPACT>
@@ -4189,7 +4278,7 @@ fpk
 
 
 
-<H3><A NAME="SEC320" HREF="gettext_toc.html#TOC320">15.6.3  Glade - GNOME user interface description</A></H3>
+<H3><A NAME="SEC323" HREF="gettext_toc.html#TOC323">15.6.3  Glade - GNOME user interface description</A></H3>
 
 <DL COMPACT>
 
@@ -4208,7 +4297,7 @@ glade, libglade, glade2, libglade2, intltool
 
 
 
-<H3><A NAME="SEC321" HREF="gettext_toc.html#TOC321">15.6.4  GSettings - GNOME user configuration schema</A></H3>
+<H3><A NAME="SEC324" HREF="gettext_toc.html#TOC324">15.6.4  GSettings - GNOME user configuration schema</A></H3>
 
 <DL COMPACT>
 
@@ -4225,6 +4314,226 @@ glib2
 <CODE>xgettext</CODE>, <CODE>intltool-extract</CODE>
 </DL>
 
+
+
+<H3><A NAME="SEC325" HREF="gettext_toc.html#TOC325">15.6.5  AppData - freedesktop.org application description</A></H3>
+
+<DL COMPACT>
+
+<DT>RPMs
+<DD>
+appdata-tools, appstream, libappstream-glib, libappstream-glib-builder
+
+<DT>File extension
+<DD>
+<CODE>appdata.xml</CODE>
+
+<DT>Extractor
+<DD>
+<CODE>xgettext</CODE>, <CODE>intltool-extract</CODE>, <CODE>itstool</CODE>
+</DL>
+
+
+
+<H3><A NAME="SEC326" HREF="gettext_toc.html#TOC326">15.6.6  Preparing Rules for XML Internationalization</A></H3>
+<P>
+<A NAME="IDX1305"></A>
+
+</P>
+<P>
+Marking translatable strings in an XML file is done through a separate
+"rule" file, making use of the Internationalization Tag Set standard
+(ITS, <A HREF="http://www.w3.org/TR/its20/">http://www.w3.org/TR/its20/</A>).  The currently supported ITS
+data categories are: <SAMP>&lsquo;Translate&rsquo;</SAMP>, <SAMP>&lsquo;Localization Note&rsquo;</SAMP>,
+<SAMP>&lsquo;Elements Within Text&rsquo;</SAMP>, and <SAMP>&lsquo;Preserve Space&rsquo;</SAMP>.  In addition to
+them, <CODE>xgettext</CODE> also recognizes the following extended data
+categories:
+
+</P>
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;Context&rsquo;</SAMP>
+<DD>
+This data category associates <CODE>msgctxt</CODE> to the extracted text.  In
+the global rule, the <CODE>contextRule</CODE> element contains the following:
+
+
+<UL>
+<LI>
+
+A required <CODE>selector</CODE> attribute.  It contains an absolute selector
+that selects the nodes to which this rule applies.
+
+<LI>
+
+A required <CODE>contextPointer</CODE> attribute that contains a relative
+selector pointing to a node that holds the <CODE>msgctxt</CODE> value.
+
+<LI>
+
+An optional <CODE>textPointer</CODE> attribute that contains a relative
+selector pointing to a node that holds the <CODE>msgid</CODE> value.
+</UL>
+
+<DT><SAMP>&lsquo;Escape Special Characters&rsquo;</SAMP>
+<DD>
+This data category indicates whether the special XML characters
+(<CODE>&#60;</CODE>, <CODE>&#62;</CODE>, <CODE>&#38;</CODE>, <CODE>"</CODE>) are escaped with entity
+reference.  In the global rule, the <CODE>escapeRule</CODE> element contains
+the following:
+
+
+<UL>
+<LI>
+
+A required <CODE>selector</CODE> attribute.  It contains an absolute selector
+that selects the nodes to which this rule applies.
+
+<LI>
+
+A required <CODE>escape</CODE> attribute with the value <CODE>yes</CODE> or <CODE>no</CODE>.
+</UL>
+
+<DT><SAMP>&lsquo;Extended Preserve Space&rsquo;</SAMP>
+<DD>
+This data category extends the standard <SAMP>&lsquo;Preserve Space&rsquo;</SAMP> data
+category with the additional value <SAMP>&lsquo;trim&rsquo;</SAMP>.  The value means to
+remove the leading and trailing whitespaces of the content, but not to
+normalize whitespaces in the middle.  In the global rule, the
+<CODE>preserveSpaceRule</CODE> element contains the following:
+
+
+<UL>
+<LI>
+
+A required <CODE>selector</CODE> attribute.  It contains an absolute selector
+that selects the nodes to which this rule applies.
+
+<LI>
+
+A required <CODE>space</CODE> attribute with the value <CODE>default</CODE>,
+<CODE>preserve</CODE>, or <CODE>trim</CODE>.
+</UL>
+
+</DL>
+
+<P>
+All those extended data categories can only be expressed with global
+rules, and the rule elements have to have the
+<CODE>https://www.gnu.org/s/gettext/ns/its/extensions/1.0</CODE> namespace.
+
+</P>
+<P>
+Given the following XML document in a file <TT>&lsquo;messages.xml&rsquo;</TT>:
+
+</P>
+
+<PRE>
+&#60;?xml version="1.0"?&#62;
+&#60;messages&#62;
+  &#60;message&#62;
+    &#60;p&#62;A translatable string&#60;/p&#62;
+  &#60;/message&#62;
+  &#60;message&#62;
+    &#60;p translatable="no"&#62;A non-translatable string&#60;/p&#62;
+  &#60;/message&#62;
+&#60;/messages&#62;
+</PRE>
+
+<P>
+To extract the first text content ("A translatable string"), but not the
+second ("A non-translatable string"), the following ITS rules can be used:
+
+</P>
+
+<PRE>
+&#60;?xml version="1.0"?&#62;
+&#60;its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0"&#62;
+  &#60;its:translateRule selector="/messages" translate="no"/&#62;
+  &#60;its:translateRule selector="//message/p" translate="yes"/&#62;
+
+  &#60;!-- If 'p' has an attribute 'translatable' with the value 'no', then
+       the content is not translatable.  --&#62;
+  &#60;its:translateRule selector="//message/p[@translatable = 'no']"
+    translate="no"/&#62;
+&#60;/its:rules&#62;
+</PRE>
+
+<P>
+<SAMP>&lsquo;xgettext&rsquo;</SAMP> needs another file called "locating rule" to associate
+an ITS rule with an XML file.  If the above ITS file is saved as
+<TT>&lsquo;messages.its&rsquo;</TT>, the locating rule would look like:
+
+</P>
+
+<PRE>
+&#60;?xml version="1.0"?&#62;
+&#60;locatingRules&#62;
+  &#60;locatingRule name="Messages" pattern="*.xml"&#62;
+    &#60;documentRule localName="messages" target="messages.its"/&#62;
+  &#60;/locatingRule&#62;
+  &#60;locatingRule name="Messages" pattern="*.msg" target="messages.its"/&#62;
+&#60;/locatingRules&#62;
+</PRE>
+
+<P>
+The <CODE>locatingRule</CODE> element must have a <CODE>pattern</CODE> attribute,
+which denotes either a literal file name or a wildcard pattern of the
+XML file.  The <CODE>locatingRule</CODE> element can have child
+<CODE>documentRule</CODE> element, which adds checks on the content of the XML
+file.
+
+</P>
+<P>
+The first rule matches any file with the <TT>&lsquo;.xml&rsquo;</TT> file extension, but
+it only applies to XML files whose root element is <SAMP>&lsquo;&#60;messages&#62;&rsquo;</SAMP>.
+
+</P>
+<P>
+The second rule indicates that the same ITS rule file are also
+applicable to any file with the <TT>&lsquo;.msg&rsquo;</TT> file extension.  The
+optional <CODE>name</CODE> attribute of <CODE>locatingRule</CODE> allows to choose
+rules by name, typically with <CODE>xgettext</CODE>'s <CODE>-L</CODE> option.
+
+</P>
+<P>
+The associated ITS rule file is indicated by the <CODE>target</CODE> attribute
+of <CODE>locatingRule</CODE> or <CODE>documentRule</CODE>.  If it is specified in a
+<CODE>documentRule</CODE> element, the parent <CODE>locatingRule</CODE> shouldn't
+have the <CODE>target</CODE> attribute.
+
+</P>
+<P>
+Locating rule files must have the <TT>&lsquo;.loc&rsquo;</TT> file extension.  Both ITS
+rule files and locating rule files must be installed in the
+<TT>&lsquo;$prefix/share/gettext/its&rsquo;</TT> directory.  Once those files are
+properly installed, <CODE>xgettext</CODE> can extract translatable strings
+from the matching XML files.
+
+</P>
+
+
+<H4><A NAME="SEC327" HREF="gettext_toc.html#TOC327">15.6.6.1  Two Use-cases of Translated Strings in XML</A></H4>
+
+<P>
+For XML, there are two use-cases of translated strings.  One is the case
+where the translated strings are directly consumed by programs, and the
+other is the case where the translated strings are merged back to the
+original XML document.  In the former case, special characters in the
+extracted strings shouldn't be escaped, while they should in the latter
+case.  To control wheter to escape special characters, the <SAMP>&lsquo;Escape
+Special Characters&rsquo;</SAMP> data category can be used.
+
+</P>
+<P>
+To merge the translations, the <SAMP>&lsquo;msgfmt&rsquo;</SAMP> program can be used with
+the option <CODE>--xml</CODE>.  See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, for more details
+about how one calls the <SAMP>&lsquo;msgfmt&rsquo;</SAMP> program.  <SAMP>&lsquo;msgfmt&rsquo;</SAMP>'s
+<CODE>--xml</CODE> option doesn't perform character escaping, so translated
+strings can have arbitrary XML constructs, such as elements for markup.
+
+</P>
+
 <P><HR><P>
 Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_14.html">previous</A>, <A HREF="gettext_16.html">next</A>, <A HREF="gettext_25.html">last</A> section, <A HREF="gettext_toc.html">table of contents</A>.
 </BODY>
diff --git a/gettext-tools/doc/gettext_16.html b/gettext-tools/doc/gettext_16.html
index 773f725..4ab4d7f 100644
--- a/gettext-tools/doc/gettext_16.html
+++ b/gettext-tools/doc/gettext_16.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 16  Concluding Remarks</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_15.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC322" HREF="gettext_toc.html#TOC322">16  Concluding Remarks</A></H1>
+<H1><A NAME="SEC328" HREF="gettext_toc.html#TOC328">16  Concluding Remarks</A></H1>
 
 <P>
 We would like to conclude this GNU <CODE>gettext</CODE> manual by presenting
@@ -23,9 +23,9 @@ about Native Language Support matters.
 
 
 
-<H2><A NAME="SEC323" HREF="gettext_toc.html#TOC323">16.1  History of GNU <CODE>gettext</CODE></A></H2>
+<H2><A NAME="SEC329" HREF="gettext_toc.html#TOC329">16.1  History of GNU <CODE>gettext</CODE></A></H2>
 <P>
-<A NAME="IDX1288"></A>
+<A NAME="IDX1306"></A>
 
 </P>
 <P>
@@ -125,10 +125,10 @@ manipulating PO files.
 </P>
 
 
-<H2><A NAME="SEC324" HREF="gettext_toc.html#TOC324">16.2  Related Readings</A></H2>
+<H2><A NAME="SEC330" HREF="gettext_toc.html#TOC330">16.2  Related Readings</A></H2>
 <P>
-<A NAME="IDX1289"></A>
-<A NAME="IDX1290"></A>
+<A NAME="IDX1307"></A>
+<A NAME="IDX1308"></A>
 
 </P>
 <P>
diff --git a/gettext-tools/doc/gettext_17.html b/gettext-tools/doc/gettext_17.html
index f7ba56b..1399c1d 100644
--- a/gettext-tools/doc/gettext_17.html
+++ b/gettext-tools/doc/gettext_17.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - A  Language Codes</TITLE>
@@ -11,10 +11,10 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_16.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC325" HREF="gettext_toc.html#TOC325">A  Language Codes</A></H1>
+<H1><A NAME="SEC331" HREF="gettext_toc.html#TOC331">A  Language Codes</A></H1>
 <P>
-<A NAME="IDX1291"></A>
-<A NAME="IDX1292"></A>
+<A NAME="IDX1309"></A>
+<A NAME="IDX1310"></A>
 
 </P>
 <P>
@@ -27,7 +27,7 @@ come from this standard.
 
 
 
-<H2><A NAME="SEC326" HREF="gettext_toc.html#TOC326">A.1  Usual Language Codes</A></H2>
+<H2><A NAME="SEC332" HREF="gettext_toc.html#TOC332">A.1  Usual Language Codes</A></H2>
 
 <P>
 For the commonly used languages, the ISO 639-1 standard defines two-letter
@@ -595,7 +595,7 @@ Zulu.
 
 
 
-<H2><A NAME="SEC327" HREF="gettext_toc.html#TOC327">A.2  Rare Language Codes</A></H2>
+<H2><A NAME="SEC333" HREF="gettext_toc.html#TOC333">A.2  Rare Language Codes</A></H2>
 
 <P>
 For rarely used languages, the ISO 639-2 standard defines three-letter
diff --git a/gettext-tools/doc/gettext_18.html b/gettext-tools/doc/gettext_18.html
index d2a1b60..de0810d 100644
--- a/gettext-tools/doc/gettext_18.html
+++ b/gettext-tools/doc/gettext_18.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - B  Country Codes</TITLE>
@@ -11,10 +11,10 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_17.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC328" HREF="gettext_toc.html#TOC328">B  Country Codes</A></H1>
+<H1><A NAME="SEC334" HREF="gettext_toc.html#TOC334">B  Country Codes</A></H1>
 <P>
-<A NAME="IDX1293"></A>
-<A NAME="IDX1294"></A>
+<A NAME="IDX1311"></A>
+<A NAME="IDX1312"></A>
 
 </P>
 <P>
diff --git a/gettext-tools/doc/gettext_19.html b/gettext-tools/doc/gettext_19.html
index 5573e8e..b4394d5 100644
--- a/gettext-tools/doc/gettext_19.html
+++ b/gettext-tools/doc/gettext_19.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - C  Licenses</TITLE>
@@ -11,9 +11,9 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_18.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC329" HREF="gettext_toc.html#TOC329">C  Licenses</A></H1>
+<H1><A NAME="SEC335" HREF="gettext_toc.html#TOC335">C  Licenses</A></H1>
 <P>
-<A NAME="IDX1295"></A>
+<A NAME="IDX1313"></A>
 
 </P>
 <P>
@@ -27,13 +27,13 @@ particular file or directory.  Here is a summary:
 
 The <CODE>libintl</CODE> and <CODE>libasprintf</CODE> libraries are covered by the
 GNU Lesser General Public License (LGPL).  
-A copy of the license is included in section <A HREF="gettext_19.html#SEC331">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC337">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>.
 
 <LI>
 
 The executable programs of this package and the <CODE>libgettextpo</CODE> library
 are covered by the GNU General Public License (GPL).
-A copy of the license is included in section <A HREF="gettext_19.html#SEC330">C.1  GNU GENERAL PUBLIC LICENSE</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC336">C.1  GNU GENERAL PUBLIC LICENSE</A>.
 
 <LI>
 
@@ -47,21 +47,21 @@ GNU Free Documentation License (FDL), either version 1.2 of the
 License, or (at your option) any later version published by the
 Free Software Foundation (FSF); with no Invariant Sections, with no
 Front-Cover Text, and with no Back-Cover Texts.
-A copy of the license is included in section <A HREF="gettext_19.html#SEC332">C.3  GNU Free Documentation License</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC338">C.3  GNU Free Documentation License</A>.
 <BR>
 This manual is covered by the GNU GPL.  You can redistribute it and/or
 modify it under the terms of the GNU General Public License (GPL), either
 version 2 of the License, or (at your option) any later version published
 by the Free Software Foundation (FSF).
-A copy of the license is included in section <A HREF="gettext_19.html#SEC330">C.1  GNU GENERAL PUBLIC LICENSE</A>.
+A copy of the license is included in section <A HREF="gettext_19.html#SEC336">C.1  GNU GENERAL PUBLIC LICENSE</A>.
 </UL>
 
 
 
-<H2><A NAME="SEC330" HREF="gettext_toc.html#TOC330">C.1  GNU GENERAL PUBLIC LICENSE</A></H2>
+<H2><A NAME="SEC336" HREF="gettext_toc.html#TOC336">C.1  GNU GENERAL PUBLIC LICENSE</A></H2>
 <P>
-<A NAME="IDX1296"></A>
-<A NAME="IDX1297"></A>
+<A NAME="IDX1314"></A>
+<A NAME="IDX1315"></A>
 Version 2, June 1991
 
 </P>
@@ -492,10 +492,10 @@ library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
 
 
-<H2><A NAME="SEC331" HREF="gettext_toc.html#TOC331">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A></H2>
+<H2><A NAME="SEC337" HREF="gettext_toc.html#TOC337">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A></H2>
 <P>
-<A NAME="IDX1298"></A>
-<A NAME="IDX1299"></A>
+<A NAME="IDX1316"></A>
+<A NAME="IDX1317"></A>
 Version 2.1, February 1999
 
 </P>
@@ -1122,10 +1122,10 @@ Ty Coon, President of Vice
 That's all there is to it!
 
 
-<H2><A NAME="SEC332" HREF="gettext_toc.html#TOC332">C.3  GNU Free Documentation License</A></H2>
+<H2><A NAME="SEC338" HREF="gettext_toc.html#TOC338">C.3  GNU Free Documentation License</A></H2>
 <P>
-<A NAME="IDX1300"></A>
-<A NAME="IDX1301"></A>
+<A NAME="IDX1318"></A>
+<A NAME="IDX1319"></A>
 Version 1.2, November 2002
 
 </P>
diff --git a/gettext-tools/doc/gettext_2.html b/gettext-tools/doc/gettext_2.html
index 0a22daa..46e9a6b 100644
--- a/gettext-tools/doc/gettext_2.html
+++ b/gettext-tools/doc/gettext_2.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 2  The User's View</TITLE>
@@ -126,8 +126,8 @@ A locale name usually has the form <SAMP>&lsquo;<VAR>ll</VAR>_<VAR>CC</VAR>&rsqu
 <SAMP>&lsquo;<VAR>ll</VAR>&rsquo;</SAMP> is an ISO 639 two-letter language code, and
 <SAMP>&lsquo;<VAR>CC</VAR>&rsquo;</SAMP> is an ISO 3166 two-letter country code.  For example,
 for German in Germany, <VAR>ll</VAR> is <CODE>de</CODE>, and <VAR>CC</VAR> is <CODE>DE</CODE>.
-You find a list of the language codes in appendix section <A HREF="gettext_17.html#SEC325">A  Language Codes</A> and
-a list of the country codes in appendix section <A HREF="gettext_18.html#SEC328">B  Country Codes</A>.
+You find a list of the language codes in appendix section <A HREF="gettext_17.html#SEC331">A  Language Codes</A> and
+a list of the country codes in appendix section <A HREF="gettext_18.html#SEC334">B  Country Codes</A>.
 
 </P>
 <P>
diff --git a/gettext-tools/doc/gettext_20.html b/gettext-tools/doc/gettext_20.html
index b78e084..b6296d8 100644
--- a/gettext-tools/doc/gettext_20.html
+++ b/gettext-tools/doc/gettext_20.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Program Index</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_19.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC333" HREF="gettext_toc.html#TOC333">Program Index</A></H1>
+<H1><A NAME="SEC339" HREF="gettext_toc.html#TOC339">Program Index</A></H1>
 
 <P>
 Jump to:
@@ -35,49 +35,49 @@ Jump to:
 <P>
 <H2><A NAME="pindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX1185">autopoint</A>
+<LI><A HREF="gettext_13.html#IDX1202">autopoint</A>
 </DIR>
 <H2><A NAME="pindex_b">b</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX714">boldquot</A>
+<LI><A HREF="gettext_9.html#IDX721">boldquot</A>
 </DIR>
 <H2><A NAME="pindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1234">envsubst</A>
+<LI><A HREF="gettext_15.html#IDX1251">envsubst</A>
 </DIR>
 <H2><A NAME="pindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1206">gettext</A>, <A HREF="gettext_15.html#IDX1211">gettext</A>
-<LI><A HREF="gettext_13.html#IDX1147">gettextize</A>
+<LI><A HREF="gettext_15.html#IDX1223">gettext</A>, <A HREF="gettext_15.html#IDX1228">gettext</A>
+<LI><A HREF="gettext_13.html#IDX1164">gettextize</A>
 </DIR>
 <H2><A NAME="pindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX841">msgattrib</A>
-<LI><A HREF="gettext_9.html#IDX548">msgcat</A>
-<LI><A HREF="gettext_9.html#IDX823">msgcmp</A>
-<LI><A HREF="gettext_9.html#IDX781">msgcomm</A>
-<LI><A HREF="gettext_9.html#IDX596">msgconv</A>
-<LI><A HREF="gettext_9.html#IDX893">msgen</A>
-<LI><A HREF="gettext_9.html#IDX926">msgexec</A>
-<LI><A HREF="gettext_9.html#IDX685">msgfilter</A>
-<LI><A HREF="gettext_10.html#IDX967">msgfmt</A>
-<LI><A HREF="gettext_9.html#IDX630">msggrep</A>
-<LI><A HREF="gettext_6.html#IDX245">msginit</A>
-<LI><A HREF="gettext_7.html#IDX282">msgmerge</A>
-<LI><A HREF="gettext_10.html#IDX1039">msgunfmt</A>
-<LI><A HREF="gettext_9.html#IDX740">msguniq</A>
+<LI><A HREF="gettext_9.html#IDX848">msgattrib</A>
+<LI><A HREF="gettext_9.html#IDX554">msgcat</A>
+<LI><A HREF="gettext_9.html#IDX830">msgcmp</A>
+<LI><A HREF="gettext_9.html#IDX788">msgcomm</A>
+<LI><A HREF="gettext_9.html#IDX602">msgconv</A>
+<LI><A HREF="gettext_9.html#IDX900">msgen</A>
+<LI><A HREF="gettext_9.html#IDX933">msgexec</A>
+<LI><A HREF="gettext_9.html#IDX691">msgfilter</A>
+<LI><A HREF="gettext_10.html#IDX975">msgfmt</A>
+<LI><A HREF="gettext_9.html#IDX636">msggrep</A>
+<LI><A HREF="gettext_6.html#IDX251">msginit</A>
+<LI><A HREF="gettext_7.html#IDX288">msgmerge</A>
+<LI><A HREF="gettext_10.html#IDX1056">msgunfmt</A>
+<LI><A HREF="gettext_9.html#IDX747">msguniq</A>
 </DIR>
 <H2><A NAME="pindex_n">n</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1207">ngettext</A>, <A HREF="gettext_15.html#IDX1223">ngettext</A>
+<LI><A HREF="gettext_15.html#IDX1224">ngettext</A>, <A HREF="gettext_15.html#IDX1240">ngettext</A>
 </DIR>
 <H2><A NAME="pindex_q">q</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX713">quot</A>
+<LI><A HREF="gettext_9.html#IDX720">quot</A>
 </DIR>
 <H2><A NAME="pindex_r">r</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX711">recode-sr-latin</A>
+<LI><A HREF="gettext_9.html#IDX718">recode-sr-latin</A>
 </DIR>
 <H2><A NAME="pindex_x">x</A></H2>
 <DIR>
diff --git a/gettext-tools/doc/gettext_21.html b/gettext-tools/doc/gettext_21.html
index 82f4e42..016d343 100644
--- a/gettext-tools/doc/gettext_21.html
+++ b/gettext-tools/doc/gettext_21.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Option Index</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_20.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC334" HREF="gettext_toc.html#TOC334">Option Index</A></H1>
+<H1><A NAME="SEC340" HREF="gettext_toc.html#TOC340">Option Index</A></H1>
 
 <P>
 Jump to:
@@ -20,595 +20,603 @@ Jump to:
 <H2><A NAME="opindex_-">-</A></H2>
 <DIR>
 <LI><A HREF="gettext_5.html#IDX189">--add-comments, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX877">--add-location, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX579">--add-location, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX806">--add-location, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX614">--add-location, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX910">--add-location, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX724">--add-location, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX671">--add-location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX312">--add-location, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX765">--add-location, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX217">--add-location, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1029">--alignment, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX293">--backup, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX206">--boost, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX884">--add-location, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX585">--add-location, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX813">--add-location, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX620">--add-location, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX917">--add-location, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX731">--add-location, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX677">--add-location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX318">--add-location, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX772">--add-location, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX221">--add-location, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1046">--alignment, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX299">--backup, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX210">--boost, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX182">--c++, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1013">--check, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1021">--check-accelerators, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1019">--check-compatibility, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1017">--check-domain, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1014">--check-format, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1016">--check-header, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX857">--clear-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX859">--clear-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX861">--clear-previous, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX870">--color, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX572">--color, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX950">--color, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX799">--color, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX608">--color, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX904">--color, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX718">--color, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX666">--color, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX259">--color, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX306">--color, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1065">--color, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX758">--color, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX210">--color, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX648">--comment, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX287">--compendium, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX231">--copyright-holder, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX976">--csharp, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1045">--csharp, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX978">--csharp-resources, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1047">--csharp-resources, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX208">--debug, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1030">--check, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX190">--check, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1038">--check-accelerators, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1036">--check-compatibility, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1034">--check-domain, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1031">--check-format, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1033">--check-header, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX864">--clear-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX866">--clear-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX868">--clear-previous, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX877">--color, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX578">--color, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX958">--color, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX806">--color, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX614">--color, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX911">--color, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX725">--color, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX672">--color, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX265">--color, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX312">--color, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1082">--color, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX765">--color, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX214">--color, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX654">--comment, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX293">--compendium, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX237">--copyright-holder, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX984">--csharp, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1062">--csharp, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX986">--csharp-resources, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1064">--csharp-resources, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX212">--debug, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX172">--default-domain, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX984">--desktop, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX846">--directory, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX555">--directory, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX827">--directory, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX787">--directory, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX600">--directory, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX897">--directory, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX942">--directory, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX699">--directory, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX971">--directory, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX634">--directory, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX285">--directory, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX745">--directory, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX992">--desktop, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX853">--directory, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX561">--directory, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX834">--directory, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX794">--directory, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX606">--directory, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX904">--directory, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX950">--directory, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX705">--directory, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX979">--directory, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX640">--directory, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX291">--directory, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX752">--directory, <CODE>msguniq</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX170">--directory, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1215">--domain, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX640">--domain, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1227">--domain, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1190">--dry-run, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1156">--dry-run, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX862">--empty, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1030">--endianness, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1232">--domain, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX646">--domain, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1244">--domain, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1207">--dry-run, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1173">--dry-run, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX869">--empty, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1047">--endianness, <CODE>msgfmt</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX187">--exclude-file, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX705">--expression, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX652">--extended-regexp, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX191">--extract-all, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX650">--extracted-comment, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX707">--file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX658">--file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX553">--files-from, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX785">--files-from, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX712">--expression, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX658">--extended-regexp, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX195">--extract-all, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX656">--extracted-comment, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX714">--file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX664">--file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX559">--files-from, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX792">--files-from, <CODE>msgcomm</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX168">--files-from, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX654">--fixed-strings, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX196">--flag, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1188">--force, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1150">--force, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX872">--force-po, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX574">--force-po, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX801">--force-po, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX610">--force-po, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX906">--force-po, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX720">--force-po, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX668">--force-po, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX308">--force-po, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1067">--force-po, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX760">--force-po, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX212">--force-po, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX232">--foreign-user, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX660">--fixed-strings, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX200">--flag, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1205">--force, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1167">--force, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX879">--force-po, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX580">--force-po, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX808">--force-po, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX616">--force-po, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX913">--force-po, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX727">--force-po, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX674">--force-po, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX314">--force-po, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1084">--force-po, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX767">--force-po, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX216">--force-po, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX238">--foreign-user, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX183">--from-code, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX865">--fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1191">--help, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1242">--help, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1219">--help, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1157">--help, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX890">--help, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX593">--help, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX838">--help, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX820">--help, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX627">--help, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX923">--help, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX947">--help, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX737">--help, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1033">--help, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX682">--help, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX268">--help, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX326">--help, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1081">--help, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX778">--help, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1231">--help, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX241">--help, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX660">--ignore-case, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX864">--ignore-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX874">--indent, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX576">--indent, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX803">--indent, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX612">--indent, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX908">--indent, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX721">--indent, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX669">--indent, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX310">--indent, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1069">--indent, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX762">--indent, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX214">--indent, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX940">--input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX697">--input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX250">--input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1151">--intl, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX662">--invert-match, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX973">--java, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1043">--java, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX975">--java2, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX872">--fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1208">--help, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1259">--help, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1236">--help, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1174">--help, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX897">--help, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX599">--help, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX845">--help, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX827">--help, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX633">--help, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX930">--help, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX955">--help, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX744">--help, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1050">--help, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX688">--help, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX274">--help, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX332">--help, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1098">--help, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX785">--help, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1248">--help, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX247">--help, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX666">--ignore-case, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX871">--ignore-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX881">--indent, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX582">--indent, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX810">--indent, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX618">--indent, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX915">--indent, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX728">--indent, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX675">--indent, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX316">--indent, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1086">--indent, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX769">--indent, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX218">--indent, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX948">--input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX703">--input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX256">--input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1168">--intl, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX668">--invert-match, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX225">--its, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX226">--itstool, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX981">--java, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1060">--java, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX983">--java2, <CODE>msgfmt</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX185">--join-existing, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX204">--kde, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX722">--keep-header, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1005">--keyword, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX193">--keyword, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX571">--lang, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX903">--lang, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX305">--lang, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX208">--kde, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX729">--keep-header, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1015">--keyword, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX197">--keyword, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX577">--lang, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX910">--lang, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX311">--lang, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1021">--language, <CODE>msgfmt</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX179">--language, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX560">--less-than, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX791">--less-than, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX992">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX998">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1001">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1007">--locale, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX257">--locale, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1054">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1058">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1061">--locale, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX638">--location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX562">--more-than, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX793">--more-than, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX642">--msgctxt, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX644">--msgid, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX235">--msgid-bugs-address, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX646">--msgstr, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX237">--msgstr-prefix, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX239">--msgstr-suffix, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX829">--multi-domain, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX298">--multi-domain, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1153">--no-changelog, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX851">--no-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX831">--no-fuzzy-matching, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX300">--no-fuzzy-matching, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1031">--no-hash, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX875">--no-location, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX577">--no-location, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX804">--no-location, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX613">--no-location, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX909">--no-location, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX723">--no-location, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX670">--no-location, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX311">--no-location, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX763">--no-location, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX215">--no-location, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX853">--no-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX258">--no-translator, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX884">--no-wrap, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX586">--no-wrap, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX813">--no-wrap, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX621">--no-wrap, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX917">--no-wrap, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX731">--no-wrap, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX678">--no-wrap, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX266">--no-wrap, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX319">--no-wrap, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1076">--no-wrap, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX772">--no-wrap, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX223">--no-wrap, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX866">--obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX818">--omit-header, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX229">--omit-header, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX863">--only-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX852">--only-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX854">--only-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX566">--less-than, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX798">--less-than, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1002">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1008">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1011">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1017">--locale, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1024">--locale, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX263">--locale, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1071">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1075">--locale, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1078">--locale, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX644">--location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX568">--more-than, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX800">--more-than, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX648">--msgctxt, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX650">--msgid, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX241">--msgid-bugs-address, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX652">--msgstr, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX243">--msgstr-prefix, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX245">--msgstr-suffix, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX836">--multi-domain, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX304">--multi-domain, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX708">--newline, <CODE>msgfilter</CODE> option</A>, <A HREF="gettext_9.html#IDX937">--newline, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1170">--no-changelog, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX858">--no-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX838">--no-fuzzy-matching, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX306">--no-fuzzy-matching, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1048">--no-hash, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX882">--no-location, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX583">--no-location, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX811">--no-location, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX619">--no-location, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX916">--no-location, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX730">--no-location, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX676">--no-location, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX317">--no-location, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX770">--no-location, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX219">--no-location, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX860">--no-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX264">--no-translator, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX891">--no-wrap, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX592">--no-wrap, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX820">--no-wrap, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX627">--no-wrap, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX924">--no-wrap, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX738">--no-wrap, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX684">--no-wrap, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX272">--no-wrap, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX325">--no-wrap, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1093">--no-wrap, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX779">--no-wrap, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX229">--no-wrap, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX873">--obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX825">--omit-header, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX235">--omit-header, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX870">--only-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX859">--only-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX861">--only-obsolete, <CODE>msgattrib</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX174">--output, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX176">--output-dir, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX848">--output-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX557">--output-file, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX789">--output-file, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX602">--output-file, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX899">--output-file, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX701">--output-file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX987">--output-file, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX636">--output-file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX252">--output-file, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX291">--output-file, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1064">--output-file, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX747">--output-file, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX233">--package-name, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX234">--package-version, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1152">--po-dir, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX860">--previous, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX301">--previous, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX868">--properties-input, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX566">--properties-input, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX835">--properties-input, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX797">--properties-input, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX606">--properties-input, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX901">--properties-input, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX944">--properties-input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX716">--properties-input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1010">--properties-input, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX664">--properties-input, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX254">--properties-input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX303">--properties-input, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX753">--properties-input, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX880">--properties-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX582">--properties-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX809">--properties-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX617">--properties-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX913">--properties-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX727">--properties-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX674">--properties-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX262">--properties-output, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX315">--properties-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1072">--properties-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX768">--properties-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX219">--properties-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX982">--qt, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX202">--qt, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX709">--quiet, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX332">--quiet, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX656">--regexp=, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX749">--repeated, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX990">--resource, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX996">--resource, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1052">--resource, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1056">--resource, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX856">--set-fuzzy, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX858">--set-obsolete, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX710">--silent, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX333">--silent, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX888">--sort-by-file, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX591">--sort-by-file, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX817">--sort-by-file, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX625">--sort-by-file, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX921">--sort-by-file, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX735">--sort-by-file, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX680">--sort-by-file, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX324">--sort-by-file, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX776">--sort-by-file, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX228">--sort-by-file, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX886">--sort-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX588">--sort-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX815">--sort-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX623">--sort-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX919">--sort-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX733">--sort-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX679">--sort-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX321">--sort-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1078">--sort-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX774">--sort-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX225">--sort-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX994">--source, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1036">--statistics, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX878">--strict, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX580">--strict, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX807">--strict, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX615">--strict, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX911">--strict, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX725">--strict, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX988">--strict, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX672">--strict, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX313">--strict, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1070">--strict, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX766">--strict, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX218">--strict, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX869">--stringtable-input, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX567">--stringtable-input, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX836">--stringtable-input, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX798">--stringtable-input, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX902">--stringtable-input, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX945">--stringtable-input, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX717">--stringtable-input, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1011">--stringtable-input, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX665">--stringtable-input, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX255">--stringtable-input, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX304">--stringtable-input, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX607">--stringtable-input, <CODE>msgonv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX754">--stringtable-input, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX881">--stringtable-output, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX583">--stringtable-output, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX810">--stringtable-output, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX618">--stringtable-output, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX914">--stringtable-output, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX728">--stringtable-output, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX675">--stringtable-output, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX263">--stringtable-output, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX316">--stringtable-output, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1073">--stringtable-output, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX769">--stringtable-output, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX220">--stringtable-output, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX871">--style, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX573">--style, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX952">--style, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX800">--style, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX609">--style, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX905">--style, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX719">--style, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX667">--style, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX260">--style, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX307">--style, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1066">--style, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX759">--style, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX211">--style, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX295">--suffix, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1154">--symlink, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX980">--tcl, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1049">--tcl, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1003">--template, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX569">--to-code, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX604">--to-code, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX756">--to-code, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX849">--translated, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX200">--trigraphs, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX564">--unique, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX795">--unique, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX751">--unique, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX850">--untranslated, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX289">--update, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX570">--use-first, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX757">--use-first, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX832">--use-fuzzy, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1026">--use-fuzzy, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX833">--use-untranslated, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1240">--variables, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1038">--verbose, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX330">--verbose, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1085">--verbose, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1192">--version, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1244">--version, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1222">--version, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1158">--version, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX892">--version, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX595">--version, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX840">--version, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX822">--version, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX629">--version, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX925">--version, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX949">--version, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX739">--version, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1035">--version, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX684">--version, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX270">--version, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX328">--version, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1083">--version, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX780">--version, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1233">--version, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX243">--version, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX883">--width, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX585">--width, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX812">--width, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX620">--width, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX916">--width, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX730">--width, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX677">--width, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX265">--width, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX318">--width, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1075">--width, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX771">--width, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX222">--width, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX559">-&#60;, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX790">-&#60;, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX561">-&#62;, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX792">-&#62;, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1028">-a, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX190">-a, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1012">-c, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1018">-C, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX647">-C, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX286">-C, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX855">--output-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX563">--output-file, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX796">--output-file, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX608">--output-file, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX906">--output-file, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX707">--output-file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX997">--output-file, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX642">--output-file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX258">--output-file, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX297">--output-file, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1081">--output-file, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX754">--output-file, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX239">--package-name, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX240">--package-version, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1169">--po-dir, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX867">--previous, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX307">--previous, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX875">--properties-input, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX572">--properties-input, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX842">--properties-input, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX804">--properties-input, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX612">--properties-input, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX908">--properties-input, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX952">--properties-input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX723">--properties-input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1027">--properties-input, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX670">--properties-input, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX260">--properties-input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX309">--properties-input, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX760">--properties-input, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX887">--properties-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX588">--properties-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX816">--properties-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX623">--properties-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX920">--properties-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX734">--properties-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX680">--properties-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX268">--properties-output, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX321">--properties-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1089">--properties-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX775">--properties-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX223">--properties-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX990">--qt, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX206">--qt, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX716">--quiet, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX338">--quiet, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX662">--regexp=, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX756">--repeated, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1000">--resource, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1006">--resource, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1069">--resource, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1073">--resource, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX192">--sentence-end, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX863">--set-fuzzy, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX865">--set-obsolete, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX717">--silent, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX339">--silent, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX895">--sort-by-file, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX597">--sort-by-file, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX824">--sort-by-file, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX631">--sort-by-file, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX928">--sort-by-file, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX742">--sort-by-file, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX686">--sort-by-file, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX330">--sort-by-file, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX783">--sort-by-file, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX234">--sort-by-file, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX893">--sort-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX594">--sort-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX822">--sort-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX629">--sort-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX926">--sort-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX740">--sort-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX685">--sort-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX327">--sort-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1095">--sort-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX781">--sort-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX231">--sort-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1004">--source, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1053">--statistics, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX885">--strict, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX586">--strict, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX814">--strict, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX621">--strict, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX918">--strict, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX732">--strict, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX998">--strict, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX678">--strict, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX319">--strict, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1087">--strict, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX773">--strict, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX222">--strict, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX876">--stringtable-input, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX573">--stringtable-input, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX843">--stringtable-input, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX805">--stringtable-input, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX909">--stringtable-input, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX953">--stringtable-input, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX724">--stringtable-input, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1028">--stringtable-input, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX671">--stringtable-input, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX261">--stringtable-input, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX310">--stringtable-input, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX613">--stringtable-input, <CODE>msgonv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX761">--stringtable-input, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX888">--stringtable-output, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX589">--stringtable-output, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX817">--stringtable-output, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX624">--stringtable-output, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX921">--stringtable-output, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX735">--stringtable-output, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX681">--stringtable-output, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX269">--stringtable-output, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX322">--stringtable-output, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1090">--stringtable-output, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX776">--stringtable-output, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX224">--stringtable-output, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX878">--style, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX579">--style, <CODE>msgcat</CODE> option</A>, <A HREF="gettext_9.html#IDX960">--style, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX807">--style, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX615">--style, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX912">--style, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX726">--style, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX673">--style, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX266">--style, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX313">--style, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1083">--style, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX766">--style, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX215">--style, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX301">--suffix, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1171">--symlink, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX988">--tcl, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1066">--tcl, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1013">--template, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1019">--template, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX575">--to-code, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX610">--to-code, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX763">--to-code, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX856">--translated, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX204">--trigraphs, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX570">--unique, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX802">--unique, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX758">--unique, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX857">--untranslated, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX295">--update, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX576">--use-first, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX764">--use-first, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX839">--use-fuzzy, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1043">--use-fuzzy, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX840">--use-untranslated, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1257">--variables, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1055">--verbose, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX336">--verbose, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1102">--verbose, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1209">--version, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1261">--version, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1239">--version, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1175">--version, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX899">--version, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX601">--version, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX847">--version, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX829">--version, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX635">--version, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX932">--version, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX957">--version, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX746">--version, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1052">--version, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX690">--version, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX276">--version, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX334">--version, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1100">--version, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX787">--version, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1250">--version, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX249">--version, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX890">--width, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX591">--width, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX819">--width, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX626">--width, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX923">--width, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX737">--width, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX683">--width, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX271">--width, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX324">--width, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1092">--width, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX778">--width, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX228">--width, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX994">--xml, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX565">-&#60;, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX797">-&#60;, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX567">-&#62;, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX799">-&#62;, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1045">-a, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX194">-a, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1029">-c, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1035">-C, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX653">-C, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX292">-C, <CODE>msgmerge</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX188">-c, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX181">-C, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1189">-d, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1214">-d, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1155">-d, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX845">-D, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX554">-D, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX826">-D, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX786">-D, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX599">-D, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX896">-D, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX941">-D, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX698">-D, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX993">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX999">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1002">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1008">-d, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX970">-D, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX633">-D, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX284">-D, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1059">-d, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1062">-d, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX744">-D, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX748">-d, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1226">-d, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1206">-d, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1231">-d, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1172">-d, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX852">-D, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX560">-D, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX833">-D, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX793">-D, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX605">-D, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX903">-D, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX949">-D, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX704">-D, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX978">-D, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1003">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1009">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1012">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1018">-d, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1025">-d, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX639">-D, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX290">-D, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1076">-d, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1079">-d, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX751">-D, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX755">-d, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1243">-d, <CODE>ngettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX171">-d, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX169">-D, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1216">-e, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1217">-E, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX704">-e, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX655">-e, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX651">-E, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1229">-E, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1228">-e, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1187">-f, <CODE>autopoint</CODE> option</A>
-<LI><A HREF="gettext_13.html#IDX1149">-f, <CODE>gettextize</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX887">-F, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX590">-F, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX552">-f, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX784">-f, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX816">-F, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX624">-F, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX920">-F, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX734">-F, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX706">-f, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1025">-f, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX657">-f, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX653">-F, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX323">-F, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX775">-F, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1234">-E, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1233">-e, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX711">-e, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX661">-e, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX657">-E, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1246">-E, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1245">-e, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1204">-f, <CODE>autopoint</CODE> option</A>
+<LI><A HREF="gettext_13.html#IDX1166">-f, <CODE>gettextize</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX894">-F, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX558">-f, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX596">-F, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX791">-f, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX823">-F, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX630">-F, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX927">-F, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX713">-f, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX741">-F, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1042">-f, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX663">-f, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX659">-F, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX329">-F, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX782">-F, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX233">-F, <CODE>xgettext</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX167">-f, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX227">-F, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1241">-h, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1218">-h, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX889">-h, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX592">-h, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX837">-h, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX819">-h, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX626">-h, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX922">-h, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX946">-h, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX736">-h, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1032">-h, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX681">-h, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX267">-h, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX325">-h, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1080">-h, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX777">-h, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1230">-h, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX240">-h, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX873">-i, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX575">-i, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX802">-i, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX611">-i, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX907">-i, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX939">-i, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX696">-i, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX659">-i, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX249">-i, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX309">-i, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1068">-i, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX761">-i, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX213">-i, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX972">-j, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX641">-J, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1042">-j, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1258">-h, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1235">-h, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX896">-h, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX598">-h, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX844">-h, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX826">-h, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX632">-h, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX929">-h, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX954">-h, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX743">-h, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1049">-h, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX687">-h, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX273">-h, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX331">-h, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1097">-h, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX784">-h, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1247">-h, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX246">-h, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX880">-i, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX581">-i, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX809">-i, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX617">-i, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX914">-i, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX947">-i, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX702">-i, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX665">-i, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX255">-i, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX315">-i, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1085">-i, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX768">-i, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX217">-i, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX980">-j, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX647">-J, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1059">-j, <CODE>msgunfmt</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX184">-j, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1004">-k, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX643">-K, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX192">-k, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX991">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX997">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1000">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1006">-l, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX256">-l, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1053">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1057">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1060">-l, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1014">-k, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX649">-K, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX196">-k, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1001">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1007">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1010">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1016">-l, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1023">-l, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1020">-L, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX262">-l, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1070">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1074">-l, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1077">-l, <CODE>msgunfmt</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX178">-L, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX828">-m, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX639">-M, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX297">-m, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX238">-M, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX236">-m, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1220">-n, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX876">-n, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX578">-n, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX830">-N, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX805">-n, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX708">-n, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX637">-N, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX299">-N, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX764">-n, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX216">-n, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX847">-o, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX556">-o, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX788">-o, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX601">-o, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX898">-o, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX700">-o, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX986">-o, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX635">-o, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX251">-o, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX290">-o, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1063">-o, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX746">-o, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX835">-m, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX645">-M, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX303">-m, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX242">-m, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX244">-M, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1237">-n, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX883">-n, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX584">-n, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX837">-N, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX812">-n, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX715">-n, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX643">-N, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX305">-N, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX771">-n, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX220">-n, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX854">-o, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX562">-o, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX795">-o, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX607">-o, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX905">-o, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX706">-o, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX996">-o, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX641">-o, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX257">-o, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX296">-o, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1080">-o, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX753">-o, <CODE>msguniq</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX173">-o, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX867">-P, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX879">-p, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX581">-p, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX565">-P, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX834">-P, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX796">-P, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX808">-p, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX605">-P, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX616">-p, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX900">-P, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX912">-p, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX943">-P, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX715">-P, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX726">-p, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1009">-P, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX663">-P, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX673">-p, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX253">-P, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX261">-p, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX314">-p, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX302">-P, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1071">-p, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX767">-p, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX752">-P, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX886">-p, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX874">-P, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX587">-p, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX571">-P, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX841">-P, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX803">-P, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX815">-p, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX611">-P, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX622">-p, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX907">-P, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX919">-p, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX951">-P, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX733">-p, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX722">-P, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1026">-P, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX679">-p, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX669">-P, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX259">-P, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX267">-p, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX308">-P, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX320">-p, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1088">-p, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX774">-p, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX759">-P, <CODE>msguniq</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX175">-p, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX331">-q, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX989">-r, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX995">-r, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1051">-r, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1055">-r, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX885">-s, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX587">-s, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX814">-s, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX622">-s, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX918">-s, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX732">-s, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX320">-s, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1077">-s, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX773">-s, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX224">-s, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX568">-t, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX603">-t, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX645">-T, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX755">-t, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX199">-T, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX563">-u, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX794">-u, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX288">-U, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX750">-u, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1239">-v, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1243">-V, <CODE>envsubst</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1221">-V, <CODE>gettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX891">-V, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX594">-V, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX839">-V, <CODE>msgcmp</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX821">-V, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX628">-V, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX924">-V, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX948">-V, <CODE>msgexec</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX738">-V, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1034">-V, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1037">-v, <CODE>msgfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX661">-v, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX683">-V, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX269">-V, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX329">-v, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX327">-V, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1084">-v, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1082">-V, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX779">-V, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_15.html#IDX1232">-V, <CODE>ngettext</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX242">-V, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX882">-w, <CODE>msgattrib</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX584">-w, <CODE>msgcat</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX811">-w, <CODE>msgcomm</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX619">-w, <CODE>msgconv</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX915">-w, <CODE>msgen</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX729">-w, <CODE>msgfilter</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX676">-w, <CODE>msggrep</CODE> option</A>
-<LI><A HREF="gettext_6.html#IDX264">-w, <CODE>msginit</CODE> option</A>
-<LI><A HREF="gettext_7.html#IDX317">-w, <CODE>msgmerge</CODE> option</A>
-<LI><A HREF="gettext_10.html#IDX1074">-w, <CODE>msgunfmt</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX770">-w, <CODE>msguniq</CODE> option</A>
-<LI><A HREF="gettext_5.html#IDX221">-w, <CODE>xgettext</CODE> option</A>
-<LI><A HREF="gettext_9.html#IDX649">-X, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX337">-q, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX999">-r, <CODE>msgfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1005">-r, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1068">-r, <CODE>msgunfmt</CODE> option</A>, <A HREF="gettext_10.html#IDX1072">-r, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX892">-s, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX593">-s, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX821">-s, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX628">-s, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX925">-s, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX739">-s, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX326">-s, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1094">-s, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX780">-s, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX230">-s, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX574">-t, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX609">-t, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX651">-T, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX762">-t, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX203">-T, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX569">-u, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX801">-u, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX294">-U, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX757">-u, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1256">-v, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1260">-V, <CODE>envsubst</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1238">-V, <CODE>gettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX898">-V, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX600">-V, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX846">-V, <CODE>msgcmp</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX828">-V, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX634">-V, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX931">-V, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX956">-V, <CODE>msgexec</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX745">-V, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1054">-v, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1051">-V, <CODE>msgfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX689">-V, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX667">-v, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX275">-V, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX333">-V, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX335">-v, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1099">-V, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1101">-v, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX786">-V, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_15.html#IDX1249">-V, <CODE>ngettext</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX248">-V, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX889">-w, <CODE>msgattrib</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX590">-w, <CODE>msgcat</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX818">-w, <CODE>msgcomm</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX625">-w, <CODE>msgconv</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX922">-w, <CODE>msgen</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX736">-w, <CODE>msgfilter</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX682">-w, <CODE>msggrep</CODE> option</A>
+<LI><A HREF="gettext_6.html#IDX270">-w, <CODE>msginit</CODE> option</A>
+<LI><A HREF="gettext_7.html#IDX323">-w, <CODE>msgmerge</CODE> option</A>
+<LI><A HREF="gettext_10.html#IDX1091">-w, <CODE>msgunfmt</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX777">-w, <CODE>msguniq</CODE> option</A>
+<LI><A HREF="gettext_5.html#IDX227">-w, <CODE>xgettext</CODE> option</A>
+<LI><A HREF="gettext_9.html#IDX655">-X, <CODE>msggrep</CODE> option</A>
 <LI><A HREF="gettext_5.html#IDX186">-x, <CODE>xgettext</CODE> option</A>
 </DIR>
 
diff --git a/gettext-tools/doc/gettext_22.html b/gettext-tools/doc/gettext_22.html
index 8572eca..be79d64 100644
--- a/gettext-tools/doc/gettext_22.html
+++ b/gettext-tools/doc/gettext_22.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Variable Index</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_21.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC335" HREF="gettext_toc.html#TOC335">Variable Index</A></H1>
+<H1><A NAME="SEC341" HREF="gettext_toc.html#TOC341">Variable Index</A></H1>
 
 <P>
 Jump to:
@@ -27,49 +27,49 @@ Jump to:
 <P>
 <H2><A NAME="vindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_12.html#IDX1142">GETTEXT_LOG_UNTRANSLATED, environment variable</A>
+<LI><A HREF="gettext_12.html#IDX1159">GETTEXT_LOG_UNTRANSLATED, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_l">l</A></H2>
 <DIR>
-<LI><A HREF="gettext_2.html#IDX51">LANG, environment variable</A>, <A HREF="gettext_11.html#IDX1139">LANG, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX43">LANGUAGE, environment variable</A>, <A HREF="gettext_11.html#IDX1131">LANGUAGE, environment variable</A>, <A HREF="gettext_13.html#IDX1165">LANGUAGE, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX44">LC_ALL, environment variable</A>, <A HREF="gettext_11.html#IDX1132">LC_ALL, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX48">LC_COLLATE, environment variable</A>, <A HREF="gettext_11.html#IDX1136">LC_COLLATE, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX45">LC_CTYPE, environment variable</A>, <A HREF="gettext_11.html#IDX1133">LC_CTYPE, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX50">LC_MESSAGES, environment variable</A>, <A HREF="gettext_11.html#IDX1138">LC_MESSAGES, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX49">LC_MONETARY, environment variable</A>, <A HREF="gettext_11.html#IDX1137">LC_MONETARY, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX46">LC_NUMERIC, environment variable</A>, <A HREF="gettext_11.html#IDX1134">LC_NUMERIC, environment variable</A>
-<LI><A HREF="gettext_2.html#IDX47">LC_TIME, environment variable</A>, <A HREF="gettext_11.html#IDX1135">LC_TIME, environment variable</A>
-<LI><A HREF="gettext_14.html#IDX1199">LINGUAS, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX51">LANG, environment variable</A>, <A HREF="gettext_11.html#IDX1156">LANG, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX43">LANGUAGE, environment variable</A>, <A HREF="gettext_11.html#IDX1148">LANGUAGE, environment variable</A>, <A HREF="gettext_13.html#IDX1182">LANGUAGE, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX44">LC_ALL, environment variable</A>, <A HREF="gettext_11.html#IDX1149">LC_ALL, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX48">LC_COLLATE, environment variable</A>, <A HREF="gettext_11.html#IDX1153">LC_COLLATE, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX45">LC_CTYPE, environment variable</A>, <A HREF="gettext_11.html#IDX1150">LC_CTYPE, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX50">LC_MESSAGES, environment variable</A>, <A HREF="gettext_11.html#IDX1155">LC_MESSAGES, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX49">LC_MONETARY, environment variable</A>, <A HREF="gettext_11.html#IDX1154">LC_MONETARY, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX46">LC_NUMERIC, environment variable</A>, <A HREF="gettext_11.html#IDX1151">LC_NUMERIC, environment variable</A>
+<LI><A HREF="gettext_2.html#IDX47">LC_TIME, environment variable</A>, <A HREF="gettext_11.html#IDX1152">LC_TIME, environment variable</A>
+<LI><A HREF="gettext_14.html#IDX1216">LINGUAS, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX933">MSGEXEC_LOCATION, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX930">MSGEXEC_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX931">MSGEXEC_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX932">MSGEXEC_MSGID_PLURAL, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX934">MSGEXEC_PLURAL_FORM, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX935">MSGEXEC_PREV_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX936">MSGEXEC_PREV_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX937">MSGEXEC_PREV_MSGID_PLURAL, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX691">MSGFILTER_LOCATION, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX688">MSGFILTER_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX689">MSGFILTER_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX690">MSGFILTER_MSGID_PLURAL, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX692">MSGFILTER_PLURAL_FORM, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX693">MSGFILTER_PREV_MSGCTXT, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX694">MSGFILTER_PREV_MSGID, environment variable</A>
-<LI><A HREF="gettext_9.html#IDX695">MSGFILTER_PREV_MSGID_PLURAL, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX941">MSGEXEC_LOCATION, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX938">MSGEXEC_MSGCTXT, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX939">MSGEXEC_MSGID, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX940">MSGEXEC_MSGID_PLURAL, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX942">MSGEXEC_PLURAL_FORM, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX943">MSGEXEC_PREV_MSGCTXT, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX944">MSGEXEC_PREV_MSGID, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX945">MSGEXEC_PREV_MSGID_PLURAL, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX697">MSGFILTER_LOCATION, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX694">MSGFILTER_MSGCTXT, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX695">MSGFILTER_MSGID, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX696">MSGFILTER_MSGID_PLURAL, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX698">MSGFILTER_PLURAL_FORM, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX699">MSGFILTER_PREV_MSGCTXT, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX700">MSGFILTER_PREV_MSGID, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX701">MSGFILTER_PREV_MSGID_PLURAL, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX953">PO_STYLE, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX961">PO_STYLE, environment variable</A>
 </DIR>
 <H2><A NAME="vindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX951">TERM, environment variable</A>
-<LI><A HREF="gettext_15.html#IDX1208">TEXTDOMAIN, environment variable</A>
-<LI><A HREF="gettext_15.html#IDX1209">TEXTDOMAINDIR, environment variable</A>
+<LI><A HREF="gettext_9.html#IDX959">TERM, environment variable</A>
+<LI><A HREF="gettext_15.html#IDX1225">TEXTDOMAIN, environment variable</A>
+<LI><A HREF="gettext_15.html#IDX1226">TEXTDOMAINDIR, environment variable</A>
 </DIR>
 
 </P>
diff --git a/gettext-tools/doc/gettext_23.html b/gettext-tools/doc/gettext_23.html
index 3278ea6..9918482 100644
--- a/gettext-tools/doc/gettext_23.html
+++ b/gettext-tools/doc/gettext_23.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - PO Mode Index</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_22.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC336" HREF="gettext_toc.html#TOC336">PO Mode Index</A></H1>
+<H1><A NAME="SEC342" HREF="gettext_toc.html#TOC342">PO Mode Index</A></H1>
 
 <P>
 Jump to:
@@ -41,70 +41,70 @@ Jump to:
 <P>
 <H2><A NAME="emindex_&">&#38;</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX340"><TT>&lsquo;.emacs&rsquo;</TT> customizations</A>
+<LI><A HREF="gettext_8.html#IDX346"><TT>&lsquo;.emacs&rsquo;</TT> customizations</A>
 <LI><A HREF="gettext_4.html#IDX153"><TT>&lsquo;TAGS&rsquo;</TT>, and marking translatable strings</A>
 </DIR>
 <H2><A NAME="emindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX517">auxiliary PO file</A>
+<LI><A HREF="gettext_8.html#IDX523">auxiliary PO file</A>
 </DIR>
 <H2><A NAME="emindex_c">c</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX343">commands</A>
-<LI><A HREF="gettext_8.html#IDX447">comment out PO file entry</A>
-<LI><A HREF="gettext_8.html#IDX499">consulting program sources</A>
-<LI><A HREF="gettext_8.html#IDX515">consulting translations to other languages</A>
-<LI><A HREF="gettext_8.html#IDX368">current entry of a PO file</A>
-<LI><A HREF="gettext_8.html#IDX463">cut and paste for translated strings</A>
+<LI><A HREF="gettext_8.html#IDX349">commands</A>
+<LI><A HREF="gettext_8.html#IDX453">comment out PO file entry</A>
+<LI><A HREF="gettext_8.html#IDX505">consulting program sources</A>
+<LI><A HREF="gettext_8.html#IDX521">consulting translations to other languages</A>
+<LI><A HREF="gettext_8.html#IDX374">current entry of a PO file</A>
+<LI><A HREF="gettext_8.html#IDX469">cut and paste for translated strings</A>
 </DIR>
 <H2><A NAME="emindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX472">editing comments</A>
-<LI><A HREF="gettext_8.html#IDX497">editing multiple entries</A>
-<LI><A HREF="gettext_8.html#IDX449">editing translations</A>
+<LI><A HREF="gettext_8.html#IDX478">editing comments</A>
+<LI><A HREF="gettext_8.html#IDX503">editing multiple entries</A>
+<LI><A HREF="gettext_8.html#IDX455">editing translations</A>
 <LI><A HREF="gettext_4.html#IDX152"><CODE>etags</CODE>, using for marking strings</A>
-<LI><A HREF="gettext_8.html#IDX490">exiting PO subedit</A>
+<LI><A HREF="gettext_8.html#IDX496">exiting PO subedit</A>
 </DIR>
 <H2><A NAME="emindex_f">f</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX502">find source fragment for a PO file entry</A>
+<LI><A HREF="gettext_8.html#IDX508">find source fragment for a PO file entry</A>
 </DIR>
 <H2><A NAME="emindex_i">i</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX341">installing PO mode</A>
+<LI><A HREF="gettext_8.html#IDX347">installing PO mode</A>
 </DIR>
 <H2><A NAME="emindex_l">l</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX500">looking at the source to aid translation</A>
+<LI><A HREF="gettext_8.html#IDX506">looking at the source to aid translation</A>
 </DIR>
 <H2><A NAME="emindex_m">m</A></H2>
 <DIR>
 <LI><A HREF="gettext_4.html#IDX151">marking strings for translation</A>
-<LI><A HREF="gettext_8.html#IDX411">moving by fuzzy entries</A>
-<LI><A HREF="gettext_8.html#IDX436">moving by obsolete entries</A>
-<LI><A HREF="gettext_8.html#IDX400">moving by translated entries</A>
-<LI><A HREF="gettext_8.html#IDX425">moving by untranslated entries</A>
-<LI><A HREF="gettext_8.html#IDX369">moving through a PO file</A>
+<LI><A HREF="gettext_8.html#IDX417">moving by fuzzy entries</A>
+<LI><A HREF="gettext_8.html#IDX442">moving by obsolete entries</A>
+<LI><A HREF="gettext_8.html#IDX406">moving by translated entries</A>
+<LI><A HREF="gettext_8.html#IDX431">moving by untranslated entries</A>
+<LI><A HREF="gettext_8.html#IDX375">moving through a PO file</A>
 </DIR>
 <H2><A NAME="emindex_o">o</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX446">obsolete active entry</A>
+<LI><A HREF="gettext_8.html#IDX452">obsolete active entry</A>
 </DIR>
 <H2><A NAME="emindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX498">pending subedits</A>
+<LI><A HREF="gettext_8.html#IDX504">pending subedits</A>
 </DIR>
 <H2><A NAME="emindex_s">s</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX462">starting a string translation</A>
-<LI><A HREF="gettext_8.html#IDX395">string normalization in entries</A>
-<LI><A HREF="gettext_8.html#IDX486">subedit minor mode</A>
+<LI><A HREF="gettext_8.html#IDX468">starting a string translation</A>
+<LI><A HREF="gettext_8.html#IDX401">string normalization in entries</A>
+<LI><A HREF="gettext_8.html#IDX492">subedit minor mode</A>
 </DIR>
 <H2><A NAME="emindex_u">u</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX501">use the source, Luke</A>
-<LI><A HREF="gettext_8.html#IDX470">using obsolete translations to make new entries</A>
-<LI><A HREF="gettext_8.html#IDX531">using translation compendia</A>
+<LI><A HREF="gettext_8.html#IDX507">use the source, Luke</A>
+<LI><A HREF="gettext_8.html#IDX476">using obsolete translations to make new entries</A>
+<LI><A HREF="gettext_8.html#IDX537">using translation compendia</A>
 </DIR>
 
 </P>
diff --git a/gettext-tools/doc/gettext_24.html b/gettext-tools/doc/gettext_24.html
index 2a3c851..d253509 100644
--- a/gettext-tools/doc/gettext_24.html
+++ b/gettext-tools/doc/gettext_24.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Autoconf Macro Index</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_23.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC337" HREF="gettext_toc.html#TOC337">Autoconf Macro Index</A></H1>
+<H1><A NAME="SEC343" HREF="gettext_toc.html#TOC343">Autoconf Macro Index</A></H1>
 
 <P>
 Jump to:
@@ -19,13 +19,13 @@ Jump to:
 <P>
 <H2><A NAME="amindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX1176">AM_GNU_GETTEXT</A>
-<LI><A HREF="gettext_13.html#IDX1180">AM_GNU_GETTEXT_INTL_SUBDIR</A>
-<LI><A HREF="gettext_13.html#IDX1179">AM_GNU_GETTEXT_NEED</A>
-<LI><A HREF="gettext_13.html#IDX1178">AM_GNU_GETTEXT_VERSION</A>
-<LI><A HREF="gettext_13.html#IDX1183">AM_ICONV</A>
-<LI><A HREF="gettext_13.html#IDX1181">AM_PO_SUBDIRS</A>
-<LI><A HREF="gettext_13.html#IDX1182">AM_XGETTEXT_OPTION</A>
+<LI><A HREF="gettext_13.html#IDX1193">AM_GNU_GETTEXT</A>
+<LI><A HREF="gettext_13.html#IDX1197">AM_GNU_GETTEXT_INTL_SUBDIR</A>
+<LI><A HREF="gettext_13.html#IDX1196">AM_GNU_GETTEXT_NEED</A>
+<LI><A HREF="gettext_13.html#IDX1195">AM_GNU_GETTEXT_VERSION</A>
+<LI><A HREF="gettext_13.html#IDX1200">AM_ICONV</A>
+<LI><A HREF="gettext_13.html#IDX1198">AM_PO_SUBDIRS</A>
+<LI><A HREF="gettext_13.html#IDX1199">AM_XGETTEXT_OPTION</A>
 </DIR>
 
 </P>
diff --git a/gettext-tools/doc/gettext_25.html b/gettext-tools/doc/gettext_25.html
index d5a6df6..a337d39 100644
--- a/gettext-tools/doc/gettext_25.html
+++ b/gettext-tools/doc/gettext_25.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - General Index</TITLE>
@@ -11,7 +11,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_24.html">previous
 <P><HR><P>
 
 
-<H1><A NAME="SEC338" HREF="gettext_toc.html#TOC338">General Index</A></H1>
+<H1><A NAME="SEC344" HREF="gettext_toc.html#TOC344">General Index</A></H1>
 
 <P>
 Jump to:
@@ -72,229 +72,229 @@ Jump to:
 <H2><A NAME="cindex_&">&#38;</A></H2>
 <DIR>
 <LI><A HREF="gettext_2.html#IDX54"><TT>&lsquo;ABOUT-NLS&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1169"><TT>&lsquo;acconfig.h&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1168"><TT>&lsquo;aclocal.m4&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1170"><TT>&lsquo;config.h.in&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1171"><TT>&lsquo;gettext.h&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1161"><TT>&lsquo;LINGUAS&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1163"><TT>&lsquo;Makefile.in.in&rsquo;</TT> extensions</A>
-<LI><A HREF="gettext_13.html#IDX1162"><TT>&lsquo;Makevars&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1167"><TT>&lsquo;mkinstalldirs&rsquo;</TT> file</A>
-<LI><A HREF="gettext_13.html#IDX1160"><TT>&lsquo;POTFILES.in&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1186"><TT>&lsquo;acconfig.h&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1185"><TT>&lsquo;aclocal.m4&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1187"><TT>&lsquo;config.h.in&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1188"><TT>&lsquo;gettext.h&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1178"><TT>&lsquo;LINGUAS&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1180"><TT>&lsquo;Makefile.in.in&rsquo;</TT> extensions</A>
+<LI><A HREF="gettext_13.html#IDX1179"><TT>&lsquo;Makevars&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1184"><TT>&lsquo;mkinstalldirs&rsquo;</TT> file</A>
+<LI><A HREF="gettext_13.html#IDX1177"><TT>&lsquo;POTFILES.in&rsquo;</TT> file</A>
 </DIR>
 <H2><A NAME="cindex__">_</A></H2>
 <DIR>
 <LI><A HREF="gettext_4.html#IDX150"><CODE>_</CODE>, a macro to mark strings for translation</A>
-<LI><A HREF="gettext_11.html#IDX1140"><CODE>_nl_msg_cat_cntr</CODE></A>
+<LI><A HREF="gettext_11.html#IDX1157"><CODE>_nl_msg_cat_cntr</CODE></A>
 </DIR>
 <H2><A NAME="cindex_a">a</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX536">accumulating translations</A>
-<LI><A HREF="gettext_5.html#IDX194">adding keywords, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_8.html#IDX542">accumulating translations</A>
+<LI><A HREF="gettext_5.html#IDX198">adding keywords, <CODE>xgettext</CODE></A>
 <LI><A HREF="gettext_4.html#IDX138">ambiguities</A>
-<LI><A HREF="gettext_9.html#IDX687">apply a filter to translations</A>
-<LI><A HREF="gettext_9.html#IDX928">apply command to all translations in a catalog</A>
-<LI><A HREF="gettext_15.html#IDX1203">Arabic digits</A>
-<LI><A HREF="gettext_9.html#IDX844">attribute manipulation</A>
-<LI><A HREF="gettext_8.html#IDX410">attribute, fuzzy</A>
-<LI><A HREF="gettext_8.html#IDX409">attributes of a PO file entry</A>
-<LI><A HREF="gettext_9.html#IDX547">attributes, manipulating</A>
-<LI><A HREF="gettext_13.html#IDX1175">autoconf macros for <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_13.html#IDX1186"><CODE>autopoint</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX516">auxiliary PO file</A>
+<LI><A HREF="gettext_9.html#IDX693">apply a filter to translations</A>
+<LI><A HREF="gettext_9.html#IDX935">apply command to all translations in a catalog</A>
+<LI><A HREF="gettext_15.html#IDX1220">Arabic digits</A>
+<LI><A HREF="gettext_9.html#IDX851">attribute manipulation</A>
+<LI><A HREF="gettext_8.html#IDX416">attribute, fuzzy</A>
+<LI><A HREF="gettext_8.html#IDX415">attributes of a PO file entry</A>
+<LI><A HREF="gettext_9.html#IDX553">attributes, manipulating</A>
+<LI><A HREF="gettext_13.html#IDX1192">autoconf macros for <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1203"><CODE>autopoint</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX522">auxiliary PO file</A>
 <LI><A HREF="gettext_2.html#IDX53">available translations</A>
-<LI><A HREF="gettext_15.html#IDX1264">awk</A>
+<LI><A HREF="gettext_15.html#IDX1281">awk</A>
 </DIR>
 <H2><A NAME="cindex_b">b</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX294">backup old file, and <CODE>msgmerge</CODE> program</A>
-<LI><A HREF="gettext_15.html#IDX1249">bash</A>
-<LI><A HREF="gettext_16.html#IDX1290">bibliography</A>
+<LI><A HREF="gettext_7.html#IDX300">backup old file, and <CODE>msgmerge</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1266">bash</A>
+<LI><A HREF="gettext_16.html#IDX1308">bibliography</A>
 <LI><A HREF="gettext_1.html#IDX31">big picture</A>
-<LI><A HREF="gettext_11.html#IDX1106">bind_textdomain_codeset</A>
-<LI><A HREF="gettext_5.html#IDX207">Boost format strings</A>
+<LI><A HREF="gettext_11.html#IDX1123">bind_textdomain_codeset</A>
+<LI><A HREF="gettext_5.html#IDX211">Boost format strings</A>
 <LI><A HREF="gettext_1.html#IDX4">bug report address</A>
 </DIR>
 <H2><A NAME="cindex_c">c</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1204">C and C-like languages</A>
-<LI><A HREF="gettext_5.html#IDX201">C trigraphs</A>
-<LI><A HREF="gettext_15.html#IDX1262">C#</A>
-<LI><A HREF="gettext_10.html#IDX977">C# mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1046">C# mode, and <CODE>msgunfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX979">C# resources mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1048">C# resources mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1221">C and C-like languages</A>
+<LI><A HREF="gettext_5.html#IDX205">C trigraphs</A>
+<LI><A HREF="gettext_15.html#IDX1279">C#</A>
+<LI><A HREF="gettext_10.html#IDX985">C# mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1063">C# mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX987">C# resources mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1065">C# resources mode, and <CODE>msgunfmt</CODE> program</A>
 <LI><A HREF="gettext_4.html#IDX146">C#, string concatenation</A>
-<LI><A HREF="gettext_9.html#IDX938">catalog encoding and <CODE>msgexec</CODE> output</A>
-<LI><A HREF="gettext_11.html#IDX1096"><CODE>catclose</CODE>, a <CODE>catgets</CODE> function</A>
-<LI><A HREF="gettext_11.html#IDX1092"><CODE>catgets</CODE>, X/Open specification</A>
-<LI><A HREF="gettext_11.html#IDX1095"><CODE>catgets</CODE>, a <CODE>catgets</CODE> function</A>
-<LI><A HREF="gettext_11.html#IDX1094"><CODE>catopen</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_9.html#IDX946">catalog encoding and <CODE>msgexec</CODE> output</A>
+<LI><A HREF="gettext_11.html#IDX1113"><CODE>catclose</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_11.html#IDX1109"><CODE>catgets</CODE>, X/Open specification</A>
+<LI><A HREF="gettext_11.html#IDX1112"><CODE>catgets</CODE>, a <CODE>catgets</CODE> function</A>
+<LI><A HREF="gettext_11.html#IDX1111"><CODE>catopen</CODE>, a <CODE>catgets</CODE> function</A>
 <LI><A HREF="gettext_1.html#IDX17">character encoding</A>
-<LI><A HREF="gettext_11.html#IDX1104">charset conversion at runtime</A>
-<LI><A HREF="gettext_6.html#IDX274">charset of PO files</A>
-<LI><A HREF="gettext_10.html#IDX1015">check format strings</A>
-<LI><A HREF="gettext_9.html#IDX545">checking of translations</A>
-<LI><A HREF="gettext_15.html#IDX1253">clisp</A>
-<LI><A HREF="gettext_15.html#IDX1254">clisp C sources</A>
+<LI><A HREF="gettext_11.html#IDX1121">charset conversion at runtime</A>
+<LI><A HREF="gettext_6.html#IDX280">charset of PO files</A>
+<LI><A HREF="gettext_10.html#IDX1032">check format strings</A>
+<LI><A HREF="gettext_9.html#IDX551">checking of translations</A>
+<LI><A HREF="gettext_15.html#IDX1270">clisp</A>
+<LI><A HREF="gettext_15.html#IDX1271">clisp C sources</A>
 <LI><A HREF="gettext_1.html#IDX15">codeset</A>
 <LI><A HREF="gettext_3.html#IDX123">comments in PO files</A>
 <LI><A HREF="gettext_3.html#IDX58">comments, automatic</A>
 <LI><A HREF="gettext_3.html#IDX59">comments, extracted</A>
 <LI><A HREF="gettext_3.html#IDX57">comments, translator</A>
-<LI><A HREF="gettext_15.html#IDX1251">Common Lisp</A>
-<LI><A HREF="gettext_9.html#IDX825">compare PO files</A>
-<LI><A HREF="gettext_11.html#IDX1127">comparison of interfaces</A>
-<LI><A HREF="gettext_10.html#IDX1020">compatibility with X/Open <CODE>msgfmt</CODE></A>
-<LI><A HREF="gettext_8.html#IDX532">compendium</A>
-<LI><A HREF="gettext_8.html#IDX534">compendium, creating</A>
-<LI><A HREF="gettext_9.html#IDX550">concatenate PO files</A>
-<LI><A HREF="gettext_8.html#IDX535">concatenating PO files into a compendium</A>
+<LI><A HREF="gettext_15.html#IDX1268">Common Lisp</A>
+<LI><A HREF="gettext_9.html#IDX832">compare PO files</A>
+<LI><A HREF="gettext_11.html#IDX1144">comparison of interfaces</A>
+<LI><A HREF="gettext_10.html#IDX1037">compatibility with X/Open <CODE>msgfmt</CODE></A>
+<LI><A HREF="gettext_8.html#IDX538">compendium</A>
+<LI><A HREF="gettext_8.html#IDX540">compendium, creating</A>
+<LI><A HREF="gettext_9.html#IDX556">concatenate PO files</A>
+<LI><A HREF="gettext_8.html#IDX541">concatenating PO files into a compendium</A>
 <LI><A HREF="gettext_4.html#IDX143">concatenation of strings</A>
-<LI><A HREF="gettext_11.html#IDX1107">context</A>
-<LI><A HREF="gettext_5.html#IDX195">context, argument specification in <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_10.html#IDX1090">context, in MO files</A>
+<LI><A HREF="gettext_11.html#IDX1124">context</A>
+<LI><A HREF="gettext_5.html#IDX199">context, argument specification in <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_10.html#IDX1107">context, in MO files</A>
 <LI><A HREF="gettext_3.html#IDX118">context, in PO files</A>
 <LI><A HREF="gettext_4.html#IDX148">control characters</A>
-<LI><A HREF="gettext_10.html#IDX1041">convert binary message catalog into PO file</A>
-<LI><A HREF="gettext_9.html#IDX598">convert translations to a different encoding</A>
-<LI><A HREF="gettext_13.html#IDX1144">converting a package to use <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_18.html#IDX1293">country codes</A>
-<LI><A HREF="gettext_6.html#IDX247">create new PO file</A>
-<LI><A HREF="gettext_6.html#IDX244">creating a new PO file</A>
-<LI><A HREF="gettext_8.html#IDX533">creating compendia</A>
+<LI><A HREF="gettext_10.html#IDX1058">convert binary message catalog into PO file</A>
+<LI><A HREF="gettext_9.html#IDX604">convert translations to a different encoding</A>
+<LI><A HREF="gettext_13.html#IDX1161">converting a package to use <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_18.html#IDX1311">country codes</A>
+<LI><A HREF="gettext_6.html#IDX253">create new PO file</A>
+<LI><A HREF="gettext_6.html#IDX250">creating a new PO file</A>
+<LI><A HREF="gettext_8.html#IDX539">creating compendia</A>
 <LI><A HREF="gettext_1.html#IDX19">currency symbols</A>
 </DIR>
 <H2><A NAME="cindex_d">d</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX21">date format</A>
-<LI><A HREF="gettext_11.html#IDX1120">dcngettext</A>
-<LI><A HREF="gettext_11.html#IDX1113">dcpgettext</A>
-<LI><A HREF="gettext_11.html#IDX1116">dcpgettext_expr</A>
-<LI><A HREF="gettext_5.html#IDX209">debugging messages marked as format strings</A>
-<LI><A HREF="gettext_10.html#IDX985">Desktop Entry mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_9.html#IDX543">dialect</A>
-<LI><A HREF="gettext_13.html#IDX1173">disabling NLS</A>
-<LI><A HREF="gettext_13.html#IDX1194">distribution tarball</A>
-<LI><A HREF="gettext_11.html#IDX1119">dngettext</A>
-<LI><A HREF="gettext_15.html#IDX1237">dollar substitution</A>
-<LI><A HREF="gettext_11.html#IDX1101">domain ambiguities</A>
-<LI><A HREF="gettext_11.html#IDX1112">dpgettext</A>
-<LI><A HREF="gettext_11.html#IDX1115">dpgettext_expr</A>
-<LI><A HREF="gettext_9.html#IDX546">duplicate elimination</A>
-<LI><A HREF="gettext_9.html#IDX743">duplicate removal</A>
+<LI><A HREF="gettext_11.html#IDX1137">dcngettext</A>
+<LI><A HREF="gettext_11.html#IDX1130">dcpgettext</A>
+<LI><A HREF="gettext_11.html#IDX1133">dcpgettext_expr</A>
+<LI><A HREF="gettext_5.html#IDX213">debugging messages marked as format strings</A>
+<LI><A HREF="gettext_10.html#IDX993">Desktop Entry mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_9.html#IDX549">dialect</A>
+<LI><A HREF="gettext_13.html#IDX1190">disabling NLS</A>
+<LI><A HREF="gettext_13.html#IDX1211">distribution tarball</A>
+<LI><A HREF="gettext_11.html#IDX1136">dngettext</A>
+<LI><A HREF="gettext_15.html#IDX1254">dollar substitution</A>
+<LI><A HREF="gettext_11.html#IDX1118">domain ambiguities</A>
+<LI><A HREF="gettext_11.html#IDX1129">dpgettext</A>
+<LI><A HREF="gettext_11.html#IDX1132">dpgettext_expr</A>
+<LI><A HREF="gettext_9.html#IDX552">duplicate elimination</A>
+<LI><A HREF="gettext_9.html#IDX750">duplicate removal</A>
 </DIR>
 <H2><A NAME="cindex_e">e</A></H2>
 <DIR>
-<LI><A HREF="gettext_8.html#IDX471">editing comments in PO files</A>
-<LI><A HREF="gettext_8.html#IDX334">Editing PO Files</A>
-<LI><A HREF="gettext_8.html#IDX448">editing translations</A>
-<LI><A HREF="gettext_15.html#IDX1255">Emacs Lisp</A>
-<LI><A HREF="gettext_8.html#IDX337">Emacs PO Mode</A>
+<LI><A HREF="gettext_8.html#IDX477">editing comments in PO files</A>
+<LI><A HREF="gettext_8.html#IDX340">Editing PO Files</A>
+<LI><A HREF="gettext_8.html#IDX454">editing translations</A>
+<LI><A HREF="gettext_15.html#IDX1272">Emacs Lisp</A>
+<LI><A HREF="gettext_8.html#IDX343">Emacs PO Mode</A>
 <LI><A HREF="gettext_1.html#IDX16">encoding</A>
-<LI><A HREF="gettext_9.html#IDX542">encoding conversion</A>
-<LI><A HREF="gettext_11.html#IDX1105">encoding conversion at runtime</A>
-<LI><A HREF="gettext_6.html#IDX278">encoding for your language</A>
-<LI><A HREF="gettext_6.html#IDX276">encoding list</A>
-<LI><A HREF="gettext_6.html#IDX273">encoding of PO files</A>
-<LI><A HREF="gettext_15.html#IDX1238">environment variables</A>
-<LI><A HREF="gettext_15.html#IDX1235"><CODE>envsubst</CODE> program, usage</A>
-<LI><A HREF="gettext_15.html#IDX1245"><CODE>eval_gettext</CODE> function, usage</A>
-<LI><A HREF="gettext_15.html#IDX1247"><CODE>eval_ngettext</CODE> function, usage</A>
+<LI><A HREF="gettext_9.html#IDX548">encoding conversion</A>
+<LI><A HREF="gettext_11.html#IDX1122">encoding conversion at runtime</A>
+<LI><A HREF="gettext_6.html#IDX284">encoding for your language</A>
+<LI><A HREF="gettext_6.html#IDX282">encoding list</A>
+<LI><A HREF="gettext_6.html#IDX279">encoding of PO files</A>
+<LI><A HREF="gettext_15.html#IDX1255">environment variables</A>
+<LI><A HREF="gettext_15.html#IDX1252"><CODE>envsubst</CODE> program, usage</A>
+<LI><A HREF="gettext_15.html#IDX1262"><CODE>eval_gettext</CODE> function, usage</A>
+<LI><A HREF="gettext_15.html#IDX1264"><CODE>eval_ngettext</CODE> function, usage</A>
 <LI><A HREF="gettext_1.html#IDX39">evolution of packages</A>
-<LI><A HREF="gettext_8.html#IDX537">extracting parts of a PO file into a compendium</A>
+<LI><A HREF="gettext_8.html#IDX543">extracting parts of a PO file into a compendium</A>
 </DIR>
 <H2><A NAME="cindex_f">f</A></H2>
 <DIR>
-<LI><A HREF="gettext_19.html#IDX1300">FDL, GNU Free Documentation License</A>
-<LI><A HREF="gettext_10.html#IDX1087">file format, <TT>&lsquo;.mo&rsquo;</TT></A>
+<LI><A HREF="gettext_19.html#IDX1318">FDL, GNU Free Documentation License</A>
+<LI><A HREF="gettext_10.html#IDX1104">file format, <TT>&lsquo;.mo&rsquo;</TT></A>
 <LI><A HREF="gettext_3.html#IDX56">file format, <TT>&lsquo;.po&rsquo;</TT></A>
 <LI><A HREF="gettext_1.html#IDX29">files, <TT>&lsquo;.po&rsquo;</TT> and <TT>&lsquo;.mo&rsquo;</TT></A>
 <LI><A HREF="gettext_1.html#IDX38">files, <TT>&lsquo;.pot&rsquo;</TT></A>
-<LI><A HREF="gettext_9.html#IDX843">filter messages according to attributes</A>
-<LI><A HREF="gettext_9.html#IDX783">find common messages</A>
-<LI><A HREF="gettext_10.html#IDX1027">force use of fuzzy entries</A>
+<LI><A HREF="gettext_9.html#IDX850">filter messages according to attributes</A>
+<LI><A HREF="gettext_9.html#IDX790">find common messages</A>
+<LI><A HREF="gettext_10.html#IDX1044">force use of fuzzy entries</A>
 <LI><A HREF="gettext_4.html#IDX160">format strings</A>
-<LI><A HREF="gettext_15.html#IDX1267">Free Pascal</A>
-<LI><A HREF="gettext_5.html#IDX197">function attribute, __format__</A>
-<LI><A HREF="gettext_5.html#IDX198">function attribute, __format_arg__</A>
-<LI><A HREF="gettext_8.html#IDX408">fuzzy entries</A>
+<LI><A HREF="gettext_15.html#IDX1284">Free Pascal</A>
+<LI><A HREF="gettext_5.html#IDX201">function attribute, __format__</A>
+<LI><A HREF="gettext_5.html#IDX202">function attribute, __format_arg__</A>
+<LI><A HREF="gettext_8.html#IDX414">fuzzy entries</A>
 </DIR>
 <H2><A NAME="cindex_g">g</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1265">gawk</A>
-<LI><A HREF="gettext_15.html#IDX1286">GCC-source</A>
-<LI><A HREF="gettext_10.html#IDX969">generate binary message catalog from PO file</A>
-<LI><A HREF="gettext_9.html#IDX895">generate translation catalog in English</A>
-<LI><A HREF="gettext_13.html#IDX1159"><CODE>gettext</CODE> files</A>
-<LI><A HREF="gettext_8.html#IDX339"><CODE>gettext</CODE> installation</A>
-<LI><A HREF="gettext_11.html#IDX1099"><CODE>gettext</CODE> interface</A>
-<LI><A HREF="gettext_15.html#IDX1212"><CODE>gettext</CODE> program, usage</A>
-<LI><A HREF="gettext_11.html#IDX1098"><CODE>gettext</CODE>, a programmer's view</A>
-<LI><A HREF="gettext_11.html#IDX1126"><CODE>gettext</CODE> vs <CODE>catgets</CODE></A>
-<LI><A HREF="gettext_13.html#IDX1148"><CODE>gettextize</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX336">GNOME PO file editor</A>
-<LI><A HREF="gettext_19.html#IDX1296">GPL, GNU General Public License</A>
-<LI><A HREF="gettext_11.html#IDX1108">GUI programs</A>
-<LI><A HREF="gettext_15.html#IDX1258">guile</A>
+<LI><A HREF="gettext_15.html#IDX1282">gawk</A>
+<LI><A HREF="gettext_15.html#IDX1303">GCC-source</A>
+<LI><A HREF="gettext_10.html#IDX977">generate binary message catalog from PO file</A>
+<LI><A HREF="gettext_9.html#IDX902">generate translation catalog in English</A>
+<LI><A HREF="gettext_13.html#IDX1176"><CODE>gettext</CODE> files</A>
+<LI><A HREF="gettext_8.html#IDX345"><CODE>gettext</CODE> installation</A>
+<LI><A HREF="gettext_11.html#IDX1116"><CODE>gettext</CODE> interface</A>
+<LI><A HREF="gettext_15.html#IDX1229"><CODE>gettext</CODE> program, usage</A>
+<LI><A HREF="gettext_11.html#IDX1115"><CODE>gettext</CODE>, a programmer's view</A>
+<LI><A HREF="gettext_11.html#IDX1143"><CODE>gettext</CODE> vs <CODE>catgets</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1165"><CODE>gettextize</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX342">GNOME PO file editor</A>
+<LI><A HREF="gettext_19.html#IDX1314">GPL, GNU General Public License</A>
+<LI><A HREF="gettext_11.html#IDX1125">GUI programs</A>
+<LI><A HREF="gettext_15.html#IDX1275">guile</A>
 </DIR>
 <H2><A NAME="cindex_h">h</A></H2>
 <DIR>
-<LI><A HREF="gettext_10.html#IDX1089">hash table, inside MO files</A>
+<LI><A HREF="gettext_10.html#IDX1106">hash table, inside MO files</A>
 <LI><A HREF="gettext_1.html#IDX2">he, she, and they</A>
-<LI><A HREF="gettext_6.html#IDX271">header entry of a PO file</A>
+<LI><A HREF="gettext_6.html#IDX277">header entry of a PO file</A>
 <LI><A HREF="gettext_4.html#IDX141">help option</A>
-<LI><A HREF="gettext_16.html#IDX1288">history of GNU <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_16.html#IDX1306">history of GNU <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_i">i</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX6">i18n</A>
-<LI><A HREF="gettext_8.html#IDX397">importing PO files</A>
-<LI><A HREF="gettext_1.html#IDX34">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_4.html#IDX125">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_11.html#IDX1128">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_13.html#IDX1174">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>
+<LI><A HREF="gettext_8.html#IDX403">importing PO files</A>
+<LI><A HREF="gettext_1.html#IDX34">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_4.html#IDX125">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_11.html#IDX1145">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>, <A HREF="gettext_13.html#IDX1191">include file <TT>&lsquo;libintl.h&rsquo;</TT></A>
 <LI><A HREF="gettext_4.html#IDX126">initialization</A>
-<LI><A HREF="gettext_6.html#IDX248">initialize new PO file</A>
-<LI><A HREF="gettext_8.html#IDX538">initialize translations from a compendium</A>
-<LI><A HREF="gettext_8.html#IDX338">installing <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_11.html#IDX1093">interface to <CODE>catgets</CODE></A>
+<LI><A HREF="gettext_6.html#IDX254">initialize new PO file</A>
+<LI><A HREF="gettext_8.html#IDX544">initialize translations from a compendium</A>
+<LI><A HREF="gettext_8.html#IDX344">installing <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_11.html#IDX1110">interface to <CODE>catgets</CODE></A>
 <LI><A HREF="gettext_1.html#IDX8">internationalization</A>
 <LI><A HREF="gettext_4.html#IDX144"><CODE>inttypes.h</CODE></A>
-<LI><A HREF="gettext_18.html#IDX1294">ISO 3166</A>
-<LI><A HREF="gettext_17.html#IDX1292">ISO 639</A>
+<LI><A HREF="gettext_18.html#IDX1312">ISO 3166</A>
+<LI><A HREF="gettext_17.html#IDX1310">ISO 639</A>
 </DIR>
 <H2><A NAME="cindex_j">j</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1260">Java</A>
-<LI><A HREF="gettext_10.html#IDX974">Java mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1044">Java mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1277">Java</A>
+<LI><A HREF="gettext_10.html#IDX982">Java mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1061">Java mode, and <CODE>msgunfmt</CODE> program</A>
 <LI><A HREF="gettext_4.html#IDX145">Java, string concatenation</A>
 </DIR>
 <H2><A NAME="cindex_k">k</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX205">KDE format strings</A>
-<LI><A HREF="gettext_8.html#IDX335">KDE PO file editor</A>
-<LI><A HREF="gettext_10.html#IDX1022">keyboard accelerator checking</A>
+<LI><A HREF="gettext_5.html#IDX209">KDE format strings</A>
+<LI><A HREF="gettext_8.html#IDX341">KDE PO file editor</A>
+<LI><A HREF="gettext_10.html#IDX1039">keyboard accelerator checking</A>
 </DIR>
 <H2><A NAME="cindex_l">l</A></H2>
 <DIR>
 <LI><A HREF="gettext_1.html#IDX7">l10n</A>
-<LI><A HREF="gettext_17.html#IDX1291">language codes</A>
+<LI><A HREF="gettext_17.html#IDX1309">language codes</A>
 <LI><A HREF="gettext_2.html#IDX42">language selection</A>
-<LI><A HREF="gettext_11.html#IDX1130">language selection at runtime</A>
-<LI><A HREF="gettext_11.html#IDX1102">large package</A>
-<LI><A HREF="gettext_19.html#IDX1298">LGPL, GNU Lesser General Public License</A>
-<LI><A HREF="gettext_13.html#IDX1184"><CODE>libiconv</CODE> library</A>
-<LI><A HREF="gettext_15.html#IDX1263"><CODE>libintl</CODE> for C#</A>
-<LI><A HREF="gettext_15.html#IDX1261"><CODE>libintl</CODE> for Java</A>
-<LI><A HREF="gettext_13.html#IDX1177"><CODE>libintl</CODE> library</A>
-<LI><A HREF="gettext_15.html#IDX1256"><CODE>librep</CODE> Lisp</A>
-<LI><A HREF="gettext_19.html#IDX1301">License, GNU FDL</A>
-<LI><A HREF="gettext_19.html#IDX1297">License, GNU GPL</A>
-<LI><A HREF="gettext_19.html#IDX1299">License, GNU LGPL</A>
-<LI><A HREF="gettext_19.html#IDX1295">Licenses</A>
+<LI><A HREF="gettext_11.html#IDX1147">language selection at runtime</A>
+<LI><A HREF="gettext_11.html#IDX1119">large package</A>
+<LI><A HREF="gettext_19.html#IDX1316">LGPL, GNU Lesser General Public License</A>
+<LI><A HREF="gettext_13.html#IDX1201"><CODE>libiconv</CODE> library</A>
+<LI><A HREF="gettext_15.html#IDX1280"><CODE>libintl</CODE> for C#</A>
+<LI><A HREF="gettext_15.html#IDX1278"><CODE>libintl</CODE> for Java</A>
+<LI><A HREF="gettext_13.html#IDX1194"><CODE>libintl</CODE> library</A>
+<LI><A HREF="gettext_15.html#IDX1273"><CODE>librep</CODE> Lisp</A>
+<LI><A HREF="gettext_19.html#IDX1319">License, GNU FDL</A>
+<LI><A HREF="gettext_19.html#IDX1315">License, GNU GPL</A>
+<LI><A HREF="gettext_19.html#IDX1317">License, GNU LGPL</A>
+<LI><A HREF="gettext_19.html#IDX1313">Licenses</A>
 <LI><A HREF="gettext_1.html#IDX35">link with <TT>&lsquo;libintl&rsquo;</TT></A>
-<LI><A HREF="gettext_1.html#IDX28">Linux</A>, <A HREF="gettext_1.html#IDX36">Linux</A>, <A HREF="gettext_6.html#IDX277">Linux</A>
-<LI><A HREF="gettext_15.html#IDX1252">Lisp</A>
-<LI><A HREF="gettext_6.html#IDX272">list of translation teams, where to find</A>
+<LI><A HREF="gettext_1.html#IDX28">Linux</A>, <A HREF="gettext_1.html#IDX36">Linux</A>, <A HREF="gettext_6.html#IDX283">Linux</A>
+<LI><A HREF="gettext_15.html#IDX1269">Lisp</A>
+<LI><A HREF="gettext_6.html#IDX278">list of translation teams, where to find</A>
 <LI><A HREF="gettext_1.html#IDX14">locale categories</A>, <A HREF="gettext_1.html#IDX27">locale categories</A>
 <LI><A HREF="gettext_4.html#IDX127">locale category, LC_ALL</A>
 <LI><A HREF="gettext_4.html#IDX130">locale category, LC_COLLATE</A>
@@ -304,198 +304,203 @@ Jump to:
 <LI><A HREF="gettext_1.html#IDX24">locale category, LC_NUMERIC</A>, <A HREF="gettext_4.html#IDX132">locale category, LC_NUMERIC</A>
 <LI><A HREF="gettext_4.html#IDX135">locale category, LC_RESPONSES</A>
 <LI><A HREF="gettext_1.html#IDX22">locale category, LC_TIME</A>, <A HREF="gettext_4.html#IDX133">locale category, LC_TIME</A>
-<LI><A HREF="gettext_6.html#IDX275"><CODE>locale</CODE> program</A>
+<LI><A HREF="gettext_6.html#IDX281"><CODE>locale</CODE> program</A>
 <LI><A HREF="gettext_1.html#IDX9">localization</A>
-<LI><A HREF="gettext_15.html#IDX1213">lookup message translation</A>, <A HREF="gettext_15.html#IDX1246">lookup message translation</A>
-<LI><A HREF="gettext_15.html#IDX1225">lookup plural message translation</A>, <A HREF="gettext_15.html#IDX1248">lookup plural message translation</A>
+<LI><A HREF="gettext_15.html#IDX1230">lookup message translation</A>, <A HREF="gettext_15.html#IDX1263">lookup message translation</A>
+<LI><A HREF="gettext_15.html#IDX1242">lookup plural message translation</A>, <A HREF="gettext_15.html#IDX1265">lookup plural message translation</A>
 </DIR>
 <H2><A NAME="cindex_m">m</A></H2>
 <DIR>
-<LI><A HREF="gettext_10.html#IDX1088">magic signature of MO files</A>
-<LI><A HREF="gettext_9.html#IDX540">manipulating PO files</A>
-<LI><A HREF="gettext_15.html#IDX1275">marking Perl sources</A>
+<LI><A HREF="gettext_10.html#IDX1105">magic signature of MO files</A>
+<LI><A HREF="gettext_9.html#IDX546">manipulating PO files</A>
+<LI><A HREF="gettext_15.html#IDX1292">marking Perl sources</A>
 <LI><A HREF="gettext_4.html#IDX163">marking string initializers</A>
 <LI><A HREF="gettext_4.html#IDX149">marking strings that require translation</A>
 <LI><A HREF="gettext_4.html#IDX136">marking strings, preparations</A>
 <LI><A HREF="gettext_1.html#IDX33">marking translatable strings</A>
 <LI><A HREF="gettext_4.html#IDX147">markup</A>
-<LI><A HREF="gettext_11.html#IDX1110">menu entries</A>
-<LI><A HREF="gettext_10.html#IDX1023">menu, keyboard accelerator support</A>
-<LI><A HREF="gettext_9.html#IDX551">merge PO files</A>
-<LI><A HREF="gettext_9.html#IDX541">merging two PO files</A>
-<LI><A HREF="gettext_11.html#IDX1103">message catalog files location</A>
+<LI><A HREF="gettext_11.html#IDX1127">menu entries</A>
+<LI><A HREF="gettext_10.html#IDX1040">menu, keyboard accelerator support</A>
+<LI><A HREF="gettext_9.html#IDX557">merge PO files</A>
+<LI><A HREF="gettext_9.html#IDX547">merging two PO files</A>
+<LI><A HREF="gettext_11.html#IDX1120">message catalog files location</A>
 <LI><A HREF="gettext_1.html#IDX25">messages</A>
-<LI><A HREF="gettext_13.html#IDX1145">migration from earlier versions of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_10.html#IDX1024">mnemonics of menu entries</A>
-<LI><A HREF="gettext_10.html#IDX1086">MO file's format</A>
-<LI><A HREF="gettext_9.html#IDX855">modify message attributes</A>
-<LI><A HREF="gettext_9.html#IDX842"><CODE>msgattrib</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX549"><CODE>msgcat</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX824"><CODE>msgcmp</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX782"><CODE>msgcomm</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX597"><CODE>msgconv</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX894"><CODE>msgen</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX927"><CODE>msgexec</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX702"><CODE>msgfilter</CODE> filter and catalog encoding</A>
-<LI><A HREF="gettext_9.html#IDX686"><CODE>msgfilter</CODE> program, usage</A>
-<LI><A HREF="gettext_10.html#IDX968"><CODE>msgfmt</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX631"><CODE>msggrep</CODE> program, usage</A>
-<LI><A HREF="gettext_6.html#IDX246"><CODE>msginit</CODE> program, usage</A>
-<LI><A HREF="gettext_7.html#IDX283"><CODE>msgmerge</CODE> program, usage</A>
-<LI><A HREF="gettext_10.html#IDX1040"><CODE>msgunfmt</CODE> program, usage</A>
-<LI><A HREF="gettext_9.html#IDX741"><CODE>msguniq</CODE> program, usage</A>
-<LI><A HREF="gettext_8.html#IDX398">multi-line strings</A>
+<LI><A HREF="gettext_13.html#IDX1162">migration from earlier versions of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_10.html#IDX1041">mnemonics of menu entries</A>
+<LI><A HREF="gettext_10.html#IDX1103">MO file's format</A>
+<LI><A HREF="gettext_9.html#IDX862">modify message attributes</A>
+<LI><A HREF="gettext_9.html#IDX849"><CODE>msgattrib</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX555"><CODE>msgcat</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX831"><CODE>msgcmp</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX789"><CODE>msgcomm</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX603"><CODE>msgconv</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX901"><CODE>msgen</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX934"><CODE>msgexec</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX709"><CODE>msgfilter</CODE> filter and catalog encoding</A>
+<LI><A HREF="gettext_9.html#IDX692"><CODE>msgfilter</CODE> program, usage</A>
+<LI><A HREF="gettext_10.html#IDX976"><CODE>msgfmt</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX637"><CODE>msggrep</CODE> program, usage</A>
+<LI><A HREF="gettext_6.html#IDX252"><CODE>msginit</CODE> program, usage</A>
+<LI><A HREF="gettext_7.html#IDX289"><CODE>msgmerge</CODE> program, usage</A>
+<LI><A HREF="gettext_10.html#IDX1057"><CODE>msgunfmt</CODE> program, usage</A>
+<LI><A HREF="gettext_9.html#IDX748"><CODE>msguniq</CODE> program, usage</A>
+<LI><A HREF="gettext_8.html#IDX404">multi-line strings</A>
 </DIR>
 <H2><A NAME="cindex_n">n</A></H2>
 <DIR>
-<LI><A HREF="gettext_11.html#IDX1129"><CODE>N_</CODE>, a convenience macro</A>
+<LI><A HREF="gettext_11.html#IDX1146"><CODE>N_</CODE>, a convenience macro</A>
 <LI><A HREF="gettext_1.html#IDX11">Native Language Support</A>
 <LI><A HREF="gettext_1.html#IDX12">Natural Language Support</A>
 <LI><A HREF="gettext_3.html#IDX122">newlines in PO files</A>
-<LI><A HREF="gettext_11.html#IDX1118">ngettext</A>
-<LI><A HREF="gettext_15.html#IDX1224"><CODE>ngettext</CODE> program, usage</A>
+<LI><A HREF="gettext_11.html#IDX1135">ngettext</A>
+<LI><A HREF="gettext_15.html#IDX1241"><CODE>ngettext</CODE> program, usage</A>
 <LI><A HREF="gettext_1.html#IDX10">NLS</A>
 <LI><A HREF="gettext_1.html#IDX23">number format</A>
 </DIR>
 <H2><A NAME="cindex_o">o</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1268">Object Pascal</A>
-<LI><A HREF="gettext_8.html#IDX435">obsolete entries</A>
-<LI><A HREF="gettext_11.html#IDX1125">optimization of <CODE>gettext</CODE> functions</A>
-<LI><A HREF="gettext_9.html#IDX544">orthography</A>
-<LI><A HREF="gettext_15.html#IDX1202">outdigits</A>
+<LI><A HREF="gettext_15.html#IDX1285">Object Pascal</A>
+<LI><A HREF="gettext_8.html#IDX441">obsolete entries</A>
+<LI><A HREF="gettext_11.html#IDX1142">optimization of <CODE>gettext</CODE> functions</A>
+<LI><A HREF="gettext_9.html#IDX550">orthography</A>
+<LI><A HREF="gettext_15.html#IDX1219">outdigits</A>
 <LI><A HREF="gettext_5.html#IDX177">output to stdout, <CODE>xgettext</CODE></A>
 <LI><A HREF="gettext_1.html#IDX30">overview of <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_p">p</A></H2>
 <DIR>
-<LI><A HREF="gettext_13.html#IDX1166">package and version declaration in <TT>&lsquo;configure.ac&rsquo;</TT></A>
-<LI><A HREF="gettext_14.html#IDX1197">package build and installation options</A>
-<LI><A HREF="gettext_14.html#IDX1196">package distributor's view of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_14.html#IDX1195">package installer's view of <CODE>gettext</CODE></A>
-<LI><A HREF="gettext_13.html#IDX1143">package maintainer's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1183">package and version declaration in <TT>&lsquo;configure.ac&rsquo;</TT></A>
+<LI><A HREF="gettext_14.html#IDX1214">package build and installation options</A>
+<LI><A HREF="gettext_14.html#IDX1213">package distributor's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_14.html#IDX1212">package installer's view of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_13.html#IDX1160">package maintainer's view of <CODE>gettext</CODE></A>
 <LI><A HREF="gettext_4.html#IDX140">paragraphs</A>
-<LI><A HREF="gettext_15.html#IDX1266">Pascal</A>
-<LI><A HREF="gettext_15.html#IDX1274">Perl</A>
-<LI><A HREF="gettext_15.html#IDX1276">Perl default keywords</A>
-<LI><A HREF="gettext_15.html#IDX1279">Perl invalid string interpolation</A>
-<LI><A HREF="gettext_15.html#IDX1282">Perl long lines</A>
-<LI><A HREF="gettext_15.html#IDX1281">Perl parentheses</A>
-<LI><A HREF="gettext_15.html#IDX1283">Perl pitfalls</A>
-<LI><A HREF="gettext_15.html#IDX1278">Perl quote-like expressions</A>
-<LI><A HREF="gettext_15.html#IDX1277">Perl special keywords for hash-lookups</A>
-<LI><A HREF="gettext_15.html#IDX1280">Perl valid string interpolation</A>
-<LI><A HREF="gettext_11.html#IDX1111">pgettext</A>
-<LI><A HREF="gettext_11.html#IDX1114">pgettext_expr</A>
-<LI><A HREF="gettext_15.html#IDX1284">PHP</A>
-<LI><A HREF="gettext_15.html#IDX1285">Pike</A>
-<LI><A HREF="gettext_11.html#IDX1124">plural form formulas</A>
-<LI><A HREF="gettext_11.html#IDX1117">plural forms</A>
-<LI><A HREF="gettext_10.html#IDX1091">plural forms, in MO files</A>
+<LI><A HREF="gettext_15.html#IDX1283">Pascal</A>
+<LI><A HREF="gettext_15.html#IDX1291">Perl</A>
+<LI><A HREF="gettext_15.html#IDX1293">Perl default keywords</A>
+<LI><A HREF="gettext_15.html#IDX1296">Perl invalid string interpolation</A>
+<LI><A HREF="gettext_15.html#IDX1299">Perl long lines</A>
+<LI><A HREF="gettext_15.html#IDX1298">Perl parentheses</A>
+<LI><A HREF="gettext_15.html#IDX1300">Perl pitfalls</A>
+<LI><A HREF="gettext_15.html#IDX1295">Perl quote-like expressions</A>
+<LI><A HREF="gettext_15.html#IDX1294">Perl special keywords for hash-lookups</A>
+<LI><A HREF="gettext_15.html#IDX1297">Perl valid string interpolation</A>
+<LI><A HREF="gettext_11.html#IDX1128">pgettext</A>
+<LI><A HREF="gettext_11.html#IDX1131">pgettext_expr</A>
+<LI><A HREF="gettext_15.html#IDX1301">PHP</A>
+<LI><A HREF="gettext_15.html#IDX1302">Pike</A>
+<LI><A HREF="gettext_11.html#IDX1141">plural form formulas</A>
+<LI><A HREF="gettext_11.html#IDX1134">plural forms</A>
+<LI><A HREF="gettext_10.html#IDX1108">plural forms, in MO files</A>
 <LI><A HREF="gettext_3.html#IDX120">plural forms, in PO files</A>
-<LI><A HREF="gettext_12.html#IDX1141">plural forms, translating</A>
+<LI><A HREF="gettext_12.html#IDX1158">plural forms, translating</A>
 <LI><A HREF="gettext_3.html#IDX55">PO files' format</A>
-<LI><A HREF="gettext_8.html#IDX342">PO mode (Emacs) commands</A>
+<LI><A HREF="gettext_8.html#IDX348">PO mode (Emacs) commands</A>
 <LI><A HREF="gettext_5.html#IDX164">PO template file</A>
-<LI><A HREF="gettext_9.html#IDX959">po_file_domains</A>
-<LI><A HREF="gettext_9.html#IDX958">po_file_free</A>
-<LI><A HREF="gettext_9.html#IDX957">po_file_read</A>
-<LI><A HREF="gettext_9.html#IDX960">po_message_iterator</A>
-<LI><A HREF="gettext_9.html#IDX961">po_message_iterator_free</A>
-<LI><A HREF="gettext_9.html#IDX963">po_message_msgid</A>
-<LI><A HREF="gettext_9.html#IDX964">po_message_msgid_plural</A>
-<LI><A HREF="gettext_9.html#IDX965">po_message_msgstr</A>
-<LI><A HREF="gettext_9.html#IDX966">po_message_msgstr_plural</A>
-<LI><A HREF="gettext_9.html#IDX962">po_next_message</A>
-<LI><A HREF="gettext_9.html#IDX703">portability problems with <CODE>sed</CODE></A>
+<LI><A HREF="gettext_9.html#IDX967">po_file_domains</A>
+<LI><A HREF="gettext_9.html#IDX966">po_file_free</A>
+<LI><A HREF="gettext_9.html#IDX965">po_file_read</A>
+<LI><A HREF="gettext_9.html#IDX968">po_message_iterator</A>
+<LI><A HREF="gettext_9.html#IDX969">po_message_iterator_free</A>
+<LI><A HREF="gettext_9.html#IDX971">po_message_msgid</A>
+<LI><A HREF="gettext_9.html#IDX972">po_message_msgid_plural</A>
+<LI><A HREF="gettext_9.html#IDX973">po_message_msgstr</A>
+<LI><A HREF="gettext_9.html#IDX974">po_message_msgstr_plural</A>
+<LI><A HREF="gettext_9.html#IDX970">po_next_message</A>
+<LI><A HREF="gettext_9.html#IDX710">portability problems with <CODE>sed</CODE></A>
 <LI><A HREF="gettext_4.html#IDX124">preparing programs for translation</A>
-<LI><A HREF="gettext_15.html#IDX1210">preparing shell scripts for translation</A>
-<LI><A HREF="gettext_11.html#IDX1097">problems with <CODE>catgets</CODE> interface</A>
-<LI><A HREF="gettext_15.html#IDX1200">programming languages</A>
-<LI><A HREF="gettext_15.html#IDX1250">Python</A>
+<LI><A HREF="gettext_15.html#IDX1305">preparing rules for XML translation</A>
+<LI><A HREF="gettext_15.html#IDX1227">preparing shell scripts for translation</A>
+<LI><A HREF="gettext_11.html#IDX1114">problems with <CODE>catgets</CODE> interface</A>
+<LI><A HREF="gettext_15.html#IDX1217">programming languages</A>
+<LI><A HREF="gettext_15.html#IDX1267">Python</A>
 </DIR>
 <H2><A NAME="cindex_q">q</A></H2>
 <DIR>
-<LI><A HREF="gettext_5.html#IDX203">Qt format strings</A>
-<LI><A HREF="gettext_10.html#IDX983">Qt mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_6.html#IDX280">quotation marks</A>, <A HREF="gettext_13.html#IDX1164">quotation marks</A>
-<LI><A HREF="gettext_6.html#IDX279">quote characters, use in PO files</A>
+<LI><A HREF="gettext_5.html#IDX207">Qt format strings</A>
+<LI><A HREF="gettext_10.html#IDX991">Qt mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_6.html#IDX286">quotation marks</A>, <A HREF="gettext_13.html#IDX1181">quotation marks</A>
+<LI><A HREF="gettext_6.html#IDX285">quote characters, use in PO files</A>
 </DIR>
 <H2><A NAME="cindex_r">r</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX712"><CODE>recode-sr-latin</CODE> program</A>
-<LI><A HREF="gettext_16.html#IDX1289">related reading</A>
-<LI><A HREF="gettext_13.html#IDX1193">release</A>
-<LI><A HREF="gettext_15.html#IDX1287">RST</A>
+<LI><A HREF="gettext_9.html#IDX719"><CODE>recode-sr-latin</CODE> program</A>
+<LI><A HREF="gettext_16.html#IDX1307">related reading</A>
+<LI><A HREF="gettext_13.html#IDX1210">release</A>
+<LI><A HREF="gettext_15.html#IDX1304">RST</A>
 </DIR>
 <H2><A NAME="cindex_s">s</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1257">Scheme</A>
-<LI><A HREF="gettext_15.html#IDX1201">scripting languages</A>
-<LI><A HREF="gettext_9.html#IDX632">search messages in a catalog</A>
+<LI><A HREF="gettext_15.html#IDX1274">Scheme</A>
+<LI><A HREF="gettext_15.html#IDX1218">scripting languages</A>
+<LI><A HREF="gettext_9.html#IDX638">search messages in a catalog</A>
 <LI><A HREF="gettext_2.html#IDX41">selecting message language</A>
+<LI><A HREF="gettext_5.html#IDX193">sentence end markers, <CODE>xgettext</CODE></A>
 <LI><A HREF="gettext_4.html#IDX139">sentences</A>
-<LI><A HREF="gettext_14.html#IDX1198">setting up <CODE>gettext</CODE> at build time</A>
+<LI><A HREF="gettext_14.html#IDX1215">setting up <CODE>gettext</CODE> at build time</A>
 <LI><A HREF="gettext_2.html#IDX40">setting up <CODE>gettext</CODE> at run time</A>
-<LI><A HREF="gettext_11.html#IDX1100">several domains</A>
+<LI><A HREF="gettext_11.html#IDX1117">several domains</A>
 <LI><A HREF="gettext_1.html#IDX1">sex</A>
 <LI><A HREF="gettext_1.html#IDX3">she, he, and they</A>
-<LI><A HREF="gettext_15.html#IDX1236">shell format string</A>
-<LI><A HREF="gettext_15.html#IDX1205">shell scripts</A>
-<LI><A HREF="gettext_15.html#IDX1259">Smalltalk</A>
-<LI><A HREF="gettext_9.html#IDX589">sorting <CODE>msgcat</CODE> output</A>
-<LI><A HREF="gettext_7.html#IDX322">sorting <CODE>msgmerge</CODE> output</A>
-<LI><A HREF="gettext_10.html#IDX1079">sorting <CODE>msgunfmt</CODE> output</A>
-<LI><A HREF="gettext_5.html#IDX226">sorting output of <CODE>xgettext</CODE></A>
-<LI><A HREF="gettext_11.html#IDX1121">specifying plural form in a PO file</A>
-<LI><A HREF="gettext_9.html#IDX558">standard output, and <CODE>msgcat</CODE></A>
-<LI><A HREF="gettext_7.html#IDX292">standard output, and <CODE>msgmerge</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1253">shell format string</A>
+<LI><A HREF="gettext_15.html#IDX1222">shell scripts</A>
+<LI><A HREF="gettext_15.html#IDX1276">Smalltalk</A>
+<LI><A HREF="gettext_9.html#IDX595">sorting <CODE>msgcat</CODE> output</A>
+<LI><A HREF="gettext_7.html#IDX328">sorting <CODE>msgmerge</CODE> output</A>
+<LI><A HREF="gettext_10.html#IDX1096">sorting <CODE>msgunfmt</CODE> output</A>
+<LI><A HREF="gettext_5.html#IDX232">sorting output of <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_11.html#IDX1138">specifying plural form in a PO file</A>
+<LI><A HREF="gettext_9.html#IDX564">standard output, and <CODE>msgcat</CODE></A>
+<LI><A HREF="gettext_7.html#IDX298">standard output, and <CODE>msgmerge</CODE> program</A>
 <LI><A HREF="gettext_4.html#IDX142">string concatenation</A>
-<LI><A HREF="gettext_8.html#IDX394">string normalization in entries</A>
+<LI><A HREF="gettext_8.html#IDX400">string normalization in entries</A>
 <LI><A HREF="gettext_4.html#IDX137">style</A>
+<LI><A HREF="gettext_10.html#IDX1022">supported languages, <CODE>msgfmt</CODE></A>
 <LI><A HREF="gettext_5.html#IDX180">supported languages, <CODE>xgettext</CODE></A>
+<LI><A HREF="gettext_5.html#IDX191">supported syntax checks, <CODE>xgettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_t">t</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1272">Tcl</A>
-<LI><A HREF="gettext_10.html#IDX981">Tcl mode, and <CODE>msgfmt</CODE> program</A>
-<LI><A HREF="gettext_10.html#IDX1050">Tcl mode, and <CODE>msgunfmt</CODE> program</A>
+<LI><A HREF="gettext_15.html#IDX1289">Tcl</A>
+<LI><A HREF="gettext_10.html#IDX989">Tcl mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_10.html#IDX1067">Tcl mode, and <CODE>msgunfmt</CODE> program</A>
 <LI><A HREF="gettext_1.html#IDX37">template PO file</A>
-<LI><A HREF="gettext_5.html#IDX230">testing <TT>&lsquo;.po&rsquo;</TT> files for equivalence</A>
-<LI><A HREF="gettext_15.html#IDX1273">Tk's scripting language</A>
-<LI><A HREF="gettext_8.html#IDX399">translated entries</A>
-<LI><A HREF="gettext_11.html#IDX1109">translating menu entries</A>
+<LI><A HREF="gettext_5.html#IDX236">testing <TT>&lsquo;.po&rsquo;</TT> files for equivalence</A>
+<LI><A HREF="gettext_15.html#IDX1290">Tk's scripting language</A>
+<LI><A HREF="gettext_8.html#IDX405">translated entries</A>
+<LI><A HREF="gettext_11.html#IDX1126">translating menu entries</A>
 <LI><A HREF="gettext_1.html#IDX13">translation aspects</A>
 <LI><A HREF="gettext_2.html#IDX52">Translation Matrix</A>
 <LI><A HREF="gettext_1.html#IDX5">Translation Project</A>
-<LI><A HREF="gettext_13.html#IDX1172">turning off NLS support</A>
+<LI><A HREF="gettext_13.html#IDX1189">turning off NLS support</A>
 <LI><A HREF="gettext_1.html#IDX32">tutorial of <CODE>gettext</CODE> usage</A>
 </DIR>
 <H2><A NAME="cindex_u">u</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX742">unify duplicate translations</A>
-<LI><A HREF="gettext_8.html#IDX424">untranslated entries</A>
-<LI><A HREF="gettext_8.html#IDX539">update translations from a compendium</A>
-<LI><A HREF="gettext_13.html#IDX1146">upgrading to new versions of <CODE>gettext</CODE></A>
+<LI><A HREF="gettext_9.html#IDX749">unify duplicate translations</A>
+<LI><A HREF="gettext_8.html#IDX430">untranslated entries</A>
+<LI><A HREF="gettext_8.html#IDX545">update translations from a compendium</A>
+<LI><A HREF="gettext_13.html#IDX1163">upgrading to new versions of <CODE>gettext</CODE></A>
 </DIR>
 <H2><A NAME="cindex_v">v</A></H2>
 <DIR>
-<LI><A HREF="gettext_7.html#IDX296">version control for backup files, <CODE>msgmerge</CODE></A>
+<LI><A HREF="gettext_7.html#IDX302">version control for backup files, <CODE>msgmerge</CODE></A>
 </DIR>
 <H2><A NAME="cindex_w">w</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1269"><CODE>wxWidgets</CODE> library</A>
+<LI><A HREF="gettext_15.html#IDX1286"><CODE>wxWidgets</CODE> library</A>
 </DIR>
 <H2><A NAME="cindex_x">x</A></H2>
 <DIR>
-<LI><A HREF="gettext_9.html#IDX929"><CODE>xargs</CODE>, and output from <CODE>msgexec</CODE></A>
+<LI><A HREF="gettext_9.html#IDX936"><CODE>xargs</CODE>, and output from <CODE>msgexec</CODE></A>
 <LI><A HREF="gettext_5.html#IDX166"><CODE>xgettext</CODE> program, usage</A>
-<LI><A HREF="gettext_6.html#IDX281"><CODE>xmodmap</CODE> program, and typing quotation marks</A>
+<LI><A HREF="gettext_10.html#IDX995">XML mode, and <CODE>msgfmt</CODE> program</A>
+<LI><A HREF="gettext_6.html#IDX287"><CODE>xmodmap</CODE> program, and typing quotation marks</A>
 </DIR>
 <H2><A NAME="cindex_y">y</A></H2>
 <DIR>
-<LI><A HREF="gettext_15.html#IDX1271">YaST2 scripting language</A>
-<LI><A HREF="gettext_15.html#IDX1270">YCP</A>
+<LI><A HREF="gettext_15.html#IDX1288">YaST2 scripting language</A>
+<LI><A HREF="gettext_15.html#IDX1287">YCP</A>
 </DIR>
 
 </P>
diff --git a/gettext-tools/doc/gettext_3.html b/gettext-tools/doc/gettext_3.html
index 94e89a9..ae348a8 100644
--- a/gettext-tools/doc/gettext_3.html
+++ b/gettext-tools/doc/gettext_3.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 3  The Format of PO Files</TITLE>
@@ -153,7 +153,7 @@ string happens to look like a C format string (with <SAMP>&lsquo;%&rsquo;</SAMP>
 
 When the <CODE>c-format</CODE> flag is given for a string the <CODE>msgfmt</CODE>
 program does some more tests to check the validity of the translation.
-See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, section <A HREF="gettext_4.html#SEC22">4.6  Special Comments preceding Keywords</A> and section <A HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A>.
+See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CODE> Program</A>, section <A HREF="gettext_4.html#SEC22">4.6  Special Comments preceding Keywords</A> and section <A HREF="gettext_15.html#SEC252">15.3.1  C Format Strings</A>.
 
 <DT><CODE>objc-format</CODE>
 <DD>
@@ -161,7 +161,7 @@ See section <A HREF="gettext_10.html#SEC157">10.1  Invoking the <CODE>msgfmt</CO
 <DT><CODE>no-objc-format</CODE>
 <DD>
 <A NAME="IDX66"></A>
-Likewise for Objective C, see section <A HREF="gettext_15.html#SEC252">15.3.2  Objective C Format Strings</A>.
+Likewise for Objective C, see section <A HREF="gettext_15.html#SEC253">15.3.2  Objective C Format Strings</A>.
 
 <DT><CODE>sh-format</CODE>
 <DD>
@@ -169,7 +169,7 @@ Likewise for Objective C, see section <A HREF="gettext_15.html#SEC252">15.3.2  O
 <DT><CODE>no-sh-format</CODE>
 <DD>
 <A NAME="IDX68"></A>
-Likewise for Shell, see section <A HREF="gettext_15.html#SEC253">15.3.3  Shell Format Strings</A>.
+Likewise for Shell, see section <A HREF="gettext_15.html#SEC254">15.3.3  Shell Format Strings</A>.
 
 <DT><CODE>python-format</CODE>
 <DD>
@@ -177,7 +177,7 @@ Likewise for Shell, see section <A HREF="gettext_15.html#SEC253">15.3.3  Shell F
 <DT><CODE>no-python-format</CODE>
 <DD>
 <A NAME="IDX70"></A>
-Likewise for Python, see section <A HREF="gettext_15.html#SEC254">15.3.4  Python Format Strings</A>.
+Likewise for Python, see section <A HREF="gettext_15.html#SEC255">15.3.4  Python Format Strings</A>.
 
 <DT><CODE>python-brace-format</CODE>
 <DD>
@@ -185,7 +185,7 @@ Likewise for Python, see section <A HREF="gettext_15.html#SEC254">15.3.4  Python
 <DT><CODE>no-python-brace-format</CODE>
 <DD>
 <A NAME="IDX72"></A>
-Likewise for Python brace, see section <A HREF="gettext_15.html#SEC254">15.3.4  Python Format Strings</A>.
+Likewise for Python brace, see section <A HREF="gettext_15.html#SEC255">15.3.4  Python Format Strings</A>.
 
 <DT><CODE>lisp-format</CODE>
 <DD>
@@ -193,7 +193,7 @@ Likewise for Python brace, see section <A HREF="gettext_15.html#SEC254">15.3.4
 <DT><CODE>no-lisp-format</CODE>
 <DD>
 <A NAME="IDX74"></A>
-Likewise for Lisp, see section <A HREF="gettext_15.html#SEC255">15.3.5  Lisp Format Strings</A>.
+Likewise for Lisp, see section <A HREF="gettext_15.html#SEC256">15.3.5  Lisp Format Strings</A>.
 
 <DT><CODE>elisp-format</CODE>
 <DD>
@@ -201,7 +201,7 @@ Likewise for Lisp, see section <A HREF="gettext_15.html#SEC255">15.3.5  Lisp For
 <DT><CODE>no-elisp-format</CODE>
 <DD>
 <A NAME="IDX76"></A>
-Likewise for Emacs Lisp, see section <A HREF="gettext_15.html#SEC256">15.3.6  Emacs Lisp Format Strings</A>.
+Likewise for Emacs Lisp, see section <A HREF="gettext_15.html#SEC257">15.3.6  Emacs Lisp Format Strings</A>.
 
 <DT><CODE>librep-format</CODE>
 <DD>
@@ -209,7 +209,7 @@ Likewise for Emacs Lisp, see section <A HREF="gettext_15.html#SEC256">15.3.6  Em
 <DT><CODE>no-librep-format</CODE>
 <DD>
 <A NAME="IDX78"></A>
-Likewise for librep, see section <A HREF="gettext_15.html#SEC257">15.3.7  librep Format Strings</A>.
+Likewise for librep, see section <A HREF="gettext_15.html#SEC258">15.3.7  librep Format Strings</A>.
 
 <DT><CODE>scheme-format</CODE>
 <DD>
@@ -217,7 +217,7 @@ Likewise for librep, see section <A HREF="gettext_15.html#SEC257">15.3.7  librep
 <DT><CODE>no-scheme-format</CODE>
 <DD>
 <A NAME="IDX80"></A>
-Likewise for Scheme, see section <A HREF="gettext_15.html#SEC258">15.3.8  Scheme Format Strings</A>.
+Likewise for Scheme, see section <A HREF="gettext_15.html#SEC259">15.3.8  Scheme Format Strings</A>.
 
 <DT><CODE>smalltalk-format</CODE>
 <DD>
@@ -225,7 +225,7 @@ Likewise for Scheme, see section <A HREF="gettext_15.html#SEC258">15.3.8  Scheme
 <DT><CODE>no-smalltalk-format</CODE>
 <DD>
 <A NAME="IDX82"></A>
-Likewise for Smalltalk, see section <A HREF="gettext_15.html#SEC259">15.3.9  Smalltalk Format Strings</A>.
+Likewise for Smalltalk, see section <A HREF="gettext_15.html#SEC260">15.3.9  Smalltalk Format Strings</A>.
 
 <DT><CODE>java-format</CODE>
 <DD>
@@ -233,7 +233,7 @@ Likewise for Smalltalk, see section <A HREF="gettext_15.html#SEC259">15.3.9  Sma
 <DT><CODE>no-java-format</CODE>
 <DD>
 <A NAME="IDX84"></A>
-Likewise for Java, see section <A HREF="gettext_15.html#SEC260">15.3.10  Java Format Strings</A>.
+Likewise for Java, see section <A HREF="gettext_15.html#SEC261">15.3.10  Java Format Strings</A>.
 
 <DT><CODE>csharp-format</CODE>
 <DD>
@@ -241,7 +241,7 @@ Likewise for Java, see section <A HREF="gettext_15.html#SEC260">15.3.10  Java Fo
 <DT><CODE>no-csharp-format</CODE>
 <DD>
 <A NAME="IDX86"></A>
-Likewise for C#, see section <A HREF="gettext_15.html#SEC261">15.3.11  C# Format Strings</A>.
+Likewise for C#, see section <A HREF="gettext_15.html#SEC262">15.3.11  C# Format Strings</A>.
 
 <DT><CODE>awk-format</CODE>
 <DD>
@@ -249,7 +249,7 @@ Likewise for C#, see section <A HREF="gettext_15.html#SEC261">15.3.11  C# Format
 <DT><CODE>no-awk-format</CODE>
 <DD>
 <A NAME="IDX88"></A>
-Likewise for awk, see section <A HREF="gettext_15.html#SEC262">15.3.12  awk Format Strings</A>.
+Likewise for awk, see section <A HREF="gettext_15.html#SEC263">15.3.12  awk Format Strings</A>.
 
 <DT><CODE>object-pascal-format</CODE>
 <DD>
@@ -257,7 +257,7 @@ Likewise for awk, see section <A HREF="gettext_15.html#SEC262">15.3.12  awk Form
 <DT><CODE>no-object-pascal-format</CODE>
 <DD>
 <A NAME="IDX90"></A>
-Likewise for Object Pascal, see section <A HREF="gettext_15.html#SEC263">15.3.13  Object Pascal Format Strings</A>.
+Likewise for Object Pascal, see section <A HREF="gettext_15.html#SEC264">15.3.13  Object Pascal Format Strings</A>.
 
 <DT><CODE>ycp-format</CODE>
 <DD>
@@ -265,7 +265,7 @@ Likewise for Object Pascal, see section <A HREF="gettext_15.html#SEC263">15.3.13
 <DT><CODE>no-ycp-format</CODE>
 <DD>
 <A NAME="IDX92"></A>
-Likewise for YCP, see section <A HREF="gettext_15.html#SEC264">15.3.14  YCP Format Strings</A>.
+Likewise for YCP, see section <A HREF="gettext_15.html#SEC265">15.3.14  YCP Format Strings</A>.
 
 <DT><CODE>tcl-format</CODE>
 <DD>
@@ -273,7 +273,7 @@ Likewise for YCP, see section <A HREF="gettext_15.html#SEC264">15.3.14  YCP Form
 <DT><CODE>no-tcl-format</CODE>
 <DD>
 <A NAME="IDX94"></A>
-Likewise for Tcl, see section <A HREF="gettext_15.html#SEC265">15.3.15  Tcl Format Strings</A>.
+Likewise for Tcl, see section <A HREF="gettext_15.html#SEC266">15.3.15  Tcl Format Strings</A>.
 
 <DT><CODE>perl-format</CODE>
 <DD>
@@ -281,7 +281,7 @@ Likewise for Tcl, see section <A HREF="gettext_15.html#SEC265">15.3.15  Tcl Form
 <DT><CODE>no-perl-format</CODE>
 <DD>
 <A NAME="IDX96"></A>
-Likewise for Perl, see section <A HREF="gettext_15.html#SEC266">15.3.16  Perl Format Strings</A>.
+Likewise for Perl, see section <A HREF="gettext_15.html#SEC267">15.3.16  Perl Format Strings</A>.
 
 <DT><CODE>perl-brace-format</CODE>
 <DD>
@@ -289,7 +289,7 @@ Likewise for Perl, see section <A HREF="gettext_15.html#SEC266">15.3.16  Perl Fo
 <DT><CODE>no-perl-brace-format</CODE>
 <DD>
 <A NAME="IDX98"></A>
-Likewise for Perl brace, see section <A HREF="gettext_15.html#SEC266">15.3.16  Perl Format Strings</A>.
+Likewise for Perl brace, see section <A HREF="gettext_15.html#SEC267">15.3.16  Perl Format Strings</A>.
 
 <DT><CODE>php-format</CODE>
 <DD>
@@ -297,7 +297,7 @@ Likewise for Perl brace, see section <A HREF="gettext_15.html#SEC266">15.3.16  P
 <DT><CODE>no-php-format</CODE>
 <DD>
 <A NAME="IDX100"></A>
-Likewise for PHP, see section <A HREF="gettext_15.html#SEC267">15.3.17  PHP Format Strings</A>.
+Likewise for PHP, see section <A HREF="gettext_15.html#SEC268">15.3.17  PHP Format Strings</A>.
 
 <DT><CODE>gcc-internal-format</CODE>
 <DD>
@@ -305,7 +305,7 @@ Likewise for PHP, see section <A HREF="gettext_15.html#SEC267">15.3.17  PHP Form
 <DT><CODE>no-gcc-internal-format</CODE>
 <DD>
 <A NAME="IDX102"></A>
-Likewise for the GCC sources, see section <A HREF="gettext_15.html#SEC268">15.3.18  GCC internal Format Strings</A>.
+Likewise for the GCC sources, see section <A HREF="gettext_15.html#SEC269">15.3.18  GCC internal Format Strings</A>.
 
 <DT><CODE>gfc-internal-format</CODE>
 <DD>
@@ -313,7 +313,7 @@ Likewise for the GCC sources, see section <A HREF="gettext_15.html#SEC268">15.3.
 <DT><CODE>no-gfc-internal-format</CODE>
 <DD>
 <A NAME="IDX104"></A>
-Likewise for the GNU Fortran Compiler sources, see section <A HREF="gettext_15.html#SEC269">15.3.19  GFC internal Format Strings</A>.
+Likewise for the GNU Fortran Compiler sources, see section <A HREF="gettext_15.html#SEC270">15.3.19  GFC internal Format Strings</A>.
 
 <DT><CODE>qt-format</CODE>
 <DD>
@@ -321,7 +321,7 @@ Likewise for the GNU Fortran Compiler sources, see section <A HREF="gettext_15.h
 <DT><CODE>no-qt-format</CODE>
 <DD>
 <A NAME="IDX106"></A>
-Likewise for Qt, see section <A HREF="gettext_15.html#SEC270">15.3.20  Qt Format Strings</A>.
+Likewise for Qt, see section <A HREF="gettext_15.html#SEC271">15.3.20  Qt Format Strings</A>.
 
 <DT><CODE>qt-plural-format</CODE>
 <DD>
@@ -329,7 +329,7 @@ Likewise for Qt, see section <A HREF="gettext_15.html#SEC270">15.3.20  Qt Format
 <DT><CODE>no-qt-plural-format</CODE>
 <DD>
 <A NAME="IDX108"></A>
-Likewise for Qt plural forms, see section <A HREF="gettext_15.html#SEC271">15.3.21  Qt Format Strings</A>.
+Likewise for Qt plural forms, see section <A HREF="gettext_15.html#SEC272">15.3.21  Qt Format Strings</A>.
 
 <DT><CODE>kde-format</CODE>
 <DD>
@@ -337,7 +337,7 @@ Likewise for Qt plural forms, see section <A HREF="gettext_15.html#SEC271">15.3.
 <DT><CODE>no-kde-format</CODE>
 <DD>
 <A NAME="IDX110"></A>
-Likewise for KDE, see section <A HREF="gettext_15.html#SEC272">15.3.22  KDE Format Strings</A>.
+Likewise for KDE, see section <A HREF="gettext_15.html#SEC273">15.3.22  KDE Format Strings</A>.
 
 <DT><CODE>boost-format</CODE>
 <DD>
@@ -345,7 +345,7 @@ Likewise for KDE, see section <A HREF="gettext_15.html#SEC272">15.3.22  KDE Form
 <DT><CODE>no-boost-format</CODE>
 <DD>
 <A NAME="IDX112"></A>
-Likewise for Boost, see section <A HREF="gettext_15.html#SEC273">15.3.23  Boost Format Strings</A>.
+Likewise for Boost, see section <A HREF="gettext_15.html#SEC275">15.3.24  Boost Format Strings</A>.
 
 <DT><CODE>lua-format</CODE>
 <DD>
@@ -353,7 +353,7 @@ Likewise for Boost, see section <A HREF="gettext_15.html#SEC273">15.3.23  Boost
 <DT><CODE>no-lua-format</CODE>
 <DD>
 <A NAME="IDX114"></A>
-Likewise for Lua, see section <A HREF="gettext_15.html#SEC274">15.3.24  Lua Format Strings</A>.
+Likewise for Lua, see section <A HREF="gettext_15.html#SEC276">15.3.25  Lua Format Strings</A>.
 
 <DT><CODE>javascript-format</CODE>
 <DD>
@@ -361,7 +361,7 @@ Likewise for Lua, see section <A HREF="gettext_15.html#SEC274">15.3.24  Lua Form
 <DT><CODE>no-javascript-format</CODE>
 <DD>
 <A NAME="IDX116"></A>
-Likewise for JavaScript, see section <A HREF="gettext_15.html#SEC275">15.3.25  JavaScript Format Strings</A>.
+Likewise for JavaScript, see section <A HREF="gettext_15.html#SEC277">15.3.26  JavaScript Format Strings</A>.
 
 </DL>
 
diff --git a/gettext-tools/doc/gettext_4.html b/gettext-tools/doc/gettext_4.html
index 439d9e2..209d5bb 100644
--- a/gettext-tools/doc/gettext_4.html
+++ b/gettext-tools/doc/gettext_4.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 4  Preparing Program Sources</TITLE>
@@ -35,7 +35,7 @@ needing translation.
 <P>
 Presuming that your set of programs, or package, has been adjusted
 so all needed GNU <CODE>gettext</CODE> files are available, and your
-<TT>&lsquo;Makefile&rsquo;</TT> files are adjusted (see section <A HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>), each C module
+<TT>&lsquo;Makefile&rsquo;</TT> files are adjusted (see section <A HREF="gettext_13.html#SEC213">13  The Maintainer's View</A>), each C module
 having translated C strings should contain the line:
 
 </P>
@@ -594,7 +594,7 @@ the marked argument position depend on the total number of arguments of
 the function call; this is useful in C++.  All this is achieved using
 <CODE>xgettext</CODE>'s <SAMP>&lsquo;--keyword&rsquo;</SAMP> option.  How to pass such an option
 to <CODE>xgettext</CODE>, assuming that <CODE>gettextize</CODE> is used, is described
-in section <A HREF="gettext_13.html#SEC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A> and section <A HREF="gettext_13.html#SEC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
+in section <A HREF="gettext_13.html#SEC220">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A> and section <A HREF="gettext_13.html#SEC237">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>.
 
 </P>
 <P>
@@ -999,7 +999,7 @@ with the following one:
 
 {
   static const char *messages[] = {
-    gettext_noop ("some very meaningful message",
+    gettext_noop ("some very meaningful message"),
     gettext_noop ("and another one")
   };
   const char *string;
diff --git a/gettext-tools/doc/gettext_5.html b/gettext-tools/doc/gettext_5.html
index 8934f4b..420a170 100644
--- a/gettext-tools/doc/gettext_5.html
+++ b/gettext-tools/doc/gettext_5.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 5  Making the PO Template File</TITLE>
@@ -231,6 +231,70 @@ gettext (
 The second comment line will not be extracted, because there is one
 blank line between the comment line and the keyword.
 
+<DT><SAMP>&lsquo;--check[=<VAR>CHECK</VAR>]&rsquo;</SAMP>
+<DD>
+<A NAME="IDX190"></A>
+<A NAME="IDX191"></A>
+Perform a syntax check on msgid and msgid_plural.  The supported checks
+are:
+
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;ellipsis-unicode&rsquo;</SAMP>
+<DD>
+Prefer Unicode ellipsis character over ASCII <CODE>...</CODE>
+
+<DT><SAMP>&lsquo;space-ellipsis&rsquo;</SAMP>
+<DD>
+Prohibit whitespace before an ellipsis character
+
+<DT><SAMP>&lsquo;quote-unicode&rsquo;</SAMP>
+<DD>
+Prefer Unicode quotation marks over ASCII <CODE>"'`</CODE>
+
+</DL>
+
+The option has an effect on all input files.  To enable or disable
+checks for a certain string, you can mark it with an <CODE>xgettext:</CODE>
+special comment in the source file.  For example, if you specify the
+<CODE>--check=space-ellipsis</CODE> option, but want to suppress the check on
+a particular string, add the following comment:
+
+
+<PRE>
+/* xgettext: no-space-ellipsis-check */
+gettext ("We really want a space before ellipsis here ...");
+</PRE>
+
+The <CODE>xgettext:</CODE> comment can be followed by flags separated with a
+comma.  The possible flags are of the form <SAMP>&lsquo;[no-]<VAR>name</VAR>-check&rsquo;</SAMP>,
+where <VAR>name</VAR> is the name of a valid syntax check.  If a flag is
+prefixed by <CODE>no-</CODE>, the meaning is negated.
+
+Some tests apply the checks to each sentence within the msgid, rather
+than the whole string.  xgettext detects the end of sentence by
+performing a pattern match, which usually looks for a period followed by
+a certain number of spaces.  The number is specified with the
+<CODE>--sentence-end</CODE> option.
+
+<DT><SAMP>&lsquo;--sentence-end[=<VAR>TYPE</VAR>]&rsquo;</SAMP>
+<DD>
+<A NAME="IDX192"></A>
+<A NAME="IDX193"></A>
+The supported values are:
+
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;single-space&rsquo;</SAMP>
+<DD>
+Expect at least one whitespace after a period
+
+<DT><SAMP>&lsquo;double-space&rsquo;</SAMP>
+<DD>
+Expect at least two whitespaces after a period
+
+</DL>
+
 </DL>
 
 
@@ -243,8 +307,8 @@ blank line between the comment line and the keyword.
 <DD>
 <DT><SAMP>&lsquo;--extract-all&rsquo;</SAMP>
 <DD>
-<A NAME="IDX190"></A>
-<A NAME="IDX191"></A>
+<A NAME="IDX194"></A>
+<A NAME="IDX195"></A>
 Extract all strings.
 
 This option has an effect with most languages, namely C, C++, ObjectiveC,
@@ -255,13 +319,13 @@ GCC-source, Glade, Lua, JavaScript, Vala, GSettings.
 <DD>
 <DT><SAMP>&lsquo;--keyword[=<VAR>keywordspec</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX192"></A>
-<A NAME="IDX193"></A>
+<A NAME="IDX196"></A>
+<A NAME="IDX197"></A>
 Specify <VAR>keywordspec</VAR> as an additional keyword to be looked for.
 Without a <VAR>keywordspec</VAR>, the option means to not use default keywords.
 
-<A NAME="IDX194"></A>
-<A NAME="IDX195"></A>
+<A NAME="IDX198"></A>
+<A NAME="IDX199"></A>
 If <VAR>keywordspec</VAR> is a C identifier <VAR>id</VAR>, <CODE>xgettext</CODE> looks
 for strings in the first argument of each call to the function or macro
 <VAR>id</VAR>.  If <VAR>keywordspec</VAR> is of the form
@@ -406,13 +470,13 @@ used.
 
 <DT><SAMP>&lsquo;--flag=<VAR>word</VAR>:<VAR>arg</VAR>:<VAR>flag</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX196"></A>
+<A NAME="IDX200"></A>
 Specifies additional flags for strings occurring as part of the <VAR>arg</VAR>th
 argument of the function <VAR>word</VAR>.  The possible flags are the possible
 format string indicators, such as <SAMP>&lsquo;c-format&rsquo;</SAMP>, and their negations,
 such as <SAMP>&lsquo;no-c-format&rsquo;</SAMP>, possibly prefixed with <SAMP>&lsquo;pass-&rsquo;</SAMP>.
 <BR>
-<A NAME="IDX197"></A>
+<A NAME="IDX201"></A>
 The meaning of <CODE>--flag=<VAR>function</VAR>:<VAR>arg</VAR>:<VAR>lang</VAR>-format</CODE>
 is that in language <VAR>lang</VAR>, the specified <VAR>function</VAR> expects as
 <VAR>arg</VAR>th argument a format string.  (For those of you familiar with
@@ -430,7 +494,7 @@ together with the checks done by <SAMP>&lsquo;msgfmt -c&rsquo;</SAMP> it will en
 translators cannot accidentally use format string directives that would
 lead to a crash at runtime.
 <BR>
-<A NAME="IDX198"></A>
+<A NAME="IDX202"></A>
 The meaning of <CODE>--flag=<VAR>function</VAR>:<VAR>arg</VAR>:pass-<VAR>lang</VAR>-format</CODE>
 is that in language <VAR>lang</VAR>, if the <VAR>function</VAR> call occurs in a
 position that must yield a format string, then its <VAR>arg</VAR>th argument
@@ -457,44 +521,44 @@ GCC-source, Lua, JavaScript, Vala.
 <DD>
 <DT><SAMP>&lsquo;--trigraphs&rsquo;</SAMP>
 <DD>
-<A NAME="IDX199"></A>
-<A NAME="IDX200"></A>
-<A NAME="IDX201"></A>
+<A NAME="IDX203"></A>
+<A NAME="IDX204"></A>
+<A NAME="IDX205"></A>
 Understand ANSI C trigraphs for input.
 <BR>
 This option has an effect only with the languages C, C++, ObjectiveC.
 
 <DT><SAMP>&lsquo;--qt&rsquo;</SAMP>
 <DD>
-<A NAME="IDX202"></A>
-<A NAME="IDX203"></A>
+<A NAME="IDX206"></A>
+<A NAME="IDX207"></A>
 Recognize Qt format strings.
 <BR>
 This option has an effect only with the language C++.
 
 <DT><SAMP>&lsquo;--kde&rsquo;</SAMP>
 <DD>
-<A NAME="IDX204"></A>
-<A NAME="IDX205"></A>
+<A NAME="IDX208"></A>
+<A NAME="IDX209"></A>
 Recognize KDE 4 format strings.
 <BR>
 This option has an effect only with the language C++.
 
 <DT><SAMP>&lsquo;--boost&rsquo;</SAMP>
 <DD>
-<A NAME="IDX206"></A>
-<A NAME="IDX207"></A>
+<A NAME="IDX210"></A>
+<A NAME="IDX211"></A>
 Recognize Boost format strings.
 <BR>
 This option has an effect only with the language C++.
 
 <DT><SAMP>&lsquo;--debug&rsquo;</SAMP>
 <DD>
-<A NAME="IDX208"></A>
-<A NAME="IDX209"></A>
+<A NAME="IDX212"></A>
+<A NAME="IDX213"></A>
 Use the flags <CODE>c-format</CODE> and <CODE>possible-c-format</CODE> to show who was
 responsible for marking a message as a format string.  The latter form is
-used if the <CODE>xgettext</CODE> program decided, the format form is used if
+used if the <CODE>xgettext</CODE> program decided, the former form is used if
 the programmer prescribed it.
 
 By default only the <CODE>c-format</CODE> form is used.  The translator should
@@ -518,32 +582,32 @@ adjacent strings, and escaped end of lines for continued strings.
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX210"></A>
+<A NAME="IDX214"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX211"></A>
+<A NAME="IDX215"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX212"></A>
+<A NAME="IDX216"></A>
 Always write an output file even if no message is defined.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX213"></A>
-<A NAME="IDX214"></A>
+<A NAME="IDX217"></A>
+<A NAME="IDX218"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX215"></A>
+<A NAME="IDX219"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.  Note that using
 this option makes it harder for technically skilled translators to understand
 each message's context.
@@ -552,8 +616,8 @@ each message's context.
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX216"></A>
-<A NAME="IDX217"></A>
+<A NAME="IDX220"></A>
+<A NAME="IDX221"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -564,37 +628,49 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX218"></A>
+<A NAME="IDX222"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
 
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX219"></A>
+<A NAME="IDX223"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX220"></A>
+<A NAME="IDX224"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
+<DT><SAMP>&lsquo;--its=<VAR>file</VAR>&rsquo;</SAMP>
+<DD>
+<A NAME="IDX225"></A>
+Use ITS rules defined in <VAR>file</VAR>.
+Note that this is only effective with XML files.
+
+<DT><SAMP>&lsquo;--itstool&rsquo;</SAMP>
+<DD>
+<A NAME="IDX226"></A>
+Write out comments recognized by itstool (<A HREF="http://itstool.org">http://itstool.org</A>).
+Note that this is only effective with XML files.
+
 <DT><SAMP>&lsquo;-w <VAR>number</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX221"></A>
-<A NAME="IDX222"></A>
+<A NAME="IDX227"></A>
+<A NAME="IDX228"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX223"></A>
+<A NAME="IDX229"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -603,9 +679,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX224"></A>
-<A NAME="IDX225"></A>
-<A NAME="IDX226"></A>
+<A NAME="IDX230"></A>
+<A NAME="IDX231"></A>
+<A NAME="IDX232"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -613,16 +689,16 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX227"></A>
-<A NAME="IDX228"></A>
+<A NAME="IDX233"></A>
+<A NAME="IDX234"></A>
 Sort output by file location.
 
 <DT><SAMP>&lsquo;--omit-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX229"></A>
+<A NAME="IDX235"></A>
 Don't write header with <SAMP>&lsquo;msgid ""&rsquo;</SAMP> entry.
 
-<A NAME="IDX230"></A>
+<A NAME="IDX236"></A>
 This is useful for testing purposes because it eliminates a source
 of variance for generated <CODE>.gmo</CODE> files.  With <CODE>--omit-header</CODE>,
 two invocations of <CODE>xgettext</CODE> on the same files with the same
@@ -633,7 +709,7 @@ would not entirely be in ASCII.
 
 <DT><SAMP>&lsquo;--copyright-holder=<VAR>string</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX231"></A>
+<A NAME="IDX237"></A>
 Set the copyright holder in the output.  <VAR>string</VAR> should be the
 copyright holder of the surrounding package.  (Note that the msgstr
 strings, extracted from the package's sources, belong to the copyright
@@ -649,31 +725,31 @@ simply because <CODE>xgettext</CODE> was first used in the GNU project.
 
 <DT><SAMP>&lsquo;--foreign-user&rsquo;</SAMP>
 <DD>
-<A NAME="IDX232"></A>
+<A NAME="IDX238"></A>
 Omit FSF copyright in output.  This option is equivalent to
 <SAMP>&lsquo;--copyright-holder=”&rsquo;</SAMP>.  It can be useful for packages outside the GNU
 project that want their translations to be in the public domain.
 
 <DT><SAMP>&lsquo;--package-name=<VAR>package</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX233"></A>
+<A NAME="IDX239"></A>
 Set the package name in the header of the output.
 
 <DT><SAMP>&lsquo;--package-version=<VAR>version</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX234"></A>
+<A NAME="IDX240"></A>
 Set the package version in the header of the output.  This option has an
 effect only if the <SAMP>&lsquo;--package-name&rsquo;</SAMP> option is also used.
 
 <DT><SAMP>&lsquo;--msgid-bugs-address=<VAR>email@address</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX235"></A>
+<A NAME="IDX241"></A>
 Set the reporting address for msgid bugs.  This is the email address or URL
 to which the translators shall report bugs in the untranslated strings:
 
 
 <UL>
-<LI>Strings which are not entire sentences, see the maintainer guidelines
+<LI>Strings which are not entire sentences; see the maintainer guidelines
 
 in section <A HREF="gettext_4.html#SEC19">4.3  Preparing Translatable Strings</A>.
 <LI>Strings which use unclear terms or require additional context to be
@@ -701,16 +777,16 @@ Don't forget to specify this option.
 <DD>
 <DT><SAMP>&lsquo;--msgstr-prefix[=<VAR>string</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX236"></A>
-<A NAME="IDX237"></A>
+<A NAME="IDX242"></A>
+<A NAME="IDX243"></A>
 Use <VAR>string</VAR> (or "" if not specified) as prefix for msgstr values.
 
 <DT><SAMP>&lsquo;-M[<VAR>string</VAR>]&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgstr-suffix[=<VAR>string</VAR>]&rsquo;</SAMP>
 <DD>
-<A NAME="IDX238"></A>
-<A NAME="IDX239"></A>
+<A NAME="IDX244"></A>
+<A NAME="IDX245"></A>
 Use <VAR>string</VAR> (or "" if not specified) as suffix for msgstr values.
 
 </DL>
@@ -725,16 +801,16 @@ Use <VAR>string</VAR> (or "" if not specified) as suffix for msgstr values.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX240"></A>
-<A NAME="IDX241"></A>
+<A NAME="IDX246"></A>
+<A NAME="IDX247"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX242"></A>
-<A NAME="IDX243"></A>
+<A NAME="IDX248"></A>
+<A NAME="IDX249"></A>
 Output version information and exit.
 
 </DL>
diff --git a/gettext-tools/doc/gettext_6.html b/gettext-tools/doc/gettext_6.html
index 59c6858..fb0beb4 100644
--- a/gettext-tools/doc/gettext_6.html
+++ b/gettext-tools/doc/gettext_6.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 6  Creating a New PO File</TITLE>
@@ -13,7 +13,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_5.html">previous<
 
 <H1><A NAME="SEC37" HREF="gettext_toc.html#TOC37">6  Creating a New PO File</A></H1>
 <P>
-<A NAME="IDX244"></A>
+<A NAME="IDX250"></A>
 
 </P>
 <P>
@@ -48,20 +48,65 @@ the header entry of this file.
 <H2><A NAME="SEC38" HREF="gettext_toc.html#TOC38">6.1  Invoking the <CODE>msginit</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX245"></A>
-<A NAME="IDX246"></A>
+<A NAME="IDX251"></A>
+<A NAME="IDX252"></A>
 
 <PRE>
 msginit [<VAR>option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX247"></A>
-<A NAME="IDX248"></A>
+<A NAME="IDX253"></A>
+<A NAME="IDX254"></A>
 The <CODE>msginit</CODE> program creates a new PO file, initializing the meta
 information with values from the user's environment.
 
 </P>
+<P>
+Here are more details.  The following header fields of a PO file are
+automatically filled, when possible.
+
+</P>
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;Project-Id-Version&rsquo;</SAMP>
+<DD>
+The value is guessed from the <CODE>configure</CODE> script or any other files
+in the current directory.
+
+<DT><SAMP>&lsquo;PO-Revision-Date&rsquo;</SAMP>
+<DD>
+The value is taken from the <CODE>PO-Creation-Data</CODE> in the input POT
+file, or the current date is used.
+
+<DT><SAMP>&lsquo;Last-Translator&rsquo;</SAMP>
+<DD>
+The value is taken from user's password file entry and the mailer
+configuration files.
+
+<DT><SAMP>&lsquo;Language-Team, Language&rsquo;</SAMP>
+<DD>
+These values are set according to the current locale and the predefined
+list of translation teams.
+
+<DT><SAMP>&lsquo;MIME-Version, Content-Type, Content-Transfer-Encoding&rsquo;</SAMP>
+<DD>
+These values are set according to the content of the POT file and the
+current locale.  If the POT file contains charset=UTF-8, it means that
+the POT file contains non-ASCII characters, and we keep the UTF-8
+encoding.  Otherwise, when the POT file is plain ASCII, we use the
+locale's encoding.
+
+<DT><SAMP>&lsquo;Plural-Forms&rsquo;</SAMP>
+<DD>
+The value is first looked up from the embedded table.
+
+As an experimental feature, you can instruct <CODE>msginit</CODE> to use the
+information from Unicode CLDR, by setting the <CODE>GETTEXTCLDRDIR</CODE>
+environment variable.
+
+</DL>
+
 
 
 <H3><A NAME="SEC39" HREF="gettext_toc.html#TOC39">6.1.1  Input file location</A></H3>
@@ -72,8 +117,8 @@ information with values from the user's environment.
 <DD>
 <DT><SAMP>&lsquo;--input=<VAR>inputfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX249"></A>
-<A NAME="IDX250"></A>
+<A NAME="IDX255"></A>
+<A NAME="IDX256"></A>
 Input POT file.
 
 </DL>
@@ -93,8 +138,8 @@ POT file.  If it is <SAMP>&lsquo;-&rsquo;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX251"></A>
-<A NAME="IDX252"></A>
+<A NAME="IDX257"></A>
+<A NAME="IDX258"></A>
 Write output to specified PO file.
 
 </DL>
@@ -115,14 +160,14 @@ standard output.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX253"></A>
-<A NAME="IDX254"></A>
+<A NAME="IDX259"></A>
+<A NAME="IDX260"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX255"></A>
+<A NAME="IDX261"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -138,15 +183,15 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--locale=<VAR>ll_CC</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX256"></A>
-<A NAME="IDX257"></A>
+<A NAME="IDX262"></A>
+<A NAME="IDX263"></A>
 Set target locale.  <VAR>ll</VAR> should be a language code, and <VAR>CC</VAR> should
 be a country code.  The command <SAMP>&lsquo;locale -a&rsquo;</SAMP> can be used to output a list
 of all installed locales.  The default is the user's locale setting.
 
 <DT><SAMP>&lsquo;--no-translator&rsquo;</SAMP>
 <DD>
-<A NAME="IDX258"></A>
+<A NAME="IDX264"></A>
 Declares that the PO file will not have a human translator and is instead
 automatically generated.
 
@@ -154,13 +199,13 @@ automatically generated.
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX259"></A>
+<A NAME="IDX265"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX260"></A>
+<A NAME="IDX266"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
@@ -168,15 +213,15 @@ See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> opt
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX261"></A>
-<A NAME="IDX262"></A>
+<A NAME="IDX267"></A>
+<A NAME="IDX268"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX263"></A>
+<A NAME="IDX269"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -184,15 +229,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX264"></A>
-<A NAME="IDX265"></A>
+<A NAME="IDX270"></A>
+<A NAME="IDX271"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX266"></A>
+<A NAME="IDX272"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -209,16 +254,16 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX267"></A>
-<A NAME="IDX268"></A>
+<A NAME="IDX273"></A>
+<A NAME="IDX274"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX269"></A>
-<A NAME="IDX270"></A>
+<A NAME="IDX275"></A>
+<A NAME="IDX276"></A>
 Output version information and exit.
 
 </DL>
@@ -227,7 +272,7 @@ Output version information and exit.
 
 <H2><A NAME="SEC44" HREF="gettext_toc.html#TOC44">6.2  Filling in the Header Entry</A></H2>
 <P>
-<A NAME="IDX271"></A>
+<A NAME="IDX277"></A>
 
 </P>
 <P>
@@ -297,7 +342,7 @@ Before starting a translation, it is a good idea to get in touch with
 your translation team, not only to make sure you don't do duplicated work,
 but also to coordinate difficult linguistic issues.
 
-<A NAME="IDX272"></A>
+<A NAME="IDX278"></A>
 In the Free Translation Project, each translation team has its own mailing
 list.  The up-to-date list of teams can be found at the Free Translation
 Project's homepage, <A HREF="http://translationproject.org/">http://translationproject.org/</A>, in the "Teams"
@@ -313,7 +358,7 @@ forms:
 <LI>
 
 <SAMP>&lsquo;<VAR>ll</VAR>&rsquo;</SAMP>, an ISO 639 two-letter language code (lowercase).
-See section <A HREF="gettext_17.html#SEC325">A  Language Codes</A> for the list of codes.
+See section <A HREF="gettext_17.html#SEC331">A  Language Codes</A> for the list of codes.
 
 <LI>
 
@@ -322,8 +367,8 @@ language code (lowercase) and <SAMP>&lsquo;<VAR>CC</VAR>&rsquo;</SAMP> is an ISO
 country code (uppercase).  The country code specification is not redundant:
 Some languages have dialects in different countries.  For example,
 <SAMP>&lsquo;de_AT&rsquo;</SAMP> is used for Austria, and <SAMP>&lsquo;pt_BR&rsquo;</SAMP> for Brazil.  The country
-code serves to distinguish the dialects. See section <A HREF="gettext_17.html#SEC325">A  Language Codes</A> and
-section <A HREF="gettext_18.html#SEC328">B  Country Codes</A> for the lists of codes.
+code serves to distinguish the dialects. See section <A HREF="gettext_17.html#SEC331">A  Language Codes</A> and
+section <A HREF="gettext_18.html#SEC334">B  Country Codes</A> for the lists of codes.
 
 <LI>
 
@@ -362,14 +407,14 @@ PO files is just <SAMP>&lsquo;de&rsquo;</SAMP>.
 
 <DT>Content-Type
 <DD>
-<A NAME="IDX273"></A>
-<A NAME="IDX274"></A>
+<A NAME="IDX279"></A>
+<A NAME="IDX280"></A>
 Replace <SAMP>&lsquo;CHARSET&rsquo;</SAMP> with the character encoding used for your language,
 in your locale, or UTF-8.  This field is needed for correct operation of the
 <CODE>msgmerge</CODE> and <CODE>msgfmt</CODE> programs, as well as for users whose
-locale's character encoding differs from yours (see section <A HREF="gettext_11.html#SEC187">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>).
+locale's character encoding differs from yours (see section <A HREF="gettext_11.html#SEC188">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>).
 
-<A NAME="IDX275"></A>
+<A NAME="IDX281"></A>
 You get the character encoding of your locale by running the shell command
 <SAMP>&lsquo;locale charmap&rsquo;</SAMP>.  If the result is <SAMP>&lsquo;C&rsquo;</SAMP> or <SAMP>&lsquo;ANSI_X3.4-1968&rsquo;</SAMP>,
 which is equivalent to <SAMP>&lsquo;ASCII&rsquo;</SAMP> (= <SAMP>&lsquo;US-ASCII&rsquo;</SAMP>), it means that your
@@ -377,7 +422,7 @@ locale is not correctly configured.  In this case, ask your translation
 team which charset to use.  <SAMP>&lsquo;ASCII&rsquo;</SAMP> is not usable for any language
 except Latin.
 
-<A NAME="IDX276"></A>
+<A NAME="IDX282"></A>
 Because the PO files must be portable to operating systems with less advanced
 internationalization facilities, the character encodings that can be used
 are limited to those supported by both GNU <CODE>libc</CODE> and GNU
@@ -394,11 +439,11 @@ are limited to those supported by both GNU <CODE>libc</CODE> and GNU
 <CODE>BIG5</CODE>, <CODE>BIG5-HKSCS</CODE>, <CODE>GBK</CODE>, <CODE>GB18030</CODE>, <CODE>SHIFT_JIS</CODE>,
 <CODE>JOHAB</CODE>, <CODE>TIS-620</CODE>, <CODE>VISCII</CODE>, <CODE>GEORGIAN-PS</CODE>, <CODE>UTF-8</CODE>.
 
-<A NAME="IDX277"></A>
+<A NAME="IDX283"></A>
 In the GNU system, the following encodings are frequently used for the
 corresponding languages.
 
-<A NAME="IDX278"></A>
+<A NAME="IDX284"></A>
 
 <UL>
 <LI><CODE>ISO-8859-1</CODE> for
@@ -458,8 +503,8 @@ for traditional writing of Chinese,
 
 </UL>
 
-<A NAME="IDX279"></A>
-<A NAME="IDX280"></A>
+<A NAME="IDX285"></A>
+<A NAME="IDX286"></A>
 When single quote characters or double quote characters are used in
 translations for your language, and your locale's encoding is one of the
 ISO-8859-* charsets, it is best if you create your PO files in UTF-8
@@ -471,7 +516,7 @@ real quote characters, whereas users in ISO-8859-* locales will see the
 vertical apostrophe and the vertical double quote instead (because that's
 what the character set conversion will transliterate them to).
 
-<A NAME="IDX281"></A>
+<A NAME="IDX287"></A>
 To enter such quote characters under X11, you can change your keyboard
 mapping using the <CODE>xmodmap</CODE> program.  The X11 names of the quote
 characters are "leftsinglequotemark", "rightsinglequotemark",
@@ -493,8 +538,8 @@ Set this to <CODE>8bit</CODE>.
 <DD>
 This field is optional.  It is only needed if the PO file has plural forms.
 You can find them by searching for the <SAMP>&lsquo;msgid_plural&rsquo;</SAMP> keyword.  The
-format of the plural forms field is described in section <A HREF="gettext_11.html#SEC189">11.2.6  Additional functions for plural forms</A> and
-section <A HREF="gettext_12.html#SEC210">12.6  Translating plural forms</A>.
+format of the plural forms field is described in section <A HREF="gettext_11.html#SEC190">11.2.6  Additional functions for plural forms</A> and
+section <A HREF="gettext_12.html#SEC211">12.6  Translating plural forms</A>.
 </DL>
 
 <P><HR><P>
diff --git a/gettext-tools/doc/gettext_7.html b/gettext-tools/doc/gettext_7.html
index ae3a7a0..edb120f 100644
--- a/gettext-tools/doc/gettext_7.html
+++ b/gettext-tools/doc/gettext_7.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 7  Updating Existing PO Files</TITLE>
@@ -18,8 +18,8 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_6.html">previous<
 <H2><A NAME="SEC46" HREF="gettext_toc.html#TOC46">7.1  Invoking the <CODE>msgmerge</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX282"></A>
-<A NAME="IDX283"></A>
+<A NAME="IDX288"></A>
+<A NAME="IDX289"></A>
 
 <PRE>
 msgmerge [<VAR>option</VAR>] <VAR>def</VAR>.po <VAR>ref</VAR>.pot
@@ -56,8 +56,8 @@ References to the new sources.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX284"></A>
-<A NAME="IDX285"></A>
+<A NAME="IDX290"></A>
+<A NAME="IDX291"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -66,8 +66,8 @@ file will be written relative to the current directory, though.
 <DD>
 <DT><SAMP>&lsquo;--compendium=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX286"></A>
-<A NAME="IDX287"></A>
+<A NAME="IDX292"></A>
+<A NAME="IDX293"></A>
 Specify an additional library of message translations.  See section <A HREF="gettext_8.html#SEC72">8.4  Using Translation Compendia</A>.
 This option may be specified more than once.
 
@@ -83,8 +83,8 @@ This option may be specified more than once.
 <DD>
 <DT><SAMP>&lsquo;--update&rsquo;</SAMP>
 <DD>
-<A NAME="IDX288"></A>
-<A NAME="IDX289"></A>
+<A NAME="IDX294"></A>
+<A NAME="IDX295"></A>
 Update <VAR>def</VAR>.po.  Do nothing if <VAR>def</VAR>.po is already up to date.
 
 </DL>
@@ -99,14 +99,14 @@ Update <VAR>def</VAR>.po.  Do nothing if <VAR>def</VAR>.po is already up to date
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX290"></A>
-<A NAME="IDX291"></A>
+<A NAME="IDX296"></A>
+<A NAME="IDX297"></A>
 Write output to specified file.
 
 </DL>
 
 <P>
-<A NAME="IDX292"></A>
+<A NAME="IDX298"></A>
 The results are written to standard output if no output file is specified
 or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 
@@ -123,19 +123,19 @@ The result is written back to <VAR>def</VAR>.po.
 
 <DT><SAMP>&lsquo;--backup=<VAR>control</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX293"></A>
-<A NAME="IDX294"></A>
+<A NAME="IDX299"></A>
+<A NAME="IDX300"></A>
 Make a backup of <VAR>def</VAR>.po
 
 <DT><SAMP>&lsquo;--suffix=<VAR>suffix</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX295"></A>
+<A NAME="IDX301"></A>
 Override the usual backup suffix.
 
 </DL>
 
 <P>
-<A NAME="IDX296"></A>
+<A NAME="IDX302"></A>
 The version control method may be selected via the <CODE>--backup</CODE> option
 or through the <CODE>VERSION_CONTROL</CODE> environment variable.  Here are the
 values:
@@ -185,22 +185,22 @@ The backup suffix is <SAMP>&lsquo;~&rsquo;</SAMP>, unless set with <CODE>--suffi
 <DD>
 <DT><SAMP>&lsquo;--multi-domain&rsquo;</SAMP>
 <DD>
-<A NAME="IDX297"></A>
-<A NAME="IDX298"></A>
+<A NAME="IDX303"></A>
+<A NAME="IDX304"></A>
 Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 <DT><SAMP>&lsquo;-N&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--no-fuzzy-matching&rsquo;</SAMP>
 <DD>
-<A NAME="IDX299"></A>
-<A NAME="IDX300"></A>
+<A NAME="IDX305"></A>
+<A NAME="IDX306"></A>
 Do not use fuzzy matching when an exact match is not found.  This may speed
 up the operation considerably.
 
 <DT><SAMP>&lsquo;--previous&rsquo;</SAMP>
 <DD>
-<A NAME="IDX301"></A>
+<A NAME="IDX307"></A>
 Keep the previous msgids of translated messages, marked with <SAMP>&lsquo;#|&rsquo;</SAMP>, when
 adding the fuzzy marker to such messages.
 </DL>
@@ -215,14 +215,14 @@ adding the fuzzy marker to such messages.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX302"></A>
-<A NAME="IDX303"></A>
+<A NAME="IDX308"></A>
+<A NAME="IDX309"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX304"></A>
+<A NAME="IDX310"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -236,7 +236,7 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 
 <DT><SAMP>&lsquo;--lang=<VAR>catalogname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX305"></A>
+<A NAME="IDX311"></A>
 Specify the <SAMP>&lsquo;Language&rsquo;</SAMP> field to be used in the header entry.  See
 section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for the meaning of this field.  Note: The
 <SAMP>&lsquo;Language-Team&rsquo;</SAMP> and <SAMP>&lsquo;Plural-Forms&rsquo;</SAMP> fields are left unchanged.
@@ -247,39 +247,39 @@ best as possible, from the <SAMP>&lsquo;Language-Team&rsquo;</SAMP> field.
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX306"></A>
+<A NAME="IDX312"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX307"></A>
+<A NAME="IDX313"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX308"></A>
+<A NAME="IDX314"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX309"></A>
-<A NAME="IDX310"></A>
+<A NAME="IDX315"></A>
+<A NAME="IDX316"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX311"></A>
+<A NAME="IDX317"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX312"></A>
+<A NAME="IDX318"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -290,7 +290,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX313"></A>
+<A NAME="IDX319"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -299,15 +299,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX314"></A>
-<A NAME="IDX315"></A>
+<A NAME="IDX320"></A>
+<A NAME="IDX321"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX316"></A>
+<A NAME="IDX322"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -315,15 +315,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX317"></A>
-<A NAME="IDX318"></A>
+<A NAME="IDX323"></A>
+<A NAME="IDX324"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX319"></A>
+<A NAME="IDX325"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -332,9 +332,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX320"></A>
-<A NAME="IDX321"></A>
-<A NAME="IDX322"></A>
+<A NAME="IDX326"></A>
+<A NAME="IDX327"></A>
+<A NAME="IDX328"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -342,8 +342,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX323"></A>
-<A NAME="IDX324"></A>
+<A NAME="IDX329"></A>
+<A NAME="IDX330"></A>
 Sort output by file location.
 
 </DL>
@@ -358,24 +358,24 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX325"></A>
-<A NAME="IDX326"></A>
+<A NAME="IDX331"></A>
+<A NAME="IDX332"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX327"></A>
-<A NAME="IDX328"></A>
+<A NAME="IDX333"></A>
+<A NAME="IDX334"></A>
 Output version information and exit.
 
 <DT><SAMP>&lsquo;-v&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--verbose&rsquo;</SAMP>
 <DD>
-<A NAME="IDX329"></A>
-<A NAME="IDX330"></A>
+<A NAME="IDX335"></A>
+<A NAME="IDX336"></A>
 Increase verbosity level.
 
 <DT><SAMP>&lsquo;-q&rsquo;</SAMP>
@@ -384,9 +384,9 @@ Increase verbosity level.
 <DD>
 <DT><SAMP>&lsquo;--silent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX331"></A>
-<A NAME="IDX332"></A>
-<A NAME="IDX333"></A>
+<A NAME="IDX337"></A>
+<A NAME="IDX338"></A>
+<A NAME="IDX339"></A>
 Suppress progress indicators.
 
 </DL>
diff --git a/gettext-tools/doc/gettext_8.html b/gettext-tools/doc/gettext_8.html
index 2f5af01..3320583 100644
--- a/gettext-tools/doc/gettext_8.html
+++ b/gettext-tools/doc/gettext_8.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 8  Editing PO Files</TITLE>
@@ -13,7 +13,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_7.html">previous<
 
 <H1><A NAME="SEC55" HREF="gettext_toc.html#TOC55">8  Editing PO Files</A></H1>
 <P>
-<A NAME="IDX334"></A>
+<A NAME="IDX340"></A>
 
 </P>
 
@@ -21,21 +21,21 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_7.html">previous<
 
 <H2><A NAME="SEC56" HREF="gettext_toc.html#TOC56">8.1  KDE's PO File Editor</A></H2>
 <P>
-<A NAME="IDX335"></A>
+<A NAME="IDX341"></A>
 
 </P>
 
 
 <H2><A NAME="SEC57" HREF="gettext_toc.html#TOC57">8.2  GNOME's PO File Editor</A></H2>
 <P>
-<A NAME="IDX336"></A>
+<A NAME="IDX342"></A>
 
 </P>
 
 
 <H2><A NAME="SEC58" HREF="gettext_toc.html#TOC58">8.3  Emacs's PO File Editor</A></H2>
 <P>
-<A NAME="IDX337"></A>
+<A NAME="IDX343"></A>
 
 </P>
 
@@ -64,8 +64,8 @@ For the beginning, besides main PO mode commands
 <H3><A NAME="SEC59" HREF="gettext_toc.html#TOC59">8.3.1  Completing GNU <CODE>gettext</CODE> Installation</A></H3>
 
 <P>
-<A NAME="IDX338"></A>
-<A NAME="IDX339"></A>
+<A NAME="IDX344"></A>
+<A NAME="IDX345"></A>
 Once you have received, unpacked, configured and compiled the GNU
 <CODE>gettext</CODE> distribution, the <SAMP>&lsquo;make install&rsquo;</SAMP> command puts in
 place the programs <CODE>xgettext</CODE>, <CODE>msgfmt</CODE>, <CODE>gettext</CODE>, and
@@ -75,8 +75,8 @@ PO mode available to your Emacs users.
 
 </P>
 <P>
-<A NAME="IDX340"></A>
-<A NAME="IDX341"></A>
+<A NAME="IDX346"></A>
+<A NAME="IDX347"></A>
 During the installation of the PO mode, you might want to modify your
 file <TT>&lsquo;.emacs&rsquo;</TT>, once and for all, so it contains a few lines looking
 like:
@@ -126,8 +126,8 @@ button 1).
 <H3><A NAME="SEC60" HREF="gettext_toc.html#TOC60">8.3.2  Main PO mode Commands</A></H3>
 
 <P>
-<A NAME="IDX342"></A>
-<A NAME="IDX343"></A>
+<A NAME="IDX348"></A>
+<A NAME="IDX349"></A>
 After setting up Emacs with something similar to the lines in
 section <A HREF="gettext_8.html#SEC59">8.3.1  Completing GNU <CODE>gettext</CODE> Installation</A>, PO mode is activated for a window when Emacs finds a
 PO file in that window.  This puts the window read-only and establishes a
@@ -159,47 +159,47 @@ in special ways.
 
 <DT><KBD>_</KBD>
 <DD>
-<A NAME="IDX344"></A>
+<A NAME="IDX350"></A>
 Undo last modification to the PO file (<CODE>po-undo</CODE>).
 
 <DT><KBD>Q</KBD>
 <DD>
-<A NAME="IDX345"></A>
+<A NAME="IDX351"></A>
 Quit processing and save the PO file (<CODE>po-quit</CODE>).
 
 <DT><KBD>q</KBD>
 <DD>
-<A NAME="IDX346"></A>
+<A NAME="IDX352"></A>
 Quit processing, possibly after confirmation (<CODE>po-confirm-and-quit</CODE>).
 
 <DT><KBD>0</KBD>
 <DD>
-<A NAME="IDX347"></A>
+<A NAME="IDX353"></A>
 Temporary leave the PO file window (<CODE>po-other-window</CODE>).
 
 <DT><KBD>?</KBD>
 <DD>
 <DT><KBD>h</KBD>
 <DD>
-<A NAME="IDX348"></A>
-<A NAME="IDX349"></A>
+<A NAME="IDX354"></A>
+<A NAME="IDX355"></A>
 Show help about PO mode (<CODE>po-help</CODE>).
 
 <DT><KBD>=</KBD>
 <DD>
-<A NAME="IDX350"></A>
+<A NAME="IDX356"></A>
 Give some PO file statistics (<CODE>po-statistics</CODE>).
 
 <DT><KBD>V</KBD>
 <DD>
-<A NAME="IDX351"></A>
+<A NAME="IDX357"></A>
 Batch validate the format of the whole PO file (<CODE>po-validate</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX352"></A>
-<A NAME="IDX353"></A>
+<A NAME="IDX358"></A>
+<A NAME="IDX359"></A>
 The command <KBD>_</KBD> (<CODE>po-undo</CODE>) interfaces to the Emacs
 <EM>undo</EM> facility.  See section ‘Undoing Changes’ in <CITE>The Emacs Editor</CITE>.  Each time <KBD>_</KBD> is typed, modifications which the translator
 did to the PO file are undone a little more.  For the purpose of
@@ -211,10 +211,10 @@ can undo the edition work quite parsimoniously.
 
 </P>
 <P>
-<A NAME="IDX354"></A>
-<A NAME="IDX355"></A>
-<A NAME="IDX356"></A>
-<A NAME="IDX357"></A>
+<A NAME="IDX360"></A>
+<A NAME="IDX361"></A>
+<A NAME="IDX362"></A>
+<A NAME="IDX363"></A>
 The commands <KBD>Q</KBD> (<CODE>po-quit</CODE>) and <KBD>q</KBD>
 (<CODE>po-confirm-and-quit</CODE>) are used when the translator is done with the
 PO file.  The former is a bit less verbose than the latter.  If the file
@@ -227,8 +227,8 @@ of an Emacs PO file buffer.  Merely killing it through the usual command
 
 </P>
 <P>
-<A NAME="IDX358"></A>
-<A NAME="IDX359"></A>
+<A NAME="IDX364"></A>
+<A NAME="IDX365"></A>
 The command <KBD>0</KBD> (<CODE>po-other-window</CODE>) is another, softer way,
 to leave PO mode, temporarily.  It just moves the cursor to some other
 Emacs window, and pops one if necessary.  For example, if the translator
@@ -242,9 +242,9 @@ PO mode is then recovered.
 
 </P>
 <P>
-<A NAME="IDX360"></A>
-<A NAME="IDX361"></A>
-<A NAME="IDX362"></A>
+<A NAME="IDX366"></A>
+<A NAME="IDX367"></A>
+<A NAME="IDX368"></A>
 The command <KBD>h</KBD> (<CODE>po-help</CODE>) displays a summary of all available PO
 mode commands.  The translator should then type any character to resume
 normal PO mode operations.  The command <KBD>?</KBD> has the same effect
@@ -252,8 +252,8 @@ as <KBD>h</KBD>.
 
 </P>
 <P>
-<A NAME="IDX363"></A>
-<A NAME="IDX364"></A>
+<A NAME="IDX369"></A>
+<A NAME="IDX370"></A>
 The command <KBD>=</KBD> (<CODE>po-statistics</CODE>) computes the total number of
 entries in the PO file, the ordinal of the current entry (counted from
 1), the number of untranslated entries, the number of obsolete entries,
@@ -261,8 +261,8 @@ and displays all these numbers.
 
 </P>
 <P>
-<A NAME="IDX365"></A>
-<A NAME="IDX366"></A>
+<A NAME="IDX371"></A>
+<A NAME="IDX372"></A>
 The command <KBD>V</KBD> (<CODE>po-validate</CODE>) launches <CODE>msgfmt</CODE> in
 checking and verbose
 mode over the current PO file.  This command first offers to save the
@@ -273,7 +273,7 @@ as well as all individual entries.
 
 </P>
 <P>
-<A NAME="IDX367"></A>
+<A NAME="IDX373"></A>
 The program <CODE>msgfmt</CODE> runs asynchronously with Emacs, so the
 translator regains control immediately while her PO file is being studied.
 Error output is collected in the Emacs <SAMP>&lsquo;*compilation*&rsquo;</SAMP> buffer,
@@ -289,7 +289,7 @@ any PO mode action which would help correcting the error.
 <H3><A NAME="SEC61" HREF="gettext_toc.html#TOC61">8.3.3  Entry Positioning</A></H3>
 
 <P>
-<A NAME="IDX368"></A>
+<A NAME="IDX374"></A>
 The cursor in a PO file window is almost always part of
 an entry.  The only exceptions are the special case when the cursor
 is after the last entry in the file, or when the PO file is
@@ -300,7 +300,7 @@ the PO file, this also selects on which entry commands operate.
 
 </P>
 <P>
-<A NAME="IDX369"></A>
+<A NAME="IDX375"></A>
 Some PO mode commands alter the position of the cursor in a specialized
 way.  A few of those special purpose positioning are described here,
 the others are described in following sections (for a complete list try
@@ -311,51 +311,51 @@ the others are described in following sections (for a complete list try
 
 <DT><KBD>.</KBD>
 <DD>
-<A NAME="IDX370"></A>
+<A NAME="IDX376"></A>
 Redisplay the current entry (<CODE>po-current-entry</CODE>).
 
 <DT><KBD>n</KBD>
 <DD>
-<A NAME="IDX371"></A>
+<A NAME="IDX377"></A>
 Select the entry after the current one (<CODE>po-next-entry</CODE>).
 
 <DT><KBD>p</KBD>
 <DD>
-<A NAME="IDX372"></A>
+<A NAME="IDX378"></A>
 Select the entry before the current one (<CODE>po-previous-entry</CODE>).
 
 <DT><KBD>&#60;</KBD>
 <DD>
-<A NAME="IDX373"></A>
+<A NAME="IDX379"></A>
 Select the first entry in the PO file (<CODE>po-first-entry</CODE>).
 
 <DT><KBD>&#62;</KBD>
 <DD>
-<A NAME="IDX374"></A>
+<A NAME="IDX380"></A>
 Select the last entry in the PO file (<CODE>po-last-entry</CODE>).
 
 <DT><KBD>m</KBD>
 <DD>
-<A NAME="IDX375"></A>
+<A NAME="IDX381"></A>
 Record the location of the current entry for later use
 (<CODE>po-push-location</CODE>).
 
 <DT><KBD>r</KBD>
 <DD>
-<A NAME="IDX376"></A>
+<A NAME="IDX382"></A>
 Return to a previously saved entry location (<CODE>po-pop-location</CODE>).
 
 <DT><KBD>x</KBD>
 <DD>
-<A NAME="IDX377"></A>
+<A NAME="IDX383"></A>
 Exchange the current entry location with the previously saved one
 (<CODE>po-exchange-location</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX378"></A>
-<A NAME="IDX379"></A>
+<A NAME="IDX384"></A>
+<A NAME="IDX385"></A>
 Any Emacs command able to reposition the cursor may be used
 to select the current entry in PO mode, including commands which
 move by characters, lines, paragraphs, screens or pages, and search
@@ -384,10 +384,10 @@ how <EM>others</EM> should do translation.
 
 </P>
 <P>
-<A NAME="IDX380"></A>
-<A NAME="IDX381"></A>
-<A NAME="IDX382"></A>
-<A NAME="IDX383"></A>
+<A NAME="IDX386"></A>
+<A NAME="IDX387"></A>
+<A NAME="IDX388"></A>
+<A NAME="IDX389"></A>
 The commands <KBD>n</KBD> (<CODE>po-next-entry</CODE>) and <KBD>p</KBD>
 (<CODE>po-previous-entry</CODE>) move the cursor the entry following,
 or preceding, the current one.  If <KBD>n</KBD> is given while the
@@ -396,10 +396,10 @@ is given while the cursor is on the first entry, no move is done.
 
 </P>
 <P>
-<A NAME="IDX384"></A>
-<A NAME="IDX385"></A>
-<A NAME="IDX386"></A>
-<A NAME="IDX387"></A>
+<A NAME="IDX390"></A>
+<A NAME="IDX391"></A>
+<A NAME="IDX392"></A>
+<A NAME="IDX393"></A>
 The commands <KBD>&#60;</KBD> (<CODE>po-first-entry</CODE>) and <KBD>&#62;</KBD>
 (<CODE>po-last-entry</CODE>) move the cursor to the first entry, or last
 entry, of the PO file.  When the cursor is located past the last
@@ -422,10 +422,10 @@ register for getting back, or else, use the location ring.
 
 </P>
 <P>
-<A NAME="IDX388"></A>
-<A NAME="IDX389"></A>
-<A NAME="IDX390"></A>
-<A NAME="IDX391"></A>
+<A NAME="IDX394"></A>
+<A NAME="IDX395"></A>
+<A NAME="IDX396"></A>
+<A NAME="IDX397"></A>
 PO mode offers another approach, by which cursor locations may be saved
 onto a special stack.  The command <KBD>m</KBD> (<CODE>po-push-location</CODE>)
 merely adds the location of current entry to the stack, pushing
@@ -445,8 +445,8 @@ ought to use <KBD>m</KBD> immediately after <KBD>r</KBD>.
 
 </P>
 <P>
-<A NAME="IDX392"></A>
-<A NAME="IDX393"></A>
+<A NAME="IDX398"></A>
+<A NAME="IDX399"></A>
 The command <KBD>x</KBD> (<CODE>po-exchange-location</CODE>) simultaneously
 repositions the cursor to the entry associated with the top element of
 the stack of saved locations, and replaces that top element with the
@@ -461,7 +461,7 @@ merely use <KBD>x</KBD> for making the switch.
 
 <H3><A NAME="SEC62" HREF="gettext_toc.html#TOC62">8.3.4  Normalizing Strings in Entries</A></H3>
 <P>
-<A NAME="IDX394"></A>
+<A NAME="IDX400"></A>
 
 </P>
 <P>
@@ -495,12 +495,12 @@ command is available:
 
 </P>
 <P>
-<A NAME="IDX395"></A>
+<A NAME="IDX401"></A>
 <DL COMPACT>
 
 <DT><KBD>M-x po-normalize</KBD>
 <DD>
-<A NAME="IDX396"></A>
+<A NAME="IDX402"></A>
 Tidy the whole PO file by making entries more uniform.
 
 </DL>
@@ -532,7 +532,7 @@ for continued lines.
 
 </P>
 <P>
-<A NAME="IDX397"></A>
+<A NAME="IDX403"></A>
 Having such an explicit normalizing command allows for importing PO
 files from other sources, but also eases the evolution of the current
 convention, evolution driven mostly by aesthetic concerns, as of now.
@@ -545,7 +545,7 @@ their PO files in nice ways.
 
 </P>
 <P>
-<A NAME="IDX398"></A>
+<A NAME="IDX404"></A>
 Right now, in PO mode, strings are single line or multi-line.  A string
 goes multi-line if and only if it has <EM>embedded</EM> newlines, that
 is, if it matches <SAMP>&lsquo;[^\n]\n+[^\n]&rsquo;</SAMP>.  So, we would have:
@@ -598,7 +598,7 @@ to be documented in this manual, once these questions settle.
 
 <H3><A NAME="SEC63" HREF="gettext_toc.html#TOC63">8.3.5  Translated Entries</A></H3>
 <P>
-<A NAME="IDX399"></A>
+<A NAME="IDX405"></A>
 
 </P>
 <P>
@@ -610,7 +610,7 @@ Other entry types will be excluded; translation will not occur for them.
 
 </P>
 <P>
-<A NAME="IDX400"></A>
+<A NAME="IDX406"></A>
 Some commands are more specifically related to translated entry processing.
 
 </P>
@@ -618,21 +618,21 @@ Some commands are more specifically related to translated entry processing.
 
 <DT><KBD>t</KBD>
 <DD>
-<A NAME="IDX401"></A>
+<A NAME="IDX407"></A>
 Find the next translated entry (<CODE>po-next-translated-entry</CODE>).
 
 <DT><KBD>T</KBD>
 <DD>
-<A NAME="IDX402"></A>
+<A NAME="IDX408"></A>
 Find the previous translated entry (<CODE>po-previous-translated-entry</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX403"></A>
-<A NAME="IDX404"></A>
-<A NAME="IDX405"></A>
-<A NAME="IDX406"></A>
+<A NAME="IDX409"></A>
+<A NAME="IDX410"></A>
+<A NAME="IDX411"></A>
+<A NAME="IDX412"></A>
 The commands <KBD>t</KBD> (<CODE>po-next-translated-entry</CODE>) and <KBD>T</KBD>
 (<CODE>po-previous-translated-entry</CODE>) move forwards or backwards, chasing
 for an translated entry.  If none is found, the search is extended and
@@ -640,7 +640,7 @@ wraps around in the PO file buffer.
 
 </P>
 <P>
-<A NAME="IDX407"></A>
+<A NAME="IDX413"></A>
 Translated entries usually result from the translator having edited in
 a translation for them, section <A HREF="gettext_8.html#SEC67">8.3.9  Modifying Translations</A>.  However, if the
 variable <CODE>po-auto-fuzzy-on-edit</CODE> is not <CODE>nil</CODE>, the entry having
@@ -653,12 +653,12 @@ See section <A HREF="gettext_8.html#SEC64">8.3.6  Fuzzy Entries</A>.
 
 <H3><A NAME="SEC64" HREF="gettext_toc.html#TOC64">8.3.6  Fuzzy Entries</A></H3>
 <P>
-<A NAME="IDX408"></A>
+<A NAME="IDX414"></A>
 
 </P>
 <P>
-<A NAME="IDX409"></A>
-<A NAME="IDX410"></A>
+<A NAME="IDX415"></A>
+<A NAME="IDX416"></A>
 Each PO file entry may have a set of <EM>attributes</EM>, which are
 qualities given a name and explicitly associated with the translation,
 using a special system comment.  One of these attributes
@@ -681,7 +681,7 @@ might mark some entries as being fuzzy.
 
 </P>
 <P>
-<A NAME="IDX411"></A>
+<A NAME="IDX417"></A>
 Also, the translator may decide herself to mark an entry as fuzzy
 for her own convenience, when she wants to remember that the entry
 has to be later revisited.  So, some commands are more specifically
@@ -692,26 +692,26 @@ related to fuzzy entry processing.
 
 <DT><KBD>f</KBD>
 <DD>
-<A NAME="IDX412"></A>
+<A NAME="IDX418"></A>
 Find the next fuzzy entry (<CODE>po-next-fuzzy-entry</CODE>).
 
 <DT><KBD>F</KBD>
 <DD>
-<A NAME="IDX413"></A>
+<A NAME="IDX419"></A>
 Find the previous fuzzy entry (<CODE>po-previous-fuzzy-entry</CODE>).
 
 <DT><KBD><KBD>TAB</KBD></KBD>
 <DD>
-<A NAME="IDX414"></A>
+<A NAME="IDX420"></A>
 Remove the fuzzy attribute of the current entry (<CODE>po-unfuzzy</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX415"></A>
-<A NAME="IDX416"></A>
-<A NAME="IDX417"></A>
-<A NAME="IDX418"></A>
+<A NAME="IDX421"></A>
+<A NAME="IDX422"></A>
+<A NAME="IDX423"></A>
+<A NAME="IDX424"></A>
 The commands <KBD>f</KBD> (<CODE>po-next-fuzzy-entry</CODE>) and <KBD>F</KBD>
 (<CODE>po-previous-fuzzy-entry</CODE>) move forwards or backwards, chasing for
 a fuzzy entry.  If none is found, the search is extended and wraps
@@ -719,9 +719,9 @@ around in the PO file buffer.
 
 </P>
 <P>
-<A NAME="IDX419"></A>
-<A NAME="IDX420"></A>
-<A NAME="IDX421"></A>
+<A NAME="IDX425"></A>
+<A NAME="IDX426"></A>
+<A NAME="IDX427"></A>
 The command <KBD><KBD>TAB</KBD></KBD> (<CODE>po-unfuzzy</CODE>) removes the fuzzy
 attribute associated with an entry, usually leaving it translated.
 Further, if the variable <CODE>po-auto-select-on-unfuzzy</CODE> has not
@@ -743,8 +743,8 @@ to chase another entry, leaving the entry fuzzy.
 
 </P>
 <P>
-<A NAME="IDX422"></A>
-<A NAME="IDX423"></A>
+<A NAME="IDX428"></A>
+<A NAME="IDX429"></A>
 The translator may also use the <KBD><KBD>DEL</KBD></KBD> command
 (<CODE>po-fade-out-entry</CODE>) over any translated entry to mark it as being
 fuzzy, when she wants to easily leave a trace she wants to later return
@@ -761,7 +761,7 @@ still exists.
 
 <H3><A NAME="SEC65" HREF="gettext_toc.html#TOC65">8.3.7  Untranslated Entries</A></H3>
 <P>
-<A NAME="IDX424"></A>
+<A NAME="IDX430"></A>
 
 </P>
 <P>
@@ -781,7 +781,7 @@ are easily recognizable by the fact they end with <SAMP>&lsquo;msgstr ""&rsquo;<
 
 </P>
 <P>
-<A NAME="IDX425"></A>
+<A NAME="IDX431"></A>
 The work of the translator might be (quite naively) seen as the process
 of seeking for an untranslated entry, editing a translation for
 it, and repeating these actions until no untranslated entries remain.
@@ -793,26 +793,26 @@ processing.
 
 <DT><KBD>u</KBD>
 <DD>
-<A NAME="IDX426"></A>
+<A NAME="IDX432"></A>
 Find the next untranslated entry (<CODE>po-next-untranslated-entry</CODE>).
 
 <DT><KBD>U</KBD>
 <DD>
-<A NAME="IDX427"></A>
+<A NAME="IDX433"></A>
 Find the previous untranslated entry (<CODE>po-previous-untransted-entry</CODE>).
 
 <DT><KBD>k</KBD>
 <DD>
-<A NAME="IDX428"></A>
+<A NAME="IDX434"></A>
 Turn the current entry into an untranslated one (<CODE>po-kill-msgstr</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX429"></A>
-<A NAME="IDX430"></A>
-<A NAME="IDX431"></A>
-<A NAME="IDX432"></A>
+<A NAME="IDX435"></A>
+<A NAME="IDX436"></A>
+<A NAME="IDX437"></A>
+<A NAME="IDX438"></A>
 The commands <KBD>u</KBD> (<CODE>po-next-untranslated-entry</CODE>) and <KBD>U</KBD>
 (<CODE>po-previous-untransted-entry</CODE>) move forwards or backwards,
 chasing for an untranslated entry.  If none is found, the search is
@@ -820,8 +820,8 @@ extended and wraps around in the PO file buffer.
 
 </P>
 <P>
-<A NAME="IDX433"></A>
-<A NAME="IDX434"></A>
+<A NAME="IDX439"></A>
+<A NAME="IDX440"></A>
 An entry can be turned back into an untranslated entry by
 merely emptying its translation, using the command <KBD>k</KBD>
 (<CODE>po-kill-msgstr</CODE>).  See section <A HREF="gettext_8.html#SEC67">8.3.9  Modifying Translations</A>.
@@ -837,7 +837,7 @@ if some untranslated string still exists.
 
 <H3><A NAME="SEC66" HREF="gettext_toc.html#TOC66">8.3.8  Obsolete Entries</A></H3>
 <P>
-<A NAME="IDX435"></A>
+<A NAME="IDX441"></A>
 
 </P>
 <P>
@@ -863,7 +863,7 @@ after the fact.
 
 </P>
 <P>
-<A NAME="IDX436"></A>
+<A NAME="IDX442"></A>
 Moreover, some commands are more specifically related to obsolete
 entry processing.
 
@@ -872,27 +872,27 @@ entry processing.
 
 <DT><KBD>o</KBD>
 <DD>
-<A NAME="IDX437"></A>
+<A NAME="IDX443"></A>
 Find the next obsolete entry (<CODE>po-next-obsolete-entry</CODE>).
 
 <DT><KBD>O</KBD>
 <DD>
-<A NAME="IDX438"></A>
+<A NAME="IDX444"></A>
 Find the previous obsolete entry (<CODE>po-previous-obsolete-entry</CODE>).
 
 <DT><KBD><KBD>DEL</KBD></KBD>
 <DD>
-<A NAME="IDX439"></A>
+<A NAME="IDX445"></A>
 Make an active entry obsolete, or zap out an obsolete entry
 (<CODE>po-fade-out-entry</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX440"></A>
-<A NAME="IDX441"></A>
-<A NAME="IDX442"></A>
-<A NAME="IDX443"></A>
+<A NAME="IDX446"></A>
+<A NAME="IDX447"></A>
+<A NAME="IDX448"></A>
+<A NAME="IDX449"></A>
 The commands <KBD>o</KBD> (<CODE>po-next-obsolete-entry</CODE>) and <KBD>O</KBD>
 (<CODE>po-previous-obsolete-entry</CODE>) move forwards or backwards,
 chasing for an obsolete entry.  If none is found, the search is
@@ -908,10 +908,10 @@ introducing useless <CODE>msgid</CODE> values.
 
 </P>
 <P>
-<A NAME="IDX444"></A>
-<A NAME="IDX445"></A>
-<A NAME="IDX446"></A>
-<A NAME="IDX447"></A>
+<A NAME="IDX450"></A>
+<A NAME="IDX451"></A>
+<A NAME="IDX452"></A>
+<A NAME="IDX453"></A>
 However, it is possible to comment out an active entry, so making
 it obsolete.  GNU <CODE>gettext</CODE> utilities will later react to the
 disappearance of a translation by using the untranslated string.
@@ -941,8 +941,8 @@ merely tries to provide handy tools for helping her to do so.
 
 <H3><A NAME="SEC67" HREF="gettext_toc.html#TOC67">8.3.9  Modifying Translations</A></H3>
 <P>
-<A NAME="IDX448"></A>
-<A NAME="IDX449"></A>
+<A NAME="IDX454"></A>
+<A NAME="IDX455"></A>
 
 </P>
 <P>
@@ -968,40 +968,40 @@ using the following commands for modifying the translations.
 
 <DT><KBD><KBD>RET</KBD></KBD>
 <DD>
-<A NAME="IDX450"></A>
+<A NAME="IDX456"></A>
 Interactively edit the translation (<CODE>po-edit-msgstr</CODE>).
 
 <DT><KBD><KBD>LFD</KBD></KBD>
 <DD>
 <DT><KBD>C-j</KBD>
 <DD>
-<A NAME="IDX451"></A>
-<A NAME="IDX452"></A>
+<A NAME="IDX457"></A>
+<A NAME="IDX458"></A>
 Reinitialize the translation with the original, untranslated string
 (<CODE>po-msgid-to-msgstr</CODE>).
 
 <DT><KBD>k</KBD>
 <DD>
-<A NAME="IDX453"></A>
+<A NAME="IDX459"></A>
 Save the translation on the kill ring, and delete it (<CODE>po-kill-msgstr</CODE>).
 
 <DT><KBD>w</KBD>
 <DD>
-<A NAME="IDX454"></A>
+<A NAME="IDX460"></A>
 Save the translation on the kill ring, without deleting it
 (<CODE>po-kill-ring-save-msgstr</CODE>).
 
 <DT><KBD>y</KBD>
 <DD>
-<A NAME="IDX455"></A>
+<A NAME="IDX461"></A>
 Replace the translation, taking the new from the kill ring
 (<CODE>po-yank-msgstr</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX456"></A>
-<A NAME="IDX457"></A>
+<A NAME="IDX462"></A>
+<A NAME="IDX463"></A>
 The command <KBD><KBD>RET</KBD></KBD> (<CODE>po-edit-msgstr</CODE>) opens a new Emacs
 window meant to edit in a new translation, or to modify an already existing
 translation.  The new window contains a copy of the translation taken from
@@ -1014,9 +1014,9 @@ for more information.
 
 </P>
 <P>
-<A NAME="IDX458"></A>
-<A NAME="IDX459"></A>
-<A NAME="IDX460"></A>
+<A NAME="IDX464"></A>
+<A NAME="IDX465"></A>
+<A NAME="IDX466"></A>
 The command <KBD><KBD>LFD</KBD></KBD> (<CODE>po-msgid-to-msgstr</CODE>) initializes, or
 reinitializes the translation with the original string.  This command is
 normally used when the translator wants to redo a fresh translation of
@@ -1024,7 +1024,7 @@ the original string, disregarding any previous work.
 
 </P>
 <P>
-<A NAME="IDX461"></A>
+<A NAME="IDX467"></A>
 It is possible to arrange so, whenever editing an untranslated
 entry, the <KBD><KBD>LFD</KBD></KBD> command be automatically executed.  If you set
 <CODE>po-auto-edit-with-msgid</CODE> to <CODE>t</CODE>, the translation gets
@@ -1033,7 +1033,7 @@ The default value for <CODE>po-auto-edit-with-msgid</CODE> is <CODE>nil</CODE>.
 
 </P>
 <P>
-<A NAME="IDX462"></A>
+<A NAME="IDX468"></A>
 In fact, whether it is best to start a translation with an empty
 string, or rather with a copy of the original string, is a matter of
 taste or habit.  Sometimes, the source language and the
@@ -1047,11 +1047,11 @@ if this requires some extra editing work to get rid of the original.
 
 </P>
 <P>
-<A NAME="IDX463"></A>
-<A NAME="IDX464"></A>
-<A NAME="IDX465"></A>
-<A NAME="IDX466"></A>
-<A NAME="IDX467"></A>
+<A NAME="IDX469"></A>
+<A NAME="IDX470"></A>
+<A NAME="IDX471"></A>
+<A NAME="IDX472"></A>
+<A NAME="IDX473"></A>
 The command <KBD>k</KBD> (<CODE>po-kill-msgstr</CODE>) merely empties the
 translation string, so turning the entry into an untranslated
 one.  But while doing so, its previous contents is put apart in
@@ -1083,8 +1083,8 @@ entries, the translation is also uncommented prior to saving.
 
 </P>
 <P>
-<A NAME="IDX468"></A>
-<A NAME="IDX469"></A>
+<A NAME="IDX474"></A>
+<A NAME="IDX475"></A>
 The command <KBD>y</KBD> (<CODE>po-yank-msgstr</CODE>) completely replaces the
 translation of the current entry by a string taken from the kill ring.
 Following Emacs terminology, we then say that the replacement
@@ -1118,7 +1118,7 @@ yanking commands themselves.
 
 </P>
 <P>
-<A NAME="IDX470"></A>
+<A NAME="IDX476"></A>
 To better illustrate the operation of killing and yanking, let's
 use an actual example, taken from a common situation.  When the
 programmer slightly modifies some string right in the program, his
@@ -1158,8 +1158,8 @@ See section ‘Keyboard Macros’ in <CITE>The Emacs Editor</CITE>.
 
 <H3><A NAME="SEC68" HREF="gettext_toc.html#TOC68">8.3.10  Modifying Comments</A></H3>
 <P>
-<A NAME="IDX471"></A>
-<A NAME="IDX472"></A>
+<A NAME="IDX477"></A>
+<A NAME="IDX478"></A>
 
 </P>
 <P>
@@ -1188,24 +1188,24 @@ so the general indications given for those apply here.  See section <A HREF="get
 
 <DT><KBD>#</KBD>
 <DD>
-<A NAME="IDX473"></A>
+<A NAME="IDX479"></A>
 Interactively edit the translator comments (<CODE>po-edit-comment</CODE>).
 
 <DT><KBD>K</KBD>
 <DD>
-<A NAME="IDX474"></A>
+<A NAME="IDX480"></A>
 Save the translator comments on the kill ring, and delete it
 (<CODE>po-kill-comment</CODE>).
 
 <DT><KBD>W</KBD>
 <DD>
-<A NAME="IDX475"></A>
+<A NAME="IDX481"></A>
 Save the translator comments on the kill ring, without deleting it
 (<CODE>po-kill-ring-save-comment</CODE>).
 
 <DT><KBD>Y</KBD>
 <DD>
-<A NAME="IDX476"></A>
+<A NAME="IDX482"></A>
 Replace the translator comments, taking the new from the kill ring
 (<CODE>po-yank-comment</CODE>).
 
@@ -1221,8 +1221,8 @@ See section <A HREF="gettext_8.html#SEC67">8.3.9  Modifying Translations</A>.
 
 </P>
 <P>
-<A NAME="IDX477"></A>
-<A NAME="IDX478"></A>
+<A NAME="IDX483"></A>
+<A NAME="IDX484"></A>
 The command <KBD>#</KBD> (<CODE>po-edit-comment</CODE>) opens a new Emacs window
 containing a copy of the translator comments on the current PO file entry.
 If there are no such comments, PO mode understands that the translator wants
@@ -1236,18 +1236,18 @@ See section <A HREF="gettext_8.html#SEC69">8.3.11  Details of Sub Edition</A>, f
 
 </P>
 <P>
-<A NAME="IDX479"></A>
+<A NAME="IDX485"></A>
 Functions found on <CODE>po-subedit-mode-hook</CODE>, if any, are executed after
 the string has been inserted in the edit buffer.
 
 </P>
 <P>
-<A NAME="IDX480"></A>
-<A NAME="IDX481"></A>
-<A NAME="IDX482"></A>
-<A NAME="IDX483"></A>
-<A NAME="IDX484"></A>
-<A NAME="IDX485"></A>
+<A NAME="IDX486"></A>
+<A NAME="IDX487"></A>
+<A NAME="IDX488"></A>
+<A NAME="IDX489"></A>
+<A NAME="IDX490"></A>
+<A NAME="IDX491"></A>
 The command <KBD>K</KBD> (<CODE>po-kill-comment</CODE>) gets rid of all
 translator comments, while saving those comments on the kill ring.
 The command <KBD>W</KBD> (<CODE>po-kill-ring-save-comment</CODE>) takes
@@ -1288,7 +1288,7 @@ regular Emacs commands <KBD>C-y</KBD> (<CODE>yank</CODE>) and <KBD>M-y</KBD>
 
 <H3><A NAME="SEC69" HREF="gettext_toc.html#TOC69">8.3.11  Details of Sub Edition</A></H3>
 <P>
-<A NAME="IDX486"></A>
+<A NAME="IDX492"></A>
 
 </P>
 <P>
@@ -1301,25 +1301,25 @@ of Emacs, which are described below.
 
 <DT><KBD>C-c C-c</KBD>
 <DD>
-<A NAME="IDX487"></A>
+<A NAME="IDX493"></A>
 Complete edition (<CODE>po-subedit-exit</CODE>).
 
 <DT><KBD>C-c C-k</KBD>
 <DD>
-<A NAME="IDX488"></A>
+<A NAME="IDX494"></A>
 Abort edition (<CODE>po-subedit-abort</CODE>).
 
 <DT><KBD>C-c C-a</KBD>
 <DD>
-<A NAME="IDX489"></A>
+<A NAME="IDX495"></A>
 Consult auxiliary PO files (<CODE>po-subedit-cycle-auxiliary</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX490"></A>
-<A NAME="IDX491"></A>
-<A NAME="IDX492"></A>
+<A NAME="IDX496"></A>
+<A NAME="IDX497"></A>
+<A NAME="IDX498"></A>
 The window's contents represents a translation for a given message,
 or a translator comment.  The translator may modify this window to
 her heart's content.  Once this is done, the command <KBD>C-c C-c</KBD>
@@ -1329,8 +1329,8 @@ sight or if buffers were switched.
 
 </P>
 <P>
-<A NAME="IDX493"></A>
-<A NAME="IDX494"></A>
+<A NAME="IDX499"></A>
+<A NAME="IDX500"></A>
 If the translator becomes unsatisfied with her translation or comment,
 to the extent she prefers keeping what was existent prior to the
 <KBD><KBD>RET</KBD></KBD> or <KBD>#</KBD> command, she may use the command <KBD>C-c C-k</KBD>
@@ -1341,8 +1341,8 @@ whole effect of last edition.
 
 </P>
 <P>
-<A NAME="IDX495"></A>
-<A NAME="IDX496"></A>
+<A NAME="IDX501"></A>
+<A NAME="IDX502"></A>
 The command <KBD>C-c C-a</KBD> (<CODE>po-subedit-cycle-auxiliary</CODE>)
 allows for glancing through translations
 already achieved in other languages, directly while editing the current
@@ -1376,7 +1376,7 @@ in the editing window, as ending with two <CODE>&#60;</CODE> in a row.
 
 </P>
 <P>
-<A NAME="IDX497"></A>
+<A NAME="IDX503"></A>
 When a translation (or a comment) is being edited, the translator may move
 the cursor back into the PO file buffer and freely move to other entries,
 browsing at will.  If, with an edition pending, the translator wanders in the
@@ -1389,7 +1389,7 @@ the translator should better be comfortable at handling many Emacs windows!
 
 </P>
 <P>
-<A NAME="IDX498"></A>
+<A NAME="IDX504"></A>
 Pending subedits may be completed or aborted in any order, regardless
 of how or when they were started.  When many subedits are pending and the
 translator asks for quitting the PO file (with the <KBD>q</KBD> command), subedits
@@ -1400,9 +1400,9 @@ are automatically resumed one at a time, so she may decide for each of them.
 
 <H3><A NAME="SEC70" HREF="gettext_toc.html#TOC70">8.3.12  C Sources Context</A></H3>
 <P>
-<A NAME="IDX499"></A>
-<A NAME="IDX500"></A>
-<A NAME="IDX501"></A>
+<A NAME="IDX505"></A>
+<A NAME="IDX506"></A>
+<A NAME="IDX507"></A>
 
 </P>
 <P>
@@ -1439,7 +1439,7 @@ overall organization, than to the program code itself.
 
 </P>
 <P>
-<A NAME="IDX502"></A>
+<A NAME="IDX508"></A>
 The following commands are meant to help the translator at getting
 program source context for a PO file entry.
 
@@ -1448,35 +1448,35 @@ program source context for a PO file entry.
 
 <DT><KBD>s</KBD>
 <DD>
-<A NAME="IDX503"></A>
+<A NAME="IDX509"></A>
 Resume the display of a program source context, or cycle through them
 (<CODE>po-cycle-source-reference</CODE>).
 
 <DT><KBD>M-s</KBD>
 <DD>
-<A NAME="IDX504"></A>
+<A NAME="IDX510"></A>
 Display of a program source context selected by menu
 (<CODE>po-select-source-reference</CODE>).
 
 <DT><KBD>S</KBD>
 <DD>
-<A NAME="IDX505"></A>
+<A NAME="IDX511"></A>
 Add a directory to the search path for source files
 (<CODE>po-consider-source-path</CODE>).
 
 <DT><KBD>M-S</KBD>
 <DD>
-<A NAME="IDX506"></A>
+<A NAME="IDX512"></A>
 Delete a directory from the search path for source files
 (<CODE>po-ignore-source-path</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX507"></A>
-<A NAME="IDX508"></A>
-<A NAME="IDX509"></A>
-<A NAME="IDX510"></A>
+<A NAME="IDX513"></A>
+<A NAME="IDX514"></A>
+<A NAME="IDX515"></A>
+<A NAME="IDX516"></A>
 The commands <KBD>s</KBD> (<CODE>po-cycle-source-reference</CODE>) and <KBD>M-s</KBD>
 (<CODE>po-select-source-reference</CODE>) both open another window displaying
 some source program file, and already positioned in such a way that
@@ -1521,10 +1521,10 @@ available for a single string to translate.
 
 </P>
 <P>
-<A NAME="IDX511"></A>
-<A NAME="IDX512"></A>
-<A NAME="IDX513"></A>
-<A NAME="IDX514"></A>
+<A NAME="IDX517"></A>
+<A NAME="IDX518"></A>
+<A NAME="IDX519"></A>
+<A NAME="IDX520"></A>
 Program source files are usually found relative to where the PO
 file stands.  As a special provision, when this fails, the file is
 also looked for, but relative to the directory immediately above it.
@@ -1544,7 +1544,7 @@ one of the directories she does not want anymore on the search path.
 
 <H3><A NAME="SEC71" HREF="gettext_toc.html#TOC71">8.3.13  Consulting Auxiliary PO Files</A></H3>
 <P>
-<A NAME="IDX515"></A>
+<A NAME="IDX521"></A>
 
 </P>
 <P>
@@ -1557,8 +1557,8 @@ at once, for translators preferring to work in this way.
 
 </P>
 <P>
-<A NAME="IDX516"></A>
-<A NAME="IDX517"></A>
+<A NAME="IDX522"></A>
+<A NAME="IDX523"></A>
 An <EM>auxiliary</EM> PO file is an existing PO file meant for the same
 package the translator is working on, but targeted to a different mother
 tongue language.  Commands exist for declaring and handling auxiliary
@@ -1573,41 +1573,41 @@ Here are the auxiliary file commands available in PO mode.
 
 <DT><KBD>a</KBD>
 <DD>
-<A NAME="IDX518"></A>
+<A NAME="IDX524"></A>
 Seek auxiliary files for another translation for the same entry
 (<CODE>po-cycle-auxiliary</CODE>).
 
 <DT><KBD>C-c C-a</KBD>
 <DD>
-<A NAME="IDX519"></A>
+<A NAME="IDX525"></A>
 Switch to a particular auxiliary file (<CODE>po-select-auxiliary</CODE>).
 
 <DT><KBD>A</KBD>
 <DD>
-<A NAME="IDX520"></A>
+<A NAME="IDX526"></A>
 Declare this PO file as an auxiliary file (<CODE>po-consider-as-auxiliary</CODE>).
 
 <DT><KBD>M-A</KBD>
 <DD>
-<A NAME="IDX521"></A>
+<A NAME="IDX527"></A>
 Remove this PO file from the list of auxiliary files
 (<CODE>po-ignore-as-auxiliary</CODE>).
 
 </DL>
 
 <P>
-<A NAME="IDX522"></A>
-<A NAME="IDX523"></A>
-<A NAME="IDX524"></A>
-<A NAME="IDX525"></A>
+<A NAME="IDX528"></A>
+<A NAME="IDX529"></A>
+<A NAME="IDX530"></A>
+<A NAME="IDX531"></A>
 Command <KBD>A</KBD> (<CODE>po-consider-as-auxiliary</CODE>) adds the current
 PO file to the list of auxiliary files, while command <KBD>M-A</KBD>
 (<CODE>po-ignore-as-auxiliary</CODE> just removes it.
 
 </P>
 <P>
-<A NAME="IDX526"></A>
-<A NAME="IDX527"></A>
+<A NAME="IDX532"></A>
+<A NAME="IDX533"></A>
 The command <KBD>a</KBD> (<CODE>po-cycle-auxiliary</CODE>) seeks all auxiliary PO
 files, round-robin, searching for a translated entry in some other language
 having an <CODE>msgid</CODE> field identical as the one for the current entry.
@@ -1619,8 +1619,8 @@ so repeating <KBD>a</KBD> will eventually yield back the original PO file.
 
 </P>
 <P>
-<A NAME="IDX528"></A>
-<A NAME="IDX529"></A>
+<A NAME="IDX534"></A>
+<A NAME="IDX535"></A>
 The command <KBD>C-c C-a</KBD> (<CODE>po-select-auxiliary</CODE>) asks the translator
 for her choice of a particular auxiliary file, with completion, and
 then switches to that selected PO file.  The command also checks if
@@ -1640,7 +1640,7 @@ their <CODE>msgid</CODE> entries written by the same GNU <CODE>gettext</CODE> to
 
 </P>
 <P>
-<A NAME="IDX530"></A>
+<A NAME="IDX536"></A>
 However, PO files initially created by PO mode itself, while marking
 strings in source files, are normalised differently.  So are PO
 files resulting of the <SAMP>&lsquo;M-x normalize&rsquo;</SAMP> command.  Until these
@@ -1652,11 +1652,11 @@ fully resolved, the translator should stay aware of normalisation issues.
 
 <H2><A NAME="SEC72" HREF="gettext_toc.html#TOC72">8.4  Using Translation Compendia</A></H2>
 <P>
-<A NAME="IDX531"></A>
+<A NAME="IDX537"></A>
 
 </P>
 <P>
-<A NAME="IDX532"></A>
+<A NAME="IDX538"></A>
 A <EM>compendium</EM> is a special PO file containing a set of
 translations recurring in many different packages.  The translator can
 use gettext tools to build a new compendium, to add entries to her
@@ -1669,8 +1669,8 @@ already translated entries, from translations kept in the compendium.
 
 <H3><A NAME="SEC73" HREF="gettext_toc.html#TOC73">8.4.1  Creating Compendia</A></H3>
 <P>
-<A NAME="IDX533"></A>
-<A NAME="IDX534"></A>
+<A NAME="IDX539"></A>
+<A NAME="IDX540"></A>
 
 </P>
 <P>
@@ -1685,8 +1685,8 @@ files</CITE> and <CITE>extracting a message subset from a PO file</CITE>.
 <H4><A NAME="SEC74" HREF="gettext_toc.html#TOC74">8.4.1.1  Concatenate PO Files</A></H4>
 
 <P>
-<A NAME="IDX535"></A>
-<A NAME="IDX536"></A>
+<A NAME="IDX541"></A>
+<A NAME="IDX542"></A>
 To concatenate several valid PO files into one compendium file you can
 use <SAMP>&lsquo;msgcomm&rsquo;</SAMP> or <SAMP>&lsquo;msgcat&rsquo;</SAMP> (the latter preferred):
 
@@ -1767,7 +1767,7 @@ files or postprocess the result using <SAMP>&lsquo;msgattrib --translated --no-f
 
 <H4><A NAME="SEC75" HREF="gettext_toc.html#TOC75">8.4.1.2  Extract a Message Subset from a PO File</A></H4>
 <P>
-<A NAME="IDX537"></A>
+<A NAME="IDX543"></A>
 
 </P>
 <P>
@@ -1798,7 +1798,7 @@ or to update an already existing translation.
 
 <H4><A NAME="SEC77" HREF="gettext_toc.html#TOC77">8.4.2.1  Initialize a New Translation File</A></H4>
 <P>
-<A NAME="IDX538"></A>
+<A NAME="IDX544"></A>
 
 </P>
 <P>
@@ -1815,7 +1815,7 @@ msgmerge --compendium compendium.po -o file.po /dev/null file.pot
 
 <H4><A NAME="SEC78" HREF="gettext_toc.html#TOC78">8.4.2.2  Update an Existing Translation File</A></H4>
 <P>
-<A NAME="IDX539"></A>
+<A NAME="IDX545"></A>
 
 </P>
 <P>
diff --git a/gettext-tools/doc/gettext_9.html b/gettext-tools/doc/gettext_9.html
index b994a8a..bff7d4f 100644
--- a/gettext-tools/doc/gettext_9.html
+++ b/gettext-tools/doc/gettext_9.html
@@ -1,7 +1,7 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - 9  Manipulating PO Files</TITLE>
@@ -13,7 +13,7 @@ Go to the <A HREF="gettext_1.html">first</A>, <A HREF="gettext_8.html">previous<
 
 <H1><A NAME="SEC79" HREF="gettext_toc.html#TOC79">9  Manipulating PO Files</A></H1>
 <P>
-<A NAME="IDX540"></A>
+<A NAME="IDX546"></A>
 
 </P>
 <P>
@@ -23,7 +23,7 @@ complete set of tools for this purpose.
 
 </P>
 <P>
-<A NAME="IDX541"></A>
+<A NAME="IDX547"></A>
 When merging two packages into a single package, the resulting POT file
 will be the concatenation of the two packages' POT files.  Thus the
 maintainer must concatenate the two existing package translations into
@@ -33,7 +33,7 @@ possible conflicts that arose during the merge.
 
 </P>
 <P>
-<A NAME="IDX542"></A>
+<A NAME="IDX548"></A>
 When a translator takes over the translation job from another translator,
 but she uses a different character encoding in her locale, she will
 convert the catalog to her character encoding.  This is best done through
@@ -49,8 +49,8 @@ that source file and use <SAMP>&lsquo;msgmerge&rsquo;</SAMP>.
 
 </P>
 <P>
-<A NAME="IDX543"></A>
-<A NAME="IDX544"></A>
+<A NAME="IDX549"></A>
+<A NAME="IDX550"></A>
 When a translator wants to adjust some translation catalog for a special
 dialect or orthography -- for example, German as written in Switzerland
 versus German as written in Germany -- she needs to apply some text
@@ -67,14 +67,14 @@ that's why it's better to use the original POT file if available.
 
 </P>
 <P>
-<A NAME="IDX545"></A>
+<A NAME="IDX551"></A>
 When a translator wants to check her translations, for example according
 to orthography rules or using a non-interactive spell checker, she can do
 so using the <SAMP>&lsquo;msgexec&rsquo;</SAMP> program.
 
 </P>
 <P>
-<A NAME="IDX546"></A>
+<A NAME="IDX552"></A>
 When third party tools create PO or POT files, sometimes duplicates cannot
 be avoided.  But the GNU <CODE>gettext</CODE> tools give an error when they
 encounter duplicate msgids in the same file and in the same domain.
@@ -92,7 +92,7 @@ completely translated.
 
 </P>
 <P>
-<A NAME="IDX547"></A>
+<A NAME="IDX553"></A>
 <SAMP>&lsquo;msgattrib&rsquo;</SAMP> can be used to select and extract only the fuzzy
 or untranslated messages of a translation catalog.
 
@@ -114,16 +114,16 @@ write other specialized programs that process PO files.
 <H2><A NAME="SEC80" HREF="gettext_toc.html#TOC80">9.1  Invoking the <CODE>msgcat</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX548"></A>
-<A NAME="IDX549"></A>
+<A NAME="IDX554"></A>
+<A NAME="IDX555"></A>
 
 <PRE>
 msgcat [<VAR>option</VAR>] [<VAR>inputfile</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX550"></A>
-<A NAME="IDX551"></A>
+<A NAME="IDX556"></A>
+<A NAME="IDX557"></A>
 The <CODE>msgcat</CODE> program concatenates and merges the specified PO files.
 It finds messages which are common to two or more of the specified PO files.
 By using the <CODE>--more-than</CODE> option, greater commonality may be requested
@@ -149,8 +149,8 @@ Input files.
 <DD>
 <DT><SAMP>&lsquo;--files-from=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX552"></A>
-<A NAME="IDX553"></A>
+<A NAME="IDX558"></A>
+<A NAME="IDX559"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -158,8 +158,8 @@ them from the command line.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX554"></A>
-<A NAME="IDX555"></A>
+<A NAME="IDX560"></A>
+<A NAME="IDX561"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -180,14 +180,14 @@ If <VAR>inputfile</VAR> is <SAMP>&lsquo;-&rsquo;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX556"></A>
-<A NAME="IDX557"></A>
+<A NAME="IDX562"></A>
+<A NAME="IDX563"></A>
 Write output to specified file.
 
 </DL>
 
 <P>
-<A NAME="IDX558"></A>
+<A NAME="IDX564"></A>
 The results are written to standard output if no output file is specified
 or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 
@@ -202,8 +202,8 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--less-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX559"></A>
-<A NAME="IDX560"></A>
+<A NAME="IDX565"></A>
+<A NAME="IDX566"></A>
 Print messages with less than <VAR>number</VAR> definitions, defaults to infinite
 if not set.
 
@@ -211,8 +211,8 @@ if not set.
 <DD>
 <DT><SAMP>&lsquo;--more-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX561"></A>
-<A NAME="IDX562"></A>
+<A NAME="IDX567"></A>
+<A NAME="IDX568"></A>
 Print messages with more than <VAR>number</VAR> definitions, defaults to 0 if not
 set.
 
@@ -220,8 +220,8 @@ set.
 <DD>
 <DT><SAMP>&lsquo;--unique&rsquo;</SAMP>
 <DD>
-<A NAME="IDX563"></A>
-<A NAME="IDX564"></A>
+<A NAME="IDX569"></A>
+<A NAME="IDX570"></A>
 Shorthand for <SAMP>&lsquo;--less-than=2&rsquo;</SAMP>.  Requests that only unique messages be
 printed.
 
@@ -237,14 +237,14 @@ printed.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX565"></A>
-<A NAME="IDX566"></A>
+<A NAME="IDX571"></A>
+<A NAME="IDX572"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX567"></A>
+<A NAME="IDX573"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -260,19 +260,19 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 <DD>
 <DT><SAMP>&lsquo;--to-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX568"></A>
-<A NAME="IDX569"></A>
+<A NAME="IDX574"></A>
+<A NAME="IDX575"></A>
 Specify encoding for output.
 
 <DT><SAMP>&lsquo;--use-first&rsquo;</SAMP>
 <DD>
-<A NAME="IDX570"></A>
+<A NAME="IDX576"></A>
 Use first available translation for each message.  Don't merge several
 translations into one.
 
 <DT><SAMP>&lsquo;--lang=<VAR>catalogname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX571"></A>
+<A NAME="IDX577"></A>
 Specify the <SAMP>&lsquo;Language&rsquo;</SAMP> field to be used in the header entry.  See
 section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for the meaning of this field.  Note: The
 <SAMP>&lsquo;Language-Team&rsquo;</SAMP> and <SAMP>&lsquo;Plural-Forms&rsquo;</SAMP> fields are left unchanged.
@@ -281,40 +281,40 @@ section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX572"></A>
+<A NAME="IDX578"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX573"></A>
+<A NAME="IDX579"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX574"></A>
+<A NAME="IDX580"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX575"></A>
-<A NAME="IDX576"></A>
+<A NAME="IDX581"></A>
+<A NAME="IDX582"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX577"></A>
+<A NAME="IDX583"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX578"></A>
-<A NAME="IDX579"></A>
+<A NAME="IDX584"></A>
+<A NAME="IDX585"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -325,7 +325,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX580"></A>
+<A NAME="IDX586"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -334,15 +334,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX581"></A>
-<A NAME="IDX582"></A>
+<A NAME="IDX587"></A>
+<A NAME="IDX588"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX583"></A>
+<A NAME="IDX589"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -350,15 +350,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX584"></A>
-<A NAME="IDX585"></A>
+<A NAME="IDX590"></A>
+<A NAME="IDX591"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX586"></A>
+<A NAME="IDX592"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -367,9 +367,9 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX587"></A>
-<A NAME="IDX588"></A>
-<A NAME="IDX589"></A>
+<A NAME="IDX593"></A>
+<A NAME="IDX594"></A>
+<A NAME="IDX595"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -377,8 +377,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX590"></A>
-<A NAME="IDX591"></A>
+<A NAME="IDX596"></A>
+<A NAME="IDX597"></A>
 Sort output by file location.
 
 </DL>
@@ -393,16 +393,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX592"></A>
-<A NAME="IDX593"></A>
+<A NAME="IDX598"></A>
+<A NAME="IDX599"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX594"></A>
-<A NAME="IDX595"></A>
+<A NAME="IDX600"></A>
+<A NAME="IDX601"></A>
 Output version information and exit.
 
 </DL>
@@ -412,15 +412,15 @@ Output version information and exit.
 <H2><A NAME="SEC87" HREF="gettext_toc.html#TOC87">9.2  Invoking the <CODE>msgconv</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX596"></A>
-<A NAME="IDX597"></A>
+<A NAME="IDX602"></A>
+<A NAME="IDX603"></A>
 
 <PRE>
 msgconv [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX598"></A>
+<A NAME="IDX604"></A>
 The <CODE>msgconv</CODE> program converts a translation catalog to a different
 character encoding.
 
@@ -439,8 +439,8 @@ Input PO file.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX599"></A>
-<A NAME="IDX600"></A>
+<A NAME="IDX605"></A>
+<A NAME="IDX606"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -461,8 +461,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, st
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX601"></A>
-<A NAME="IDX602"></A>
+<A NAME="IDX607"></A>
+<A NAME="IDX608"></A>
 Write output to specified file.
 
 </DL>
@@ -482,8 +482,8 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--to-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX603"></A>
-<A NAME="IDX604"></A>
+<A NAME="IDX609"></A>
+<A NAME="IDX610"></A>
 Specify encoding for output.
 
 </DL>
@@ -502,14 +502,14 @@ The default encoding is the current locale's encoding.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX605"></A>
-<A NAME="IDX606"></A>
+<A NAME="IDX611"></A>
+<A NAME="IDX612"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX607"></A>
+<A NAME="IDX613"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -525,39 +525,39 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX608"></A>
+<A NAME="IDX614"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX609"></A>
+<A NAME="IDX615"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX610"></A>
+<A NAME="IDX616"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX611"></A>
-<A NAME="IDX612"></A>
+<A NAME="IDX617"></A>
+<A NAME="IDX618"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX613"></A>
+<A NAME="IDX619"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX614"></A>
+<A NAME="IDX620"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -568,7 +568,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX615"></A>
+<A NAME="IDX621"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -577,15 +577,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX616"></A>
-<A NAME="IDX617"></A>
+<A NAME="IDX622"></A>
+<A NAME="IDX623"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX618"></A>
+<A NAME="IDX624"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -593,15 +593,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX619"></A>
-<A NAME="IDX620"></A>
+<A NAME="IDX625"></A>
+<A NAME="IDX626"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX621"></A>
+<A NAME="IDX627"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -610,8 +610,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX622"></A>
-<A NAME="IDX623"></A>
+<A NAME="IDX628"></A>
+<A NAME="IDX629"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -619,8 +619,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX624"></A>
-<A NAME="IDX625"></A>
+<A NAME="IDX630"></A>
+<A NAME="IDX631"></A>
 Sort output by file location.
 
 </DL>
@@ -635,16 +635,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX626"></A>
-<A NAME="IDX627"></A>
+<A NAME="IDX632"></A>
+<A NAME="IDX633"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX628"></A>
-<A NAME="IDX629"></A>
+<A NAME="IDX634"></A>
+<A NAME="IDX635"></A>
 Output version information and exit.
 
 </DL>
@@ -654,15 +654,15 @@ Output version information and exit.
 <H2><A NAME="SEC94" HREF="gettext_toc.html#TOC94">9.3  Invoking the <CODE>msggrep</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX630"></A>
-<A NAME="IDX631"></A>
+<A NAME="IDX636"></A>
+<A NAME="IDX637"></A>
 
 <PRE>
 msggrep [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX632"></A>
+<A NAME="IDX638"></A>
 The <CODE>msggrep</CODE> program extracts all messages of a translation catalog
 that match a given pattern or belong to some given source files.
 
@@ -681,8 +681,8 @@ Input PO file.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX633"></A>
-<A NAME="IDX634"></A>
+<A NAME="IDX639"></A>
+<A NAME="IDX640"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -703,8 +703,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, st
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX635"></A>
-<A NAME="IDX636"></A>
+<A NAME="IDX641"></A>
+<A NAME="IDX642"></A>
 Write output to specified file.
 
 </DL>
@@ -770,8 +770,8 @@ expressions if -E is given, or fixed strings if -F is given.
 <DD>
 <DT><SAMP>&lsquo;--location=<VAR>sourcefile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX637"></A>
-<A NAME="IDX638"></A>
+<A NAME="IDX643"></A>
+<A NAME="IDX644"></A>
 Select messages extracted from <VAR>sourcefile</VAR>.  <VAR>sourcefile</VAR> can be
 either a literal file name or a wildcard pattern.
 
@@ -779,96 +779,96 @@ either a literal file name or a wildcard pattern.
 <DD>
 <DT><SAMP>&lsquo;--domain=<VAR>domainname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX639"></A>
-<A NAME="IDX640"></A>
+<A NAME="IDX645"></A>
+<A NAME="IDX646"></A>
 Select messages belonging to domain <VAR>domainname</VAR>.
 
 <DT><SAMP>&lsquo;-J&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgctxt&rsquo;</SAMP>
 <DD>
-<A NAME="IDX641"></A>
-<A NAME="IDX642"></A>
+<A NAME="IDX647"></A>
+<A NAME="IDX648"></A>
 Start of patterns for the msgctxt.
 
 <DT><SAMP>&lsquo;-K&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgid&rsquo;</SAMP>
 <DD>
-<A NAME="IDX643"></A>
-<A NAME="IDX644"></A>
+<A NAME="IDX649"></A>
+<A NAME="IDX650"></A>
 Start of patterns for the msgid.
 
 <DT><SAMP>&lsquo;-T&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--msgstr&rsquo;</SAMP>
 <DD>
-<A NAME="IDX645"></A>
-<A NAME="IDX646"></A>
+<A NAME="IDX651"></A>
+<A NAME="IDX652"></A>
 Start of patterns for the msgstr.
 
 <DT><SAMP>&lsquo;-C&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--comment&rsquo;</SAMP>
 <DD>
-<A NAME="IDX647"></A>
-<A NAME="IDX648"></A>
+<A NAME="IDX653"></A>
+<A NAME="IDX654"></A>
 Start of patterns for the translator's comment.
 
 <DT><SAMP>&lsquo;-X&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--extracted-comment&rsquo;</SAMP>
 <DD>
-<A NAME="IDX649"></A>
-<A NAME="IDX650"></A>
+<A NAME="IDX655"></A>
+<A NAME="IDX656"></A>
 Start of patterns for the extracted comments.
 
 <DT><SAMP>&lsquo;-E&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--extended-regexp&rsquo;</SAMP>
 <DD>
-<A NAME="IDX651"></A>
-<A NAME="IDX652"></A>
+<A NAME="IDX657"></A>
+<A NAME="IDX658"></A>
 Specify that <VAR>pattern</VAR> is an extended regular expression.
 
 <DT><SAMP>&lsquo;-F&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--fixed-strings&rsquo;</SAMP>
 <DD>
-<A NAME="IDX653"></A>
-<A NAME="IDX654"></A>
+<A NAME="IDX659"></A>
+<A NAME="IDX660"></A>
 Specify that <VAR>pattern</VAR> is a set of newline-separated strings.
 
 <DT><SAMP>&lsquo;-e <VAR>pattern</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--regexp=<VAR>pattern</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX655"></A>
-<A NAME="IDX656"></A>
+<A NAME="IDX661"></A>
+<A NAME="IDX662"></A>
 Use <VAR>pattern</VAR> as a regular expression.
 
 <DT><SAMP>&lsquo;-f <VAR>file</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX657"></A>
-<A NAME="IDX658"></A>
+<A NAME="IDX663"></A>
+<A NAME="IDX664"></A>
 Obtain <VAR>pattern</VAR> from <VAR>file</VAR>.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--ignore-case&rsquo;</SAMP>
 <DD>
-<A NAME="IDX659"></A>
-<A NAME="IDX660"></A>
+<A NAME="IDX665"></A>
+<A NAME="IDX666"></A>
 Ignore case distinctions.
 
 <DT><SAMP>&lsquo;-v&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--invert-match&rsquo;</SAMP>
 <DD>
-<A NAME="IDX661"></A>
-<A NAME="IDX662"></A>
+<A NAME="IDX667"></A>
+<A NAME="IDX668"></A>
 Output only the messages that do not match any selection criterion, instead
 of the messages that match a selection criterion.
 
@@ -884,14 +884,14 @@ of the messages that match a selection criterion.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX663"></A>
-<A NAME="IDX664"></A>
+<A NAME="IDX669"></A>
+<A NAME="IDX670"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX665"></A>
+<A NAME="IDX671"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -907,36 +907,36 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX666"></A>
+<A NAME="IDX672"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX667"></A>
+<A NAME="IDX673"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX668"></A>
+<A NAME="IDX674"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX669"></A>
+<A NAME="IDX675"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX670"></A>
+<A NAME="IDX676"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX671"></A>
+<A NAME="IDX677"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -947,7 +947,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX672"></A>
+<A NAME="IDX678"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -956,15 +956,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX673"></A>
-<A NAME="IDX674"></A>
+<A NAME="IDX679"></A>
+<A NAME="IDX680"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX675"></A>
+<A NAME="IDX681"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -972,28 +972,28 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX676"></A>
-<A NAME="IDX677"></A>
+<A NAME="IDX682"></A>
+<A NAME="IDX683"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX678"></A>
+<A NAME="IDX684"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
 
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX679"></A>
+<A NAME="IDX685"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX680"></A>
+<A NAME="IDX686"></A>
 Sort output by file location.
 
 </DL>
@@ -1008,16 +1008,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX681"></A>
-<A NAME="IDX682"></A>
+<A NAME="IDX687"></A>
+<A NAME="IDX688"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX683"></A>
-<A NAME="IDX684"></A>
+<A NAME="IDX689"></A>
+<A NAME="IDX690"></A>
 Output version information and exit.
 
 </DL>
@@ -1071,28 +1071,28 @@ msggrep --msgstr -F -f wordlist.txt input.po
 <H2><A NAME="SEC102" HREF="gettext_toc.html#TOC102">9.4  Invoking the <CODE>msgfilter</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX685"></A>
-<A NAME="IDX686"></A>
+<A NAME="IDX691"></A>
+<A NAME="IDX692"></A>
 
 <PRE>
 msgfilter [<VAR>option</VAR>] <VAR>filter</VAR> [<VAR>filter-option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX687"></A>
+<A NAME="IDX693"></A>
 The <CODE>msgfilter</CODE> program applies a filter to all translations of a
 translation catalog.
 
 </P>
 <P>
-<A NAME="IDX688"></A>
-<A NAME="IDX689"></A>
-<A NAME="IDX690"></A>
-<A NAME="IDX691"></A>
-<A NAME="IDX692"></A>
-<A NAME="IDX693"></A>
 <A NAME="IDX694"></A>
 <A NAME="IDX695"></A>
+<A NAME="IDX696"></A>
+<A NAME="IDX697"></A>
+<A NAME="IDX698"></A>
+<A NAME="IDX699"></A>
+<A NAME="IDX700"></A>
+<A NAME="IDX701"></A>
 During each <VAR>filter</VAR> invocation, the environment variable
 <CODE>MSGFILTER_MSGID</CODE> is bound to the message's msgid, and the environment
 variable <CODE>MSGFILTER_LOCATION</CODE> is bound to the location in the PO file
@@ -1119,16 +1119,16 @@ the previous msgid_plural.
 <DD>
 <DT><SAMP>&lsquo;--input=<VAR>inputfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX696"></A>
-<A NAME="IDX697"></A>
+<A NAME="IDX702"></A>
+<A NAME="IDX703"></A>
 Input PO file.
 
 <DT><SAMP>&lsquo;-D <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX698"></A>
-<A NAME="IDX699"></A>
+<A NAME="IDX704"></A>
+<A NAME="IDX705"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -1149,8 +1149,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, st
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX700"></A>
-<A NAME="IDX701"></A>
+<A NAME="IDX706"></A>
+<A NAME="IDX707"></A>
 Write output to specified file.
 
 </DL>
@@ -1171,8 +1171,18 @@ used filter is <SAMP>&lsquo;sed&rsquo;</SAMP>.  A few particular built-in filter
 recognized.
 
 </P>
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;--newline&rsquo;</SAMP>
+<DD>
+<A NAME="IDX708"></A>
+Add newline at the end of each input line and also strip the ending
+newline from the output line.
+
+</DL>
+
 <P>
-<A NAME="IDX702"></A>
+<A NAME="IDX709"></A>
 Note: If the filter is not a built-in filter, you have to care about encodings:
 It is your responsibility to ensure that the <VAR>filter</VAR> can cope
 with input encoded in the translation catalog's encoding.  If the
@@ -1186,14 +1196,15 @@ locale, by using the <CODE>LC_ALL</CODE> environment variable.
 
 </P>
 <P>
-<A NAME="IDX703"></A>
-Note: Most translations in a translation catalog don't end with a newline
-character.  For this reason, it is important that the <VAR>filter</VAR>
-recognizes its last input line even if it ends without a newline, and that
-it doesn't add an undesired trailing newline at the end.  The <SAMP>&lsquo;sed&rsquo;</SAMP>
-program on some platforms is known to ignore the last line of input if it
-is not terminated with a newline.  You can use GNU <CODE>sed</CODE> instead; it
-does not have this limitation.
+<A NAME="IDX710"></A>
+Note: Most translations in a translation catalog don't end with a
+newline character.  For this reason, unless the <CODE>--newline</CODE>
+option is used, it is important that the <VAR>filter</VAR> recognizes its
+last input line even if it ends without a newline, and that it doesn't
+add an undesired trailing newline at the end.  The <SAMP>&lsquo;sed&rsquo;</SAMP> program on
+some platforms is known to ignore the last line of input if it is not
+terminated with a newline.  You can use GNU <CODE>sed</CODE> instead; it does
+not have this limitation.
 
 </P>
 
@@ -1206,16 +1217,16 @@ does not have this limitation.
 <DD>
 <DT><SAMP>&lsquo;--expression=<VAR>script</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX704"></A>
-<A NAME="IDX705"></A>
+<A NAME="IDX711"></A>
+<A NAME="IDX712"></A>
 Add <VAR>script</VAR> to the commands to be executed.
 
 <DT><SAMP>&lsquo;-f <VAR>scriptfile</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--file=<VAR>scriptfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX706"></A>
-<A NAME="IDX707"></A>
+<A NAME="IDX713"></A>
+<A NAME="IDX714"></A>
 Add the contents of <VAR>scriptfile</VAR> to the commands to be executed.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
@@ -1224,9 +1235,9 @@ Add the contents of <VAR>scriptfile</VAR> to the commands to be executed.
 <DD>
 <DT><SAMP>&lsquo;--silent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX708"></A>
-<A NAME="IDX709"></A>
-<A NAME="IDX710"></A>
+<A NAME="IDX715"></A>
+<A NAME="IDX716"></A>
+<A NAME="IDX717"></A>
 Suppress automatic printing of pattern space.
 
 </DL>
@@ -1236,8 +1247,8 @@ Suppress automatic printing of pattern space.
 <H3><A NAME="SEC107" HREF="gettext_toc.html#TOC107">9.4.5  Built-in <VAR>filter</VAR>s</A></H3>
 
 <P>
-<A NAME="IDX711"></A>
-<A NAME="IDX712"></A>
+<A NAME="IDX718"></A>
+<A NAME="IDX719"></A>
 The filter <SAMP>&lsquo;recode-sr-latin&rsquo;</SAMP> is recognized as a built-in filter.
 The command <SAMP>&lsquo;recode-sr-latin&rsquo;</SAMP> converts Serbian text, written in the
 Cyrillic script, to the Latin script.
@@ -1247,14 +1258,14 @@ file to an <TT>&lsquo;sr@latin.po&rsquo;</TT> file.
 
 </P>
 <P>
-<A NAME="IDX713"></A>
+<A NAME="IDX720"></A>
 The filter <SAMP>&lsquo;quot&rsquo;</SAMP> is recognized as a built-in filter.
 The command <SAMP>&lsquo;msgfilter quot&rsquo;</SAMP> converts any quotations surrounded
 by a pair of <SAMP>&lsquo;"&rsquo;</SAMP>, <SAMP>&lsquo;'&rsquo;</SAMP>, and <SAMP>&lsquo;`&rsquo;</SAMP>.
 
 </P>
 <P>
-<A NAME="IDX714"></A>
+<A NAME="IDX721"></A>
 The filter <SAMP>&lsquo;boldquot&rsquo;</SAMP> is recognized as a built-in filter.
 The command <SAMP>&lsquo;msgfilter boldquot&rsquo;</SAMP> converts any quotations
 surrounded by a pair of <SAMP>&lsquo;"&rsquo;</SAMP>, <SAMP>&lsquo;'&rsquo;</SAMP>, and <SAMP>&lsquo;`&rsquo;</SAMP>, also adding the
@@ -1277,14 +1288,14 @@ convert the message catalog to the UTF-8 encoding when needed.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX715"></A>
-<A NAME="IDX716"></A>
+<A NAME="IDX722"></A>
+<A NAME="IDX723"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX717"></A>
+<A NAME="IDX724"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -1300,43 +1311,43 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX718"></A>
+<A NAME="IDX725"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX719"></A>
+<A NAME="IDX726"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX720"></A>
+<A NAME="IDX727"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX721"></A>
+<A NAME="IDX728"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--keep-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX722"></A>
+<A NAME="IDX729"></A>
 Keep the header entry, i.e. the message with <SAMP>&lsquo;msgid ""&rsquo;</SAMP>, unmodified,
 instead of filtering it.  By default, the header entry is subject to
 filtering like any other message.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX723"></A>
+<A NAME="IDX730"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX724"></A>
+<A NAME="IDX731"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -1347,7 +1358,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX725"></A>
+<A NAME="IDX732"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1356,15 +1367,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX726"></A>
-<A NAME="IDX727"></A>
+<A NAME="IDX733"></A>
+<A NAME="IDX734"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX728"></A>
+<A NAME="IDX735"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1372,15 +1383,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX729"></A>
-<A NAME="IDX730"></A>
+<A NAME="IDX736"></A>
+<A NAME="IDX737"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX731"></A>
+<A NAME="IDX738"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1389,8 +1400,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX732"></A>
-<A NAME="IDX733"></A>
+<A NAME="IDX739"></A>
+<A NAME="IDX740"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1398,8 +1409,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX734"></A>
-<A NAME="IDX735"></A>
+<A NAME="IDX741"></A>
+<A NAME="IDX742"></A>
 Sort output by file location.
 
 </DL>
@@ -1414,16 +1425,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX736"></A>
-<A NAME="IDX737"></A>
+<A NAME="IDX743"></A>
+<A NAME="IDX744"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX738"></A>
-<A NAME="IDX739"></A>
+<A NAME="IDX745"></A>
+<A NAME="IDX746"></A>
 Output version information and exit.
 
 </DL>
@@ -1455,16 +1466,16 @@ msgfilter recode-sr-latin &#60; sr.po
 <H2><A NAME="SEC112" HREF="gettext_toc.html#TOC112">9.5  Invoking the <CODE>msguniq</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX740"></A>
-<A NAME="IDX741"></A>
+<A NAME="IDX747"></A>
+<A NAME="IDX748"></A>
 
 <PRE>
 msguniq [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX742"></A>
-<A NAME="IDX743"></A>
+<A NAME="IDX749"></A>
+<A NAME="IDX750"></A>
 The <CODE>msguniq</CODE> program unifies duplicate translations in a translation
 catalog.  It finds duplicate translations of the same message ID.  Such
 duplicates are invalid input for other programs like <CODE>msgfmt</CODE>,
@@ -1491,8 +1502,8 @@ Input PO file.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX744"></A>
-<A NAME="IDX745"></A>
+<A NAME="IDX751"></A>
+<A NAME="IDX752"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -1513,8 +1524,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, st
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX746"></A>
-<A NAME="IDX747"></A>
+<A NAME="IDX753"></A>
+<A NAME="IDX754"></A>
 Write output to specified file.
 
 </DL>
@@ -1534,16 +1545,16 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--repeated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX748"></A>
-<A NAME="IDX749"></A>
+<A NAME="IDX755"></A>
+<A NAME="IDX756"></A>
 Print only duplicates.
 
 <DT><SAMP>&lsquo;-u&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--unique&rsquo;</SAMP>
 <DD>
-<A NAME="IDX750"></A>
-<A NAME="IDX751"></A>
+<A NAME="IDX757"></A>
+<A NAME="IDX758"></A>
 Print only unique messages, discard duplicates.
 
 </DL>
@@ -1558,14 +1569,14 @@ Print only unique messages, discard duplicates.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX752"></A>
-<A NAME="IDX753"></A>
+<A NAME="IDX759"></A>
+<A NAME="IDX760"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX754"></A>
+<A NAME="IDX761"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -1581,13 +1592,13 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--to-code=<VAR>name</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX755"></A>
-<A NAME="IDX756"></A>
+<A NAME="IDX762"></A>
+<A NAME="IDX763"></A>
 Specify encoding for output.
 
 <DT><SAMP>&lsquo;--use-first&rsquo;</SAMP>
 <DD>
-<A NAME="IDX757"></A>
+<A NAME="IDX764"></A>
 Use first available translation for each message.  Don't merge several
 translations into one.
 
@@ -1595,40 +1606,40 @@ translations into one.
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX758"></A>
+<A NAME="IDX765"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX759"></A>
+<A NAME="IDX766"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX760"></A>
+<A NAME="IDX767"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX761"></A>
-<A NAME="IDX762"></A>
+<A NAME="IDX768"></A>
+<A NAME="IDX769"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX763"></A>
+<A NAME="IDX770"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX764"></A>
-<A NAME="IDX765"></A>
+<A NAME="IDX771"></A>
+<A NAME="IDX772"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -1639,7 +1650,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX766"></A>
+<A NAME="IDX773"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1648,15 +1659,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX767"></A>
-<A NAME="IDX768"></A>
+<A NAME="IDX774"></A>
+<A NAME="IDX775"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX769"></A>
+<A NAME="IDX776"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1664,15 +1675,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX770"></A>
-<A NAME="IDX771"></A>
+<A NAME="IDX777"></A>
+<A NAME="IDX778"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX772"></A>
+<A NAME="IDX779"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1681,8 +1692,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX773"></A>
-<A NAME="IDX774"></A>
+<A NAME="IDX780"></A>
+<A NAME="IDX781"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1690,8 +1701,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX775"></A>
-<A NAME="IDX776"></A>
+<A NAME="IDX782"></A>
+<A NAME="IDX783"></A>
 Sort output by file location.
 
 </DL>
@@ -1706,16 +1717,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX777"></A>
-<A NAME="IDX778"></A>
+<A NAME="IDX784"></A>
+<A NAME="IDX785"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX779"></A>
-<A NAME="IDX780"></A>
+<A NAME="IDX786"></A>
+<A NAME="IDX787"></A>
 Output version information and exit.
 
 </DL>
@@ -1725,15 +1736,15 @@ Output version information and exit.
 <H2><A NAME="SEC119" HREF="gettext_toc.html#TOC119">9.6  Invoking the <CODE>msgcomm</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX781"></A>
-<A NAME="IDX782"></A>
+<A NAME="IDX788"></A>
+<A NAME="IDX789"></A>
 
 <PRE>
 msgcomm [<VAR>option</VAR>] [<VAR>inputfile</VAR>]...
 </PRE>
 
 <P>
-<A NAME="IDX783"></A>
+<A NAME="IDX790"></A>
 The <CODE>msgcomm</CODE> program finds messages which are common to two or more
 of the specified PO files.
 By using the <CODE>--more-than</CODE> option, greater commonality may be requested
@@ -1759,8 +1770,8 @@ Input files.
 <DD>
 <DT><SAMP>&lsquo;--files-from=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX784"></A>
-<A NAME="IDX785"></A>
+<A NAME="IDX791"></A>
+<A NAME="IDX792"></A>
 Read the names of the input files from <VAR>file</VAR> instead of getting
 them from the command line.
 
@@ -1768,8 +1779,8 @@ them from the command line.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX786"></A>
-<A NAME="IDX787"></A>
+<A NAME="IDX793"></A>
+<A NAME="IDX794"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -1790,8 +1801,8 @@ If <VAR>inputfile</VAR> is <SAMP>&lsquo;-&rsquo;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX788"></A>
-<A NAME="IDX789"></A>
+<A NAME="IDX795"></A>
+<A NAME="IDX796"></A>
 Write output to specified file.
 
 </DL>
@@ -1811,8 +1822,8 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--less-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX790"></A>
-<A NAME="IDX791"></A>
+<A NAME="IDX797"></A>
+<A NAME="IDX798"></A>
 Print messages with less than <VAR>number</VAR> definitions, defaults to infinite
 if not set.
 
@@ -1820,8 +1831,8 @@ if not set.
 <DD>
 <DT><SAMP>&lsquo;--more-than=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX792"></A>
-<A NAME="IDX793"></A>
+<A NAME="IDX799"></A>
+<A NAME="IDX800"></A>
 Print messages with more than <VAR>number</VAR> definitions, defaults to 1 if not
 set.
 
@@ -1829,8 +1840,8 @@ set.
 <DD>
 <DT><SAMP>&lsquo;--unique&rsquo;</SAMP>
 <DD>
-<A NAME="IDX794"></A>
-<A NAME="IDX795"></A>
+<A NAME="IDX801"></A>
+<A NAME="IDX802"></A>
 Shorthand for <SAMP>&lsquo;--less-than=2&rsquo;</SAMP>.  Requests that only unique messages be
 printed.
 
@@ -1846,14 +1857,14 @@ printed.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX796"></A>
-<A NAME="IDX797"></A>
+<A NAME="IDX803"></A>
+<A NAME="IDX804"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX798"></A>
+<A NAME="IDX805"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -1869,40 +1880,40 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX799"></A>
+<A NAME="IDX806"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX800"></A>
+<A NAME="IDX807"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX801"></A>
+<A NAME="IDX808"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX802"></A>
-<A NAME="IDX803"></A>
+<A NAME="IDX809"></A>
+<A NAME="IDX810"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX804"></A>
+<A NAME="IDX811"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX805"></A>
-<A NAME="IDX806"></A>
+<A NAME="IDX812"></A>
+<A NAME="IDX813"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -1913,7 +1924,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX807"></A>
+<A NAME="IDX814"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -1922,15 +1933,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX808"></A>
-<A NAME="IDX809"></A>
+<A NAME="IDX815"></A>
+<A NAME="IDX816"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX810"></A>
+<A NAME="IDX817"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -1938,15 +1949,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX811"></A>
-<A NAME="IDX812"></A>
+<A NAME="IDX818"></A>
+<A NAME="IDX819"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX813"></A>
+<A NAME="IDX820"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -1955,8 +1966,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX814"></A>
-<A NAME="IDX815"></A>
+<A NAME="IDX821"></A>
+<A NAME="IDX822"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -1964,13 +1975,13 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX816"></A>
-<A NAME="IDX817"></A>
+<A NAME="IDX823"></A>
+<A NAME="IDX824"></A>
 Sort output by file location.
 
 <DT><SAMP>&lsquo;--omit-header&rsquo;</SAMP>
 <DD>
-<A NAME="IDX818"></A>
+<A NAME="IDX825"></A>
 Don't write header with <SAMP>&lsquo;msgid ""&rsquo;</SAMP> entry.
 
 </DL>
@@ -1985,16 +1996,16 @@ Don't write header with <SAMP>&lsquo;msgid ""&rsquo;</SAMP> entry.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX819"></A>
-<A NAME="IDX820"></A>
+<A NAME="IDX826"></A>
+<A NAME="IDX827"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX821"></A>
-<A NAME="IDX822"></A>
+<A NAME="IDX828"></A>
+<A NAME="IDX829"></A>
 Output version information and exit.
 
 </DL>
@@ -2004,15 +2015,15 @@ Output version information and exit.
 <H2><A NAME="SEC126" HREF="gettext_toc.html#TOC126">9.7  Invoking the <CODE>msgcmp</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX823"></A>
-<A NAME="IDX824"></A>
+<A NAME="IDX830"></A>
+<A NAME="IDX831"></A>
 
 <PRE>
 msgcmp [<VAR>option</VAR>] <VAR>def</VAR>.po <VAR>ref</VAR>.pot
 </PRE>
 
 <P>
-<A NAME="IDX825"></A>
+<A NAME="IDX832"></A>
 The <CODE>msgcmp</CODE> program compares two Uniforum style .po files to check that
 both contain the same set of msgid strings.  The <VAR>def</VAR>.po file is an
 existing PO file with the translations.  The <VAR>ref</VAR>.pot file is the last
@@ -2040,8 +2051,8 @@ References to the sources.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX826"></A>
-<A NAME="IDX827"></A>
+<A NAME="IDX833"></A>
+<A NAME="IDX834"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.
 
@@ -2057,29 +2068,29 @@ searched relative to this list of directories.
 <DD>
 <DT><SAMP>&lsquo;--multi-domain&rsquo;</SAMP>
 <DD>
-<A NAME="IDX828"></A>
-<A NAME="IDX829"></A>
+<A NAME="IDX835"></A>
+<A NAME="IDX836"></A>
 Apply <VAR>ref</VAR>.pot to each of the domains in <VAR>def</VAR>.po.
 
 <DT><SAMP>&lsquo;-N&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--no-fuzzy-matching&rsquo;</SAMP>
 <DD>
-<A NAME="IDX830"></A>
-<A NAME="IDX831"></A>
+<A NAME="IDX837"></A>
+<A NAME="IDX838"></A>
 Do not use fuzzy matching when an exact match is not found.  This may speed
 up the operation considerably.
 
 <DT><SAMP>&lsquo;--use-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX832"></A>
+<A NAME="IDX839"></A>
 Consider fuzzy messages in the <VAR>def</VAR>.po file like translated messages.
 Note that using this option is usually wrong, because fuzzy messages are
 exactly those which have not been validated by a human translator.
 
 <DT><SAMP>&lsquo;--use-untranslated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX833"></A>
+<A NAME="IDX840"></A>
 Consider untranslated messages in the <VAR>def</VAR>.po file like translated
 messages.  Note that using this option is usually wrong.
 
@@ -2095,14 +2106,14 @@ messages.  Note that using this option is usually wrong.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX834"></A>
-<A NAME="IDX835"></A>
+<A NAME="IDX841"></A>
+<A NAME="IDX842"></A>
 Assume the input files are Java ResourceBundles in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX836"></A>
+<A NAME="IDX843"></A>
 Assume the input files are NeXTstep/GNUstep localized resource files in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2118,16 +2129,16 @@ Assume the input files are NeXTstep/GNUstep localized resource files in
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX837"></A>
-<A NAME="IDX838"></A>
+<A NAME="IDX844"></A>
+<A NAME="IDX845"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX839"></A>
-<A NAME="IDX840"></A>
+<A NAME="IDX846"></A>
+<A NAME="IDX847"></A>
 Output version information and exit.
 
 </DL>
@@ -2137,16 +2148,16 @@ Output version information and exit.
 <H2><A NAME="SEC131" HREF="gettext_toc.html#TOC131">9.8  Invoking the <CODE>msgattrib</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX841"></A>
-<A NAME="IDX842"></A>
+<A NAME="IDX848"></A>
+<A NAME="IDX849"></A>
 
 <PRE>
 msgattrib [<VAR>option</VAR>] [<VAR>inputfile</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX843"></A>
-<A NAME="IDX844"></A>
+<A NAME="IDX850"></A>
+<A NAME="IDX851"></A>
 The <CODE>msgattrib</CODE> program filters the messages of a translation catalog
 according to their attributes, and manipulates the attributes.
 
@@ -2165,8 +2176,8 @@ Input PO file.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX845"></A>
-<A NAME="IDX846"></A>
+<A NAME="IDX852"></A>
+<A NAME="IDX853"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -2187,8 +2198,8 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, st
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX847"></A>
-<A NAME="IDX848"></A>
+<A NAME="IDX854"></A>
+<A NAME="IDX855"></A>
 Write output to specified file.
 
 </DL>
@@ -2206,36 +2217,36 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 
 <DT><SAMP>&lsquo;--translated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX849"></A>
+<A NAME="IDX856"></A>
 Keep translated messages, remove untranslated messages.
 
 <DT><SAMP>&lsquo;--untranslated&rsquo;</SAMP>
 <DD>
-<A NAME="IDX850"></A>
+<A NAME="IDX857"></A>
 Keep untranslated messages, remove translated messages.
 
 <DT><SAMP>&lsquo;--no-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX851"></A>
+<A NAME="IDX858"></A>
 Remove
 ‘fuzzy’
 marked messages.
 
 <DT><SAMP>&lsquo;--only-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX852"></A>
+<A NAME="IDX859"></A>
 Keep
 ‘fuzzy’
 marked messages, remove all other messages.
 
 <DT><SAMP>&lsquo;--no-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX853"></A>
+<A NAME="IDX860"></A>
 Remove obsolete #~ messages.
 
 <DT><SAMP>&lsquo;--only-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX854"></A>
+<A NAME="IDX861"></A>
 Keep obsolete #~ messages, remove all other messages.
 
 </DL>
@@ -2245,7 +2256,7 @@ Keep obsolete #~ messages, remove all other messages.
 <H3><A NAME="SEC135" HREF="gettext_toc.html#TOC135">9.8.4  Attribute manipulation</A></H3>
 
 <P>
-<A NAME="IDX855"></A>
+<A NAME="IDX862"></A>
 Attributes are modified after the message selection/removal has been
 performed.  If the <SAMP>&lsquo;--only-file&rsquo;</SAMP> or <SAMP>&lsquo;--ignore-file&rsquo;</SAMP> option is
 specified, the attribute modification is applied only to those messages
@@ -2257,60 +2268,60 @@ that are listed in the <VAR>only-file</VAR> and not listed in the
 
 <DT><SAMP>&lsquo;--set-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX856"></A>
+<A NAME="IDX863"></A>
 Set all messages
 ‘fuzzy’.
 
 <DT><SAMP>&lsquo;--clear-fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX857"></A>
+<A NAME="IDX864"></A>
 Set all messages
 non-‘fuzzy’.
 
 <DT><SAMP>&lsquo;--set-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX858"></A>
+<A NAME="IDX865"></A>
 Set all messages obsolete.
 
 <DT><SAMP>&lsquo;--clear-obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX859"></A>
+<A NAME="IDX866"></A>
 Set all messages non-obsolete.
 
 <DT><SAMP>&lsquo;--previous&rsquo;</SAMP>
 <DD>
-<A NAME="IDX860"></A>
+<A NAME="IDX867"></A>
 When setting
 ‘fuzzy’
 mark, keep “previous msgid” of translated messages.
 
 <DT><SAMP>&lsquo;--clear-previous&rsquo;</SAMP>
 <DD>
-<A NAME="IDX861"></A>
+<A NAME="IDX868"></A>
 Remove the “previous msgid” (<SAMP>&lsquo;#|&rsquo;</SAMP>) comments from all messages.
 
 <DT><SAMP>&lsquo;--empty&rsquo;</SAMP>
 <DD>
-<A NAME="IDX862"></A>
+<A NAME="IDX869"></A>
 When removing
 ‘fuzzy’
 mark, also set msgstr empty.
 
 <DT><SAMP>&lsquo;--only-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX863"></A>
+<A NAME="IDX870"></A>
 Limit the attribute changes to entries that are listed in <VAR>file</VAR>.
 <VAR>file</VAR> should be a PO or POT file.
 
 <DT><SAMP>&lsquo;--ignore-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX864"></A>
+<A NAME="IDX871"></A>
 Limit the attribute changes to entries that are not listed in <VAR>file</VAR>.
 <VAR>file</VAR> should be a PO or POT file.
 
 <DT><SAMP>&lsquo;--fuzzy&rsquo;</SAMP>
 <DD>
-<A NAME="IDX865"></A>
+<A NAME="IDX872"></A>
 Synonym for <SAMP>&lsquo;--only-fuzzy --clear-fuzzy&rsquo;</SAMP>: It keeps only the fuzzy
 messages and removes their
 ‘fuzzy’
@@ -2318,7 +2329,7 @@ mark.
 
 <DT><SAMP>&lsquo;--obsolete&rsquo;</SAMP>
 <DD>
-<A NAME="IDX866"></A>
+<A NAME="IDX873"></A>
 Synonym for <SAMP>&lsquo;--only-obsolete --clear-obsolete&rsquo;</SAMP>: It keeps only the
 obsolete messages and makes them non-obsolete.
 
@@ -2334,14 +2345,14 @@ obsolete messages and makes them non-obsolete.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX867"></A>
-<A NAME="IDX868"></A>
+<A NAME="IDX874"></A>
+<A NAME="IDX875"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX869"></A>
+<A NAME="IDX876"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2357,40 +2368,40 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX870"></A>
+<A NAME="IDX877"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX871"></A>
+<A NAME="IDX878"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX872"></A>
+<A NAME="IDX879"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX873"></A>
-<A NAME="IDX874"></A>
+<A NAME="IDX880"></A>
+<A NAME="IDX881"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX875"></A>
+<A NAME="IDX882"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX876"></A>
-<A NAME="IDX877"></A>
+<A NAME="IDX883"></A>
+<A NAME="IDX884"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -2401,7 +2412,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX878"></A>
+<A NAME="IDX885"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -2410,15 +2421,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX879"></A>
-<A NAME="IDX880"></A>
+<A NAME="IDX886"></A>
+<A NAME="IDX887"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX881"></A>
+<A NAME="IDX888"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -2426,15 +2437,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX882"></A>
-<A NAME="IDX883"></A>
+<A NAME="IDX889"></A>
+<A NAME="IDX890"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX884"></A>
+<A NAME="IDX891"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -2443,8 +2454,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX885"></A>
-<A NAME="IDX886"></A>
+<A NAME="IDX892"></A>
+<A NAME="IDX893"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -2452,8 +2463,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX887"></A>
-<A NAME="IDX888"></A>
+<A NAME="IDX894"></A>
+<A NAME="IDX895"></A>
 Sort output by file location.
 
 </DL>
@@ -2468,16 +2479,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX889"></A>
-<A NAME="IDX890"></A>
+<A NAME="IDX896"></A>
+<A NAME="IDX897"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX891"></A>
-<A NAME="IDX892"></A>
+<A NAME="IDX898"></A>
+<A NAME="IDX899"></A>
 Output version information and exit.
 
 </DL>
@@ -2487,15 +2498,15 @@ Output version information and exit.
 <H2><A NAME="SEC139" HREF="gettext_toc.html#TOC139">9.9  Invoking the <CODE>msgen</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX893"></A>
-<A NAME="IDX894"></A>
+<A NAME="IDX900"></A>
+<A NAME="IDX901"></A>
 
 <PRE>
 msgen [<VAR>option</VAR>] <VAR>inputfile</VAR>
 </PRE>
 
 <P>
-<A NAME="IDX895"></A>
+<A NAME="IDX902"></A>
 The <CODE>msgen</CODE> program creates an English translation catalog.  The
 input file is the last created English PO file, or a PO Template file
 (generally created by xgettext).  Untranslated entries are assigned a
@@ -2522,8 +2533,8 @@ Input PO or POT file.
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX896"></A>
-<A NAME="IDX897"></A>
+<A NAME="IDX903"></A>
+<A NAME="IDX904"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -2544,8 +2555,8 @@ If <VAR>inputfile</VAR> is <SAMP>&lsquo;-&rsquo;</SAMP>, standard input is read.
 <DD>
 <DT><SAMP>&lsquo;--output-file=<VAR>file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX898"></A>
-<A NAME="IDX899"></A>
+<A NAME="IDX905"></A>
+<A NAME="IDX906"></A>
 Write output to specified file.
 
 </DL>
@@ -2565,14 +2576,14 @@ or if it is <SAMP>&lsquo;-&rsquo;</SAMP>.
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX900"></A>
-<A NAME="IDX901"></A>
+<A NAME="IDX907"></A>
+<A NAME="IDX908"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX902"></A>
+<A NAME="IDX909"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2586,7 +2597,7 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 
 <DT><SAMP>&lsquo;--lang=<VAR>catalogname</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX903"></A>
+<A NAME="IDX910"></A>
 Specify the <SAMP>&lsquo;Language&rsquo;</SAMP> field to be used in the header entry.  See
 section <A HREF="gettext_6.html#SEC44">6.2  Filling in the Header Entry</A> for the meaning of this field.  Note: The
 <SAMP>&lsquo;Language-Team&rsquo;</SAMP> and <SAMP>&lsquo;Plural-Forms&rsquo;</SAMP> fields are not set by this
@@ -2596,39 +2607,39 @@ option.
 <DD>
 <DT><SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX904"></A>
+<A NAME="IDX911"></A>
 Specify whether or when to use colors and other text attributes.
 See section <A HREF="gettext_9.html#SEC150">9.11.1  The <CODE>--color</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX905"></A>
+<A NAME="IDX912"></A>
 Specify the CSS style rule file to use for <CODE>--color</CODE>.
 See section <A HREF="gettext_9.html#SEC152">9.11.3  The <CODE>--style</CODE> option</A> for details.
 
 <DT><SAMP>&lsquo;--force-po&rsquo;</SAMP>
 <DD>
-<A NAME="IDX906"></A>
+<A NAME="IDX913"></A>
 Always write an output file even if it contains no message.
 
 <DT><SAMP>&lsquo;-i&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--indent&rsquo;</SAMP>
 <DD>
-<A NAME="IDX907"></A>
-<A NAME="IDX908"></A>
+<A NAME="IDX914"></A>
+<A NAME="IDX915"></A>
 Write the .po file using indented style.
 
 <DT><SAMP>&lsquo;--no-location&rsquo;</SAMP>
 <DD>
-<A NAME="IDX909"></A>
+<A NAME="IDX916"></A>
 Do not write <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines.
 
 <DT><SAMP>&lsquo;-n&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--add-location=<VAR>type</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX910"></A>
+<A NAME="IDX917"></A>
 Generate <SAMP>&lsquo;#: <VAR>filename</VAR>:<VAR>line</VAR>&rsquo;</SAMP> lines (default).
 
 The optional <VAR>type</VAR> can be either <SAMP>&lsquo;full&rsquo;</SAMP>, <SAMP>&lsquo;file&rsquo;</SAMP>, or
@@ -2639,7 +2650,7 @@ suppresses the lines (same as <CODE>--no-location</CODE>).
 
 <DT><SAMP>&lsquo;--strict&rsquo;</SAMP>
 <DD>
-<A NAME="IDX911"></A>
+<A NAME="IDX918"></A>
 Write out a strict Uniforum conforming PO file.  Note that this
 Uniforum format should be avoided because it doesn't support the
 GNU extensions.
@@ -2648,15 +2659,15 @@ GNU extensions.
 <DD>
 <DT><SAMP>&lsquo;--properties-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX912"></A>
-<A NAME="IDX913"></A>
+<A NAME="IDX919"></A>
+<A NAME="IDX920"></A>
 Write out a Java ResourceBundle in Java <CODE>.properties</CODE> syntax.  Note
 that this file format doesn't support plural forms and silently drops
 obsolete messages.
 
 <DT><SAMP>&lsquo;--stringtable-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX914"></A>
+<A NAME="IDX921"></A>
 Write out a NeXTstep/GNUstep localized resource file in <CODE>.strings</CODE> syntax.
 Note that this file format doesn't support plural forms.
 
@@ -2664,15 +2675,15 @@ Note that this file format doesn't support plural forms.
 <DD>
 <DT><SAMP>&lsquo;--width=<VAR>number</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX915"></A>
-<A NAME="IDX916"></A>
+<A NAME="IDX922"></A>
+<A NAME="IDX923"></A>
 Set the output page width.  Long strings in the output files will be
 split across multiple lines in order to ensure that each line's width
 (= number of screen columns) is less or equal to the given <VAR>number</VAR>.
 
 <DT><SAMP>&lsquo;--no-wrap&rsquo;</SAMP>
 <DD>
-<A NAME="IDX917"></A>
+<A NAME="IDX924"></A>
 Do not break long message lines.  Message lines whose width exceeds the
 output page width will not be split into several lines.  Only file reference
 lines which are wider than the output page width will be split.
@@ -2681,8 +2692,8 @@ lines which are wider than the output page width will be split.
 <DD>
 <DT><SAMP>&lsquo;--sort-output&rsquo;</SAMP>
 <DD>
-<A NAME="IDX918"></A>
-<A NAME="IDX919"></A>
+<A NAME="IDX925"></A>
+<A NAME="IDX926"></A>
 Generate sorted output.  Note that using this option makes it much harder
 for the translator to understand each message's context.
 
@@ -2690,8 +2701,8 @@ for the translator to understand each message's context.
 <DD>
 <DT><SAMP>&lsquo;--sort-by-file&rsquo;</SAMP>
 <DD>
-<A NAME="IDX920"></A>
-<A NAME="IDX921"></A>
+<A NAME="IDX927"></A>
+<A NAME="IDX928"></A>
 Sort output by file location.
 
 </DL>
@@ -2706,16 +2717,16 @@ Sort output by file location.
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX922"></A>
-<A NAME="IDX923"></A>
+<A NAME="IDX929"></A>
+<A NAME="IDX930"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX924"></A>
-<A NAME="IDX925"></A>
+<A NAME="IDX931"></A>
+<A NAME="IDX932"></A>
 Output version information and exit.
 
 </DL>
@@ -2725,15 +2736,15 @@ Output version information and exit.
 <H2><A NAME="SEC145" HREF="gettext_toc.html#TOC145">9.10  Invoking the <CODE>msgexec</CODE> Program</A></H2>
 
 <P>
-<A NAME="IDX926"></A>
-<A NAME="IDX927"></A>
+<A NAME="IDX933"></A>
+<A NAME="IDX934"></A>
 
 <PRE>
 msgexec [<VAR>option</VAR>] <VAR>command</VAR> [<VAR>command-option</VAR>]
 </PRE>
 
 <P>
-<A NAME="IDX928"></A>
+<A NAME="IDX935"></A>
 The <CODE>msgexec</CODE> program applies a command to all translations of a
 translation catalog.
 The <VAR>command</VAR> can be any program that reads a translation from standard
@@ -2743,21 +2754,30 @@ across all invocations.
 
 </P>
 <P>
-<A NAME="IDX929"></A>
+<A NAME="IDX936"></A>
 A special builtin command called <SAMP>&lsquo;0&rsquo;</SAMP> outputs the translation, followed
 by a null byte.  The output of <SAMP>&lsquo;msgexec 0&rsquo;</SAMP> is suitable as input for
 <SAMP>&lsquo;xargs -0&rsquo;</SAMP>.
 
 </P>
-<P>
-<A NAME="IDX930"></A>
-<A NAME="IDX931"></A>
-<A NAME="IDX932"></A>
-<A NAME="IDX933"></A>
-<A NAME="IDX934"></A>
-<A NAME="IDX935"></A>
-<A NAME="IDX936"></A>
+<DL COMPACT>
+
+<DT><SAMP>&lsquo;--newline&rsquo;</SAMP>
+<DD>
 <A NAME="IDX937"></A>
+Add newline at the end of each input line.
+
+</DL>
+
+<P>
+<A NAME="IDX938"></A>
+<A NAME="IDX939"></A>
+<A NAME="IDX940"></A>
+<A NAME="IDX941"></A>
+<A NAME="IDX942"></A>
+<A NAME="IDX943"></A>
+<A NAME="IDX944"></A>
+<A NAME="IDX945"></A>
 During each <VAR>command</VAR> invocation, the environment variable
 <CODE>MSGEXEC_MSGID</CODE> is bound to the message's msgid, and the environment
 variable <CODE>MSGEXEC_LOCATION</CODE> is bound to the location in the PO file
@@ -2775,7 +2795,7 @@ the previous msgid_plural.
 
 </P>
 <P>
-<A NAME="IDX938"></A>
+<A NAME="IDX946"></A>
 Note: It is your responsibility to ensure that the <VAR>command</VAR> can cope
 with input encoded in the translation catalog's encoding.  If the
 <VAR>command</VAR> wants input in a particular encoding, you can in a first step
@@ -2797,16 +2817,16 @@ locale, by using the <CODE>LC_ALL</CODE> environment variable.
 <DD>
 <DT><SAMP>&lsquo;--input=<VAR>inputfile</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX939"></A>
-<A NAME="IDX940"></A>
+<A NAME="IDX947"></A>
+<A NAME="IDX948"></A>
 Input PO file.
 
 <DT><SAMP>&lsquo;-D <VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--directory=<VAR>directory</VAR>&rsquo;</SAMP>
 <DD>
-<A NAME="IDX941"></A>
-<A NAME="IDX942"></A>
+<A NAME="IDX949"></A>
+<A NAME="IDX950"></A>
 Add <VAR>directory</VAR> to the list of directories.  Source files are
 searched relative to this list of directories.  The resulting <TT>&lsquo;.po&rsquo;</TT>
 file will be written relative to the current directory, though.
@@ -2827,14 +2847,14 @@ If no <VAR>inputfile</VAR> is given or if it is <SAMP>&lsquo;-&rsquo;</SAMP>, st
 <DD>
 <DT><SAMP>&lsquo;--properties-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX943"></A>
-<A NAME="IDX944"></A>
+<A NAME="IDX951"></A>
+<A NAME="IDX952"></A>
 Assume the input file is a Java ResourceBundle in Java <CODE>.properties</CODE>
 syntax, not in PO file syntax.
 
 <DT><SAMP>&lsquo;--stringtable-input&rsquo;</SAMP>
 <DD>
-<A NAME="IDX945"></A>
+<A NAME="IDX953"></A>
 Assume the input file is a NeXTstep/GNUstep localized resource file in
 <CODE>.strings</CODE> syntax, not in PO file syntax.
 
@@ -2850,16 +2870,16 @@ Assume the input file is a NeXTstep/GNUstep localized resource file in
 <DD>
 <DT><SAMP>&lsquo;--help&rsquo;</SAMP>
 <DD>
-<A NAME="IDX946"></A>
-<A NAME="IDX947"></A>
+<A NAME="IDX954"></A>
+<A NAME="IDX955"></A>
 Display this help and exit.
 
 <DT><SAMP>&lsquo;-V&rsquo;</SAMP>
 <DD>
 <DT><SAMP>&lsquo;--version&rsquo;</SAMP>
 <DD>
-<A NAME="IDX948"></A>
-<A NAME="IDX949"></A>
+<A NAME="IDX956"></A>
+<A NAME="IDX957"></A>
 Output version information and exit.
 
 </DL>
@@ -2888,7 +2908,7 @@ Such highlighting is possible through the <CODE>msgcat</CODE> options
 <H3><A NAME="SEC150" HREF="gettext_toc.html#TOC150">9.11.1  The <CODE>--color</CODE> option</A></H3>
 
 <P>
-<A NAME="IDX950"></A>
+<A NAME="IDX958"></A>
 The <SAMP>&lsquo;--color=<VAR>when</VAR>&rsquo;</SAMP> option specifies under which conditions
 colorized output should be generated.  The <VAR>when</VAR> part can be one of
 the following:
@@ -2954,7 +2974,7 @@ you therefore normally don't need to save output produced with the
 <H3><A NAME="SEC151" HREF="gettext_toc.html#TOC151">9.11.2  The environment variable <CODE>TERM</CODE></A></H3>
 
 <P>
-<A NAME="IDX951"></A>
+<A NAME="IDX959"></A>
 The environment variable <CODE>TERM</CODE> contains a identifier for the text
 window's capabilities.  You can get a detailed list of these cababilities
 by using the <SAMP>&lsquo;infocmp&rsquo;</SAMP> command, using <SAMP>&lsquo;man 5 terminfo&rsquo;</SAMP> as a
@@ -3001,14 +3021,14 @@ reasonable color map.
 <H3><A NAME="SEC152" HREF="gettext_toc.html#TOC152">9.11.3  The <CODE>--style</CODE> option</A></H3>
 
 <P>
-<A NAME="IDX952"></A>
+<A NAME="IDX960"></A>
 The <SAMP>&lsquo;--style=<VAR>style_file</VAR>&rsquo;</SAMP> option specifies the style file to use
 when colorizing.  It has an effect only when the <CODE>--color</CODE> option is
 effective.
 
 </P>
 <P>
-<A NAME="IDX953"></A>
+<A NAME="IDX961"></A>
 If the <CODE>--style</CODE> option is not specified, the environment variable
 <CODE>PO_STYLE</CODE> is considered.  It is meant to point to the user's
 preferred style for PO files.
@@ -3404,7 +3424,7 @@ defined in a library called <SAMP>&lsquo;libgettextpo&rsquo;</SAMP>.
 <P>
 <DL>
 <DT><U>Data Type:</U> <B>po_file_t</B>
-<DD><A NAME="IDX954"></A>
+<DD><A NAME="IDX962"></A>
 This is a pointer type that refers to the contents of a PO file, after it has
 been read into memory.
 </DL>
@@ -3413,7 +3433,7 @@ been read into memory.
 <P>
 <DL>
 <DT><U>Data Type:</U> <B>po_message_iterator_t</B>
-<DD><A NAME="IDX955"></A>
+<DD><A NAME="IDX963"></A>
 This is a pointer type that refers to an iterator that produces a sequence of
 messages.
 </DL>
@@ -3422,7 +3442,7 @@ messages.
 <P>
 <DL>
 <DT><U>Data Type:</U> <B>po_message_t</B>
-<DD><A NAME="IDX956"></A>
+<DD><A NAME="IDX964"></A>
 This is a pointer type that refers to a message of a PO file, including its
 translation.
 </DL>
@@ -3431,7 +3451,7 @@ translation.
 <P>
 <DL>
 <DT><U>Function:</U> po_file_t <B>po_file_read</B> <I>(const char *<VAR>filename</VAR>)</I>
-<DD><A NAME="IDX957"></A>
+<DD><A NAME="IDX965"></A>
 The <CODE>po_file_read</CODE> function reads a PO file into memory.  The file name
 is given as argument.  The return value is a handle to the PO file's contents,
 valid until <CODE>po_file_free</CODE> is called on it.  In case of error, the return
@@ -3442,7 +3462,7 @@ value is <CODE>NULL</CODE>, and <CODE>errno</CODE> is set.
 <P>
 <DL>
 <DT><U>Function:</U> void <B>po_file_free</B> <I>(po_file_t <VAR>file</VAR>)</I>
-<DD><A NAME="IDX958"></A>
+<DD><A NAME="IDX966"></A>
 The <CODE>po_file_free</CODE> function frees a PO file's contents from memory,
 including all messages that are only implicitly accessible through iterators.
 </DL>
@@ -3451,7 +3471,7 @@ including all messages that are only implicitly accessible through iterators.
 <P>
 <DL>
 <DT><U>Function:</U> const char * const * <B>po_file_domains</B> <I>(po_file_t <VAR>file</VAR>)</I>
-<DD><A NAME="IDX959"></A>
+<DD><A NAME="IDX967"></A>
 The <CODE>po_file_domains</CODE> function returns the domains for which the given
 PO file has messages.  The return value is a <CODE>NULL</CODE> terminated array
 which is valid as long as the <VAR>file</VAR> handle is valid.  For PO files which
@@ -3463,7 +3483,7 @@ namely the default domain <CODE>"messages"</CODE>.
 <P>
 <DL>
 <DT><U>Function:</U> po_message_iterator_t <B>po_message_iterator</B> <I>(po_file_t <VAR>file</VAR>, const char *<VAR>domain</VAR>)</I>
-<DD><A NAME="IDX960"></A>
+<DD><A NAME="IDX968"></A>
 The <CODE>po_message_iterator</CODE> returns an iterator that will produce the
 messages of <VAR>file</VAR> that belong to the given <VAR>domain</VAR>.  If <VAR>domain</VAR>
 is <CODE>NULL</CODE>, the default domain is used instead.  To list the messages,
@@ -3474,7 +3494,7 @@ use the function <CODE>po_next_message</CODE> repeatedly.
 <P>
 <DL>
 <DT><U>Function:</U> void <B>po_message_iterator_free</B> <I>(po_message_iterator_t <VAR>iterator</VAR>)</I>
-<DD><A NAME="IDX961"></A>
+<DD><A NAME="IDX969"></A>
 The <CODE>po_message_iterator_free</CODE> function frees an iterator previously
 allocated through the <CODE>po_message_iterator</CODE> function.
 </DL>
@@ -3483,7 +3503,7 @@ allocated through the <CODE>po_message_iterator</CODE> function.
 <P>
 <DL>
 <DT><U>Function:</U> po_message_t <B>po_next_message</B> <I>(po_message_iterator_t <VAR>iterator</VAR>)</I>
-<DD><A NAME="IDX962"></A>
+<DD><A NAME="IDX970"></A>
 The <CODE>po_next_message</CODE> function returns the next message from
 <VAR>iterator</VAR> and advances the iterator.  It returns <CODE>NULL</CODE> when the
 iterator has reached the end of its message list.
@@ -3498,7 +3518,7 @@ that the results are valid as long as the <VAR>file</VAR> handle is valid.
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgid</B> <I>(po_message_t <VAR>message</VAR>)</I>
-<DD><A NAME="IDX963"></A>
+<DD><A NAME="IDX971"></A>
 The <CODE>po_message_msgid</CODE> function returns the <CODE>msgid</CODE> (untranslated
 English string) of a message.  This is guaranteed to be non-<CODE>NULL</CODE>.
 </DL>
@@ -3507,7 +3527,7 @@ English string) of a message.  This is guaranteed to be non-<CODE>NULL</CODE>.
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgid_plural</B> <I>(po_message_t <VAR>message</VAR>)</I>
-<DD><A NAME="IDX964"></A>
+<DD><A NAME="IDX972"></A>
 The <CODE>po_message_msgid_plural</CODE> function returns the <CODE>msgid_plural</CODE>
 (untranslated English plural string) of a message with plurals, or <CODE>NULL</CODE>
 for a message without plural.
@@ -3517,7 +3537,7 @@ for a message without plural.
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgstr</B> <I>(po_message_t <VAR>message</VAR>)</I>
-<DD><A NAME="IDX965"></A>
+<DD><A NAME="IDX973"></A>
 The <CODE>po_message_msgstr</CODE> function returns the <CODE>msgstr</CODE> (translation)
 of a message.  For an untranslated message, the return value is an empty
 string.
@@ -3527,7 +3547,7 @@ string.
 <P>
 <DL>
 <DT><U>Function:</U> const char * <B>po_message_msgstr_plural</B> <I>(po_message_t <VAR>message</VAR>, int <VAR>index</VAR>)</I>
-<DD><A NAME="IDX966"></A>
+<DD><A NAME="IDX974"></A>
 The <CODE>po_message_msgstr_plural</CODE> function returns the
 <CODE>msgstr[<VAR>index</VAR>]</CODE> of a message with plurals, or <CODE>NULL</CODE> when
 the <VAR>index</VAR> is out of range or for a message without plural.
diff --git a/gettext-tools/doc/gettext_foot.html b/gettext-tools/doc/gettext_foot.html
index f20d99a..809fb96 100644
--- a/gettext-tools/doc/gettext_foot.html
+++ b/gettext-tools/doc/gettext_foot.html
@@ -1,15 +1,15 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Footnotes</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.19.4</H1>
+<H1>GNU gettext tools, version 0.19.7</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.19.4, 9 December 2014</H2>
+<H2>Edition 0.19.7, 8 December 2015</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -36,11 +36,15 @@ variables.
 <H3><A NAME="FOOT5" HREF="gettext_11.html#DOCF5">(5)</A></H3>
 <P>Additions are welcome.  Send appropriate information to
 <A HREF="mailto:bug-gnu-gettext@gnu.org">bug-gnu-gettext@gnu.org</A> and <A HREF="mailto:bug-glibc-manual@gnu.org">bug-glibc-manual@gnu.org</A>.
+The Unicode CLDR Project (<A HREF="http://cldr.unicode.org">http://cldr.unicode.org</A>) provides a
+comprehensive set of plural forms in a different format.  The
+<CODE>msginit</CODE> program has preliminary support for the format so you can
+use it as a baseline (see section <A HREF="gettext_6.html#SEC38">6.1  Invoking the <CODE>msginit</CODE> Program</A>).
 <H3><A NAME="FOOT6" HREF="gettext_13.html#DOCF6">(6)</A></H3>
 <P>you can also use it through the
 <SAMP>&lsquo;MSGMERGE_OPTIONS&rsquo;</SAMP> option from <TT>&lsquo;Makevars&rsquo;</TT>
 <P><HR><P>
-This document was generated on 24 December 2014 using the
+This document was generated on 28 December 2015 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52b.</P>
 </BODY>
diff --git a/gettext-tools/doc/gettext_toc.html b/gettext-tools/doc/gettext_toc.html
index 7fa6f23..346a6d1 100644
--- a/gettext-tools/doc/gettext_toc.html
+++ b/gettext-tools/doc/gettext_toc.html
@@ -1,15 +1,15 @@
 <HTML>
 <HEAD>
 <!-- This HTML file has been created by texi2html 1.52b
-     from gettext.texi on 24 December 2014 -->
+     from gettext.texi on 28 December 2015 -->
 
 <META HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
 <TITLE>GNU gettext utilities - Table of Contents</TITLE>
 </HEAD>
 <BODY>
-<H1>GNU gettext tools, version 0.19.4</H1>
+<H1>GNU gettext tools, version 0.19.7</H1>
 <H2>Native Language Support Library and Tools</H2>
-<H2>Edition 0.19.4, 9 December 2014</H2>
+<H2>Edition 0.19.7, 8 December 2015</H2>
 <ADDRESS>Ulrich Drepper</ADDRESS>
 <ADDRESS>Jim Meyering</ADDRESS>
 <ADDRESS>Fran&ccedil;ois Pinard</ADDRESS>
@@ -237,229 +237,237 @@
 <LI><A NAME="TOC162" HREF="gettext_10.html#SEC162">10.1.5  Output file location in C# mode</A>
 <LI><A NAME="TOC163" HREF="gettext_10.html#SEC163">10.1.6  Output file location in Tcl mode</A>
 <LI><A NAME="TOC164" HREF="gettext_10.html#SEC164">10.1.7  Desktop Entry mode operations</A>
-<LI><A NAME="TOC165" HREF="gettext_10.html#SEC165">10.1.8  Input file syntax</A>
-<LI><A NAME="TOC166" HREF="gettext_10.html#SEC166">10.1.9  Input file interpretation</A>
-<LI><A NAME="TOC167" HREF="gettext_10.html#SEC167">10.1.10  Output details</A>
-<LI><A NAME="TOC168" HREF="gettext_10.html#SEC168">10.1.11  Informative output</A>
-</UL>
-<LI><A NAME="TOC169" HREF="gettext_10.html#SEC169">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A>
+<LI><A NAME="TOC165" HREF="gettext_10.html#SEC165">10.1.8  XML mode operations</A>
+<LI><A NAME="TOC166" HREF="gettext_10.html#SEC166">10.1.9  Input file syntax</A>
+<LI><A NAME="TOC167" HREF="gettext_10.html#SEC167">10.1.10  Input file interpretation</A>
+<LI><A NAME="TOC168" HREF="gettext_10.html#SEC168">10.1.11  Output details</A>
+<LI><A NAME="TOC169" HREF="gettext_10.html#SEC169">10.1.12  Informative output</A>
+</UL>
+<LI><A NAME="TOC170" HREF="gettext_10.html#SEC170">10.2  Invoking the <CODE>msgunfmt</CODE> Program</A>
 <UL>
-<LI><A NAME="TOC170" HREF="gettext_10.html#SEC170">10.2.1  Operation mode</A>
-<LI><A NAME="TOC171" HREF="gettext_10.html#SEC171">10.2.2  Input file location</A>
-<LI><A NAME="TOC172" HREF="gettext_10.html#SEC172">10.2.3  Input file location in Java mode</A>
-<LI><A NAME="TOC173" HREF="gettext_10.html#SEC173">10.2.4  Input file location in C# mode</A>
-<LI><A NAME="TOC174" HREF="gettext_10.html#SEC174">10.2.5  Input file location in Tcl mode</A>
-<LI><A NAME="TOC175" HREF="gettext_10.html#SEC175">10.2.6  Output file location</A>
-<LI><A NAME="TOC176" HREF="gettext_10.html#SEC176">10.2.7  Output details</A>
-<LI><A NAME="TOC177" HREF="gettext_10.html#SEC177">10.2.8  Informative output</A>
+<LI><A NAME="TOC171" HREF="gettext_10.html#SEC171">10.2.1  Operation mode</A>
+<LI><A NAME="TOC172" HREF="gettext_10.html#SEC172">10.2.2  Input file location</A>
+<LI><A NAME="TOC173" HREF="gettext_10.html#SEC173">10.2.3  Input file location in Java mode</A>
+<LI><A NAME="TOC174" HREF="gettext_10.html#SEC174">10.2.4  Input file location in C# mode</A>
+<LI><A NAME="TOC175" HREF="gettext_10.html#SEC175">10.2.5  Input file location in Tcl mode</A>
+<LI><A NAME="TOC176" HREF="gettext_10.html#SEC176">10.2.6  Output file location</A>
+<LI><A NAME="TOC177" HREF="gettext_10.html#SEC177">10.2.7  Output details</A>
+<LI><A NAME="TOC178" HREF="gettext_10.html#SEC178">10.2.8  Informative output</A>
 </UL>
-<LI><A NAME="TOC178" HREF="gettext_10.html#SEC178">10.3  The Format of GNU MO Files</A>
+<LI><A NAME="TOC179" HREF="gettext_10.html#SEC179">10.3  The Format of GNU MO Files</A>
 </UL>
-<LI><A NAME="TOC179" HREF="gettext_11.html#SEC179">11  The Programmer's View</A>
+<LI><A NAME="TOC180" HREF="gettext_11.html#SEC180">11  The Programmer's View</A>
 <UL>
-<LI><A NAME="TOC180" HREF="gettext_11.html#SEC180">11.1  About <CODE>catgets</CODE></A>
+<LI><A NAME="TOC181" HREF="gettext_11.html#SEC181">11.1  About <CODE>catgets</CODE></A>
 <UL>
-<LI><A NAME="TOC181" HREF="gettext_11.html#SEC181">11.1.1  The Interface</A>
-<LI><A NAME="TOC182" HREF="gettext_11.html#SEC182">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A>
-</UL>
-<LI><A NAME="TOC183" HREF="gettext_11.html#SEC183">11.2  About <CODE>gettext</CODE></A>
-<UL>
-<LI><A NAME="TOC184" HREF="gettext_11.html#SEC184">11.2.1  The Interface</A>
-<LI><A NAME="TOC185" HREF="gettext_11.html#SEC185">11.2.2  Solving Ambiguities</A>
-<LI><A NAME="TOC186" HREF="gettext_11.html#SEC186">11.2.3  Locating Message Catalog Files</A>
-<LI><A NAME="TOC187" HREF="gettext_11.html#SEC187">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>
-<LI><A NAME="TOC188" HREF="gettext_11.html#SEC188">11.2.5  Using contexts for solving ambiguities</A>
-<LI><A NAME="TOC189" HREF="gettext_11.html#SEC189">11.2.6  Additional functions for plural forms</A>
-<LI><A NAME="TOC190" HREF="gettext_11.html#SEC190">11.2.7  Optimization of the *gettext functions</A>
-</UL>
-<LI><A NAME="TOC191" HREF="gettext_11.html#SEC191">11.3  Comparing the Two Interfaces</A>
-<LI><A NAME="TOC192" HREF="gettext_11.html#SEC192">11.4  Using libintl.a in own programs</A>
-<LI><A NAME="TOC193" HREF="gettext_11.html#SEC193">11.5  Being a <CODE>gettext</CODE> grok</A>
-<LI><A NAME="TOC194" HREF="gettext_11.html#SEC194">11.6  Temporary Notes for the Programmers Chapter</A>
-<UL>
-<LI><A NAME="TOC195" HREF="gettext_11.html#SEC195">11.6.1  Temporary - Two Possible Implementations</A>
-<LI><A NAME="TOC196" HREF="gettext_11.html#SEC196">11.6.2  Temporary - About <CODE>catgets</CODE></A>
-<LI><A NAME="TOC197" HREF="gettext_11.html#SEC197">11.6.3  Temporary - Why a single implementation</A>
-<LI><A NAME="TOC198" HREF="gettext_11.html#SEC198">11.6.4  Temporary - Notes</A>
-</UL>
-</UL>
-<LI><A NAME="TOC199" HREF="gettext_12.html#SEC199">12  The Translator's View</A>
-<UL>
-<LI><A NAME="TOC200" HREF="gettext_12.html#SEC200">12.1  Introduction 0</A>
-<LI><A NAME="TOC201" HREF="gettext_12.html#SEC201">12.2  Introduction 1</A>
-<LI><A NAME="TOC202" HREF="gettext_12.html#SEC202">12.3  Discussions</A>
-<LI><A NAME="TOC203" HREF="gettext_12.html#SEC203">12.4  Organization</A>
-<UL>
-<LI><A NAME="TOC204" HREF="gettext_12.html#SEC204">12.4.1  Central Coordination</A>
-<LI><A NAME="TOC205" HREF="gettext_12.html#SEC205">12.4.2  National Teams</A>
-<UL>
-<LI><A NAME="TOC206" HREF="gettext_12.html#SEC206">12.4.2.1  Sub-Cultures</A>
-<LI><A NAME="TOC207" HREF="gettext_12.html#SEC207">12.4.2.2  Organizational Ideas</A>
-</UL>
-<LI><A NAME="TOC208" HREF="gettext_12.html#SEC208">12.4.3  Mailing Lists</A>
-</UL>
-<LI><A NAME="TOC209" HREF="gettext_12.html#SEC209">12.5  Information Flow</A>
-<LI><A NAME="TOC210" HREF="gettext_12.html#SEC210">12.6  Translating plural forms</A>
-<LI><A NAME="TOC211" HREF="gettext_12.html#SEC211">12.7  Prioritizing messages: How to determine which messages to translate first</A>
-</UL>
-<LI><A NAME="TOC212" HREF="gettext_13.html#SEC212">13  The Maintainer's View</A>
-<UL>
-<LI><A NAME="TOC213" HREF="gettext_13.html#SEC213">13.1  Flat or Non-Flat Directory Structures</A>
-<LI><A NAME="TOC214" HREF="gettext_13.html#SEC214">13.2  Prerequisite Works</A>
-<LI><A NAME="TOC215" HREF="gettext_13.html#SEC215">13.3  Invoking the <CODE>gettextize</CODE> Program</A>
-<LI><A NAME="TOC216" HREF="gettext_13.html#SEC216">13.4  Files You Must Create or Alter</A>
-<UL>
-<LI><A NAME="TOC217" HREF="gettext_13.html#SEC217">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC218" HREF="gettext_13.html#SEC218">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC219" HREF="gettext_13.html#SEC219">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC220" HREF="gettext_13.html#SEC220">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
-<LI><A NAME="TOC221" HREF="gettext_13.html#SEC221">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC222" HREF="gettext_13.html#SEC222">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC223" HREF="gettext_13.html#SEC223">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC224" HREF="gettext_13.html#SEC224">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC225" HREF="gettext_13.html#SEC225">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC226" HREF="gettext_13.html#SEC226">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC227" HREF="gettext_13.html#SEC227">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A>
-<LI><A NAME="TOC228" HREF="gettext_13.html#SEC228">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A>
-<LI><A NAME="TOC229" HREF="gettext_13.html#SEC229">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A>
-</UL>
-<LI><A NAME="TOC230" HREF="gettext_13.html#SEC230">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A>
-<UL>
-<LI><A NAME="TOC231" HREF="gettext_13.html#SEC231">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
-<LI><A NAME="TOC232" HREF="gettext_13.html#SEC232">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
-<LI><A NAME="TOC233" HREF="gettext_13.html#SEC233">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
-<LI><A NAME="TOC234" HREF="gettext_13.html#SEC234">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A>
-<LI><A NAME="TOC235" HREF="gettext_13.html#SEC235">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A>
-<LI><A NAME="TOC236" HREF="gettext_13.html#SEC236">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>
-<LI><A NAME="TOC237" HREF="gettext_13.html#SEC237">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A>
-</UL>
-<LI><A NAME="TOC238" HREF="gettext_13.html#SEC238">13.6  Integrating with Version Control Systems</A>
-<UL>
-<LI><A NAME="TOC239" HREF="gettext_13.html#SEC239">13.6.1  Avoiding version mismatch in distributed development</A>
-<LI><A NAME="TOC240" HREF="gettext_13.html#SEC240">13.6.2  Files to put under version control</A>
-<LI><A NAME="TOC241" HREF="gettext_13.html#SEC241">13.6.3  Put PO Files under Version Control</A>
-<LI><A NAME="TOC242" HREF="gettext_13.html#SEC242">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A>
-<UL>
-<LI><A NAME="TOC243" HREF="gettext_13.html#SEC243">13.6.4.1  Options</A>
-<LI><A NAME="TOC244" HREF="gettext_13.html#SEC244">13.6.4.2  Informative output</A>
-</UL>
-</UL>
-<LI><A NAME="TOC245" HREF="gettext_13.html#SEC245">13.7  Creating a Distribution Tarball</A>
-</UL>
-<LI><A NAME="TOC246" HREF="gettext_14.html#SEC246">14  The Installer's and Distributor's View</A>
-<LI><A NAME="TOC247" HREF="gettext_15.html#SEC247">15  Other Programming Languages</A>
-<UL>
-<LI><A NAME="TOC248" HREF="gettext_15.html#SEC248">15.1  The Language Implementor's View</A>
-<LI><A NAME="TOC249" HREF="gettext_15.html#SEC249">15.2  The Programmer's View</A>
-<LI><A NAME="TOC250" HREF="gettext_15.html#SEC250">15.3  The Translator's View</A>
-<UL>
-<LI><A NAME="TOC251" HREF="gettext_15.html#SEC251">15.3.1  C Format Strings</A>
-<LI><A NAME="TOC252" HREF="gettext_15.html#SEC252">15.3.2  Objective C Format Strings</A>
-<LI><A NAME="TOC253" HREF="gettext_15.html#SEC253">15.3.3  Shell Format Strings</A>
-<LI><A NAME="TOC254" HREF="gettext_15.html#SEC254">15.3.4  Python Format Strings</A>
-<LI><A NAME="TOC255" HREF="gettext_15.html#SEC255">15.3.5  Lisp Format Strings</A>
-<LI><A NAME="TOC256" HREF="gettext_15.html#SEC256">15.3.6  Emacs Lisp Format Strings</A>
-<LI><A NAME="TOC257" HREF="gettext_15.html#SEC257">15.3.7  librep Format Strings</A>
-<LI><A NAME="TOC258" HREF="gettext_15.html#SEC258">15.3.8  Scheme Format Strings</A>
-<LI><A NAME="TOC259" HREF="gettext_15.html#SEC259">15.3.9  Smalltalk Format Strings</A>
-<LI><A NAME="TOC260" HREF="gettext_15.html#SEC260">15.3.10  Java Format Strings</A>
-<LI><A NAME="TOC261" HREF="gettext_15.html#SEC261">15.3.11  C# Format Strings</A>
-<LI><A NAME="TOC262" HREF="gettext_15.html#SEC262">15.3.12  awk Format Strings</A>
-<LI><A NAME="TOC263" HREF="gettext_15.html#SEC263">15.3.13  Object Pascal Format Strings</A>
-<LI><A NAME="TOC264" HREF="gettext_15.html#SEC264">15.3.14  YCP Format Strings</A>
-<LI><A NAME="TOC265" HREF="gettext_15.html#SEC265">15.3.15  Tcl Format Strings</A>
-<LI><A NAME="TOC266" HREF="gettext_15.html#SEC266">15.3.16  Perl Format Strings</A>
-<LI><A NAME="TOC267" HREF="gettext_15.html#SEC267">15.3.17  PHP Format Strings</A>
-<LI><A NAME="TOC268" HREF="gettext_15.html#SEC268">15.3.18  GCC internal Format Strings</A>
-<LI><A NAME="TOC269" HREF="gettext_15.html#SEC269">15.3.19  GFC internal Format Strings</A>
-<LI><A NAME="TOC270" HREF="gettext_15.html#SEC270">15.3.20  Qt Format Strings</A>
-<LI><A NAME="TOC271" HREF="gettext_15.html#SEC271">15.3.21  Qt Format Strings</A>
-<LI><A NAME="TOC272" HREF="gettext_15.html#SEC272">15.3.22  KDE Format Strings</A>
-<LI><A NAME="TOC273" HREF="gettext_15.html#SEC273">15.3.23  Boost Format Strings</A>
-<LI><A NAME="TOC274" HREF="gettext_15.html#SEC274">15.3.24  Lua Format Strings</A>
-<LI><A NAME="TOC275" HREF="gettext_15.html#SEC275">15.3.25  JavaScript Format Strings</A>
-</UL>
-<LI><A NAME="TOC276" HREF="gettext_15.html#SEC276">15.4  The Maintainer's View</A>
-<LI><A NAME="TOC277" HREF="gettext_15.html#SEC277">15.5  Individual Programming Languages</A>
-<UL>
-<LI><A NAME="TOC278" HREF="gettext_15.html#SEC278">15.5.1  C, C++, Objective C</A>
-<LI><A NAME="TOC279" HREF="gettext_15.html#SEC279">15.5.2  sh - Shell Script</A>
-<UL>
-<LI><A NAME="TOC280" HREF="gettext_15.html#SEC280">15.5.2.1  Preparing Shell Scripts for Internationalization</A>
-<LI><A NAME="TOC281" HREF="gettext_15.html#SEC281">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A>
-<LI><A NAME="TOC282" HREF="gettext_15.html#SEC282">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A>
-<LI><A NAME="TOC283" HREF="gettext_15.html#SEC283">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A>
-<LI><A NAME="TOC284" HREF="gettext_15.html#SEC284">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A>
-<LI><A NAME="TOC285" HREF="gettext_15.html#SEC285">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>
-<LI><A NAME="TOC286" HREF="gettext_15.html#SEC286">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>
-</UL>
-<LI><A NAME="TOC287" HREF="gettext_15.html#SEC287">15.5.3  bash - Bourne-Again Shell Script</A>
-<LI><A NAME="TOC288" HREF="gettext_15.html#SEC288">15.5.4  Python</A>
-<LI><A NAME="TOC289" HREF="gettext_15.html#SEC289">15.5.5  GNU clisp - Common Lisp</A>
-<LI><A NAME="TOC290" HREF="gettext_15.html#SEC290">15.5.6  GNU clisp C sources</A>
-<LI><A NAME="TOC291" HREF="gettext_15.html#SEC291">15.5.7  Emacs Lisp</A>
-<LI><A NAME="TOC292" HREF="gettext_15.html#SEC292">15.5.8  librep</A>
-<LI><A NAME="TOC293" HREF="gettext_15.html#SEC293">15.5.9  GNU guile - Scheme</A>
-<LI><A NAME="TOC294" HREF="gettext_15.html#SEC294">15.5.10  GNU Smalltalk</A>
-<LI><A NAME="TOC295" HREF="gettext_15.html#SEC295">15.5.11  Java</A>
-<LI><A NAME="TOC296" HREF="gettext_15.html#SEC296">15.5.12  C#</A>
-<LI><A NAME="TOC297" HREF="gettext_15.html#SEC297">15.5.13  GNU awk</A>
-<LI><A NAME="TOC298" HREF="gettext_15.html#SEC298">15.5.14  Pascal - Free Pascal Compiler</A>
-<LI><A NAME="TOC299" HREF="gettext_15.html#SEC299">15.5.15  wxWidgets library</A>
-<LI><A NAME="TOC300" HREF="gettext_15.html#SEC300">15.5.16  YCP - YaST2 scripting language</A>
-<LI><A NAME="TOC301" HREF="gettext_15.html#SEC301">15.5.17  Tcl - Tk's scripting language</A>
-<LI><A NAME="TOC302" HREF="gettext_15.html#SEC302">15.5.18  Perl</A>
-<UL>
-<LI><A NAME="TOC303" HREF="gettext_15.html#SEC303">15.5.18.1  General Problems Parsing Perl Code</A>
-<LI><A NAME="TOC304" HREF="gettext_15.html#SEC304">15.5.18.2  Which keywords will xgettext look for?</A>
-<LI><A NAME="TOC305" HREF="gettext_15.html#SEC305">15.5.18.3  How to Extract Hash Keys</A>
-<LI><A NAME="TOC306" HREF="gettext_15.html#SEC306">15.5.18.4  What are Strings And Quote-like Expressions?</A>
-<LI><A NAME="TOC307" HREF="gettext_15.html#SEC307">15.5.18.5  Invalid Uses Of String Interpolation</A>
-<LI><A NAME="TOC308" HREF="gettext_15.html#SEC308">15.5.18.6  Valid Uses Of String Interpolation</A>
-<LI><A NAME="TOC309" HREF="gettext_15.html#SEC309">15.5.18.7  When To Use Parentheses</A>
-<LI><A NAME="TOC310" HREF="gettext_15.html#SEC310">15.5.18.8  How To Grok with Long Lines</A>
-<LI><A NAME="TOC311" HREF="gettext_15.html#SEC311">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A>
-</UL>
-<LI><A NAME="TOC312" HREF="gettext_15.html#SEC312">15.5.19  PHP Hypertext Preprocessor</A>
-<LI><A NAME="TOC313" HREF="gettext_15.html#SEC313">15.5.20  Pike</A>
-<LI><A NAME="TOC314" HREF="gettext_15.html#SEC314">15.5.21  GNU Compiler Collection sources</A>
-<LI><A NAME="TOC315" HREF="gettext_15.html#SEC315">15.5.22  Lua</A>
-<LI><A NAME="TOC316" HREF="gettext_15.html#SEC316">15.5.23  JavaScript</A>
-</UL>
-<LI><A NAME="TOC317" HREF="gettext_15.html#SEC317">15.6  Internationalizable Data</A>
-<UL>
-<LI><A NAME="TOC318" HREF="gettext_15.html#SEC318">15.6.1  POT - Portable Object Template</A>
-<LI><A NAME="TOC319" HREF="gettext_15.html#SEC319">15.6.2  Resource String Table</A>
-<LI><A NAME="TOC320" HREF="gettext_15.html#SEC320">15.6.3  Glade - GNOME user interface description</A>
-<LI><A NAME="TOC321" HREF="gettext_15.html#SEC321">15.6.4  GSettings - GNOME user configuration schema</A>
-</UL>
-</UL>
-<LI><A NAME="TOC322" HREF="gettext_16.html#SEC322">16  Concluding Remarks</A>
-<UL>
-<LI><A NAME="TOC323" HREF="gettext_16.html#SEC323">16.1  History of GNU <CODE>gettext</CODE></A>
-<LI><A NAME="TOC324" HREF="gettext_16.html#SEC324">16.2  Related Readings</A>
-</UL>
-<LI><A NAME="TOC325" HREF="gettext_17.html#SEC325">A  Language Codes</A>
-<UL>
-<LI><A NAME="TOC326" HREF="gettext_17.html#SEC326">A.1  Usual Language Codes</A>
-<LI><A NAME="TOC327" HREF="gettext_17.html#SEC327">A.2  Rare Language Codes</A>
-</UL>
-<LI><A NAME="TOC328" HREF="gettext_18.html#SEC328">B  Country Codes</A>
-<LI><A NAME="TOC329" HREF="gettext_19.html#SEC329">C  Licenses</A>
-<UL>
-<LI><A NAME="TOC330" HREF="gettext_19.html#SEC330">C.1  GNU GENERAL PUBLIC LICENSE</A>
-<LI><A NAME="TOC331" HREF="gettext_19.html#SEC331">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>
-<LI><A NAME="TOC332" HREF="gettext_19.html#SEC332">C.3  GNU Free Documentation License</A>
-</UL>
-<LI><A NAME="TOC333" HREF="gettext_20.html#SEC333">Program Index</A>
-<LI><A NAME="TOC334" HREF="gettext_21.html#SEC334">Option Index</A>
-<LI><A NAME="TOC335" HREF="gettext_22.html#SEC335">Variable Index</A>
-<LI><A NAME="TOC336" HREF="gettext_23.html#SEC336">PO Mode Index</A>
-<LI><A NAME="TOC337" HREF="gettext_24.html#SEC337">Autoconf Macro Index</A>
-<LI><A NAME="TOC338" HREF="gettext_25.html#SEC338">General Index</A>
+<LI><A NAME="TOC182" HREF="gettext_11.html#SEC182">11.1.1  The Interface</A>
+<LI><A NAME="TOC183" HREF="gettext_11.html#SEC183">11.1.2  Problems with the <CODE>catgets</CODE> Interface?!</A>
+</UL>
+<LI><A NAME="TOC184" HREF="gettext_11.html#SEC184">11.2  About <CODE>gettext</CODE></A>
+<UL>
+<LI><A NAME="TOC185" HREF="gettext_11.html#SEC185">11.2.1  The Interface</A>
+<LI><A NAME="TOC186" HREF="gettext_11.html#SEC186">11.2.2  Solving Ambiguities</A>
+<LI><A NAME="TOC187" HREF="gettext_11.html#SEC187">11.2.3  Locating Message Catalog Files</A>
+<LI><A NAME="TOC188" HREF="gettext_11.html#SEC188">11.2.4  How to specify the output character set <CODE>gettext</CODE> uses</A>
+<LI><A NAME="TOC189" HREF="gettext_11.html#SEC189">11.2.5  Using contexts for solving ambiguities</A>
+<LI><A NAME="TOC190" HREF="gettext_11.html#SEC190">11.2.6  Additional functions for plural forms</A>
+<LI><A NAME="TOC191" HREF="gettext_11.html#SEC191">11.2.7  Optimization of the *gettext functions</A>
+</UL>
+<LI><A NAME="TOC192" HREF="gettext_11.html#SEC192">11.3  Comparing the Two Interfaces</A>
+<LI><A NAME="TOC193" HREF="gettext_11.html#SEC193">11.4  Using libintl.a in own programs</A>
+<LI><A NAME="TOC194" HREF="gettext_11.html#SEC194">11.5  Being a <CODE>gettext</CODE> grok</A>
+<LI><A NAME="TOC195" HREF="gettext_11.html#SEC195">11.6  Temporary Notes for the Programmers Chapter</A>
+<UL>
+<LI><A NAME="TOC196" HREF="gettext_11.html#SEC196">11.6.1  Temporary - Two Possible Implementations</A>
+<LI><A NAME="TOC197" HREF="gettext_11.html#SEC197">11.6.2  Temporary - About <CODE>catgets</CODE></A>
+<LI><A NAME="TOC198" HREF="gettext_11.html#SEC198">11.6.3  Temporary - Why a single implementation</A>
+<LI><A NAME="TOC199" HREF="gettext_11.html#SEC199">11.6.4  Temporary - Notes</A>
+</UL>
+</UL>
+<LI><A NAME="TOC200" HREF="gettext_12.html#SEC200">12  The Translator's View</A>
+<UL>
+<LI><A NAME="TOC201" HREF="gettext_12.html#SEC201">12.1  Introduction 0</A>
+<LI><A NAME="TOC202" HREF="gettext_12.html#SEC202">12.2  Introduction 1</A>
+<LI><A NAME="TOC203" HREF="gettext_12.html#SEC203">12.3  Discussions</A>
+<LI><A NAME="TOC204" HREF="gettext_12.html#SEC204">12.4  Organization</A>
+<UL>
+<LI><A NAME="TOC205" HREF="gettext_12.html#SEC205">12.4.1  Central Coordination</A>
+<LI><A NAME="TOC206" HREF="gettext_12.html#SEC206">12.4.2  National Teams</A>
+<UL>
+<LI><A NAME="TOC207" HREF="gettext_12.html#SEC207">12.4.2.1  Sub-Cultures</A>
+<LI><A NAME="TOC208" HREF="gettext_12.html#SEC208">12.4.2.2  Organizational Ideas</A>
+</UL>
+<LI><A NAME="TOC209" HREF="gettext_12.html#SEC209">12.4.3  Mailing Lists</A>
+</UL>
+<LI><A NAME="TOC210" HREF="gettext_12.html#SEC210">12.5  Information Flow</A>
+<LI><A NAME="TOC211" HREF="gettext_12.html#SEC211">12.6  Translating plural forms</A>
+<LI><A NAME="TOC212" HREF="gettext_12.html#SEC212">12.7  Prioritizing messages: How to determine which messages to translate first</A>
+</UL>
+<LI><A NAME="TOC213" HREF="gettext_13.html#SEC213">13  The Maintainer's View</A>
+<UL>
+<LI><A NAME="TOC214" HREF="gettext_13.html#SEC214">13.1  Flat or Non-Flat Directory Structures</A>
+<LI><A NAME="TOC215" HREF="gettext_13.html#SEC215">13.2  Prerequisite Works</A>
+<LI><A NAME="TOC216" HREF="gettext_13.html#SEC216">13.3  Invoking the <CODE>gettextize</CODE> Program</A>
+<LI><A NAME="TOC217" HREF="gettext_13.html#SEC217">13.4  Files You Must Create or Alter</A>
+<UL>
+<LI><A NAME="TOC218" HREF="gettext_13.html#SEC218">13.4.1  <TT>&lsquo;POTFILES.in&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC219" HREF="gettext_13.html#SEC219">13.4.2  <TT>&lsquo;LINGUAS&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC220" HREF="gettext_13.html#SEC220">13.4.3  <TT>&lsquo;Makevars&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC221" HREF="gettext_13.html#SEC221">13.4.4  Extending <TT>&lsquo;Makefile&rsquo;</TT> in <TT>&lsquo;po/&rsquo;</TT></A>
+<LI><A NAME="TOC222" HREF="gettext_13.html#SEC222">13.4.5  <TT>&lsquo;configure.ac&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC223" HREF="gettext_13.html#SEC223">13.4.6  <TT>&lsquo;config.guess&rsquo;</TT>, <TT>&lsquo;config.sub&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC224" HREF="gettext_13.html#SEC224">13.4.7  <TT>&lsquo;mkinstalldirs&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC225" HREF="gettext_13.html#SEC225">13.4.8  <TT>&lsquo;aclocal.m4&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC226" HREF="gettext_13.html#SEC226">13.4.9  <TT>&lsquo;acconfig.h&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC227" HREF="gettext_13.html#SEC227">13.4.10  <TT>&lsquo;config.h.in&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC228" HREF="gettext_13.html#SEC228">13.4.11  <TT>&lsquo;Makefile.in&rsquo;</TT> at top level</A>
+<LI><A NAME="TOC229" HREF="gettext_13.html#SEC229">13.4.12  <TT>&lsquo;Makefile.in&rsquo;</TT> in <TT>&lsquo;src/&rsquo;</TT></A>
+<LI><A NAME="TOC230" HREF="gettext_13.html#SEC230">13.4.13  <TT>&lsquo;gettext.h&rsquo;</TT> in <TT>&lsquo;lib/&rsquo;</TT></A>
+</UL>
+<LI><A NAME="TOC231" HREF="gettext_13.html#SEC231">13.5  Autoconf macros for use in <TT>&lsquo;configure.ac&rsquo;</TT></A>
+<UL>
+<LI><A NAME="TOC232" HREF="gettext_13.html#SEC232">13.5.1  AM_GNU_GETTEXT in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
+<LI><A NAME="TOC233" HREF="gettext_13.html#SEC233">13.5.2  AM_GNU_GETTEXT_VERSION in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
+<LI><A NAME="TOC234" HREF="gettext_13.html#SEC234">13.5.3  AM_GNU_GETTEXT_NEED in <TT>&lsquo;gettext.m4&rsquo;</TT></A>
+<LI><A NAME="TOC235" HREF="gettext_13.html#SEC235">13.5.4  AM_GNU_GETTEXT_INTL_SUBDIR in <TT>&lsquo;intldir.m4&rsquo;</TT></A>
+<LI><A NAME="TOC236" HREF="gettext_13.html#SEC236">13.5.5  AM_PO_SUBDIRS in <TT>&lsquo;po.m4&rsquo;</TT></A>
+<LI><A NAME="TOC237" HREF="gettext_13.html#SEC237">13.5.6  AM_XGETTEXT_OPTION in <TT>&lsquo;po.m4&rsquo;</TT></A>
+<LI><A NAME="TOC238" HREF="gettext_13.html#SEC238">13.5.7  AM_ICONV in <TT>&lsquo;iconv.m4&rsquo;</TT></A>
+</UL>
+<LI><A NAME="TOC239" HREF="gettext_13.html#SEC239">13.6  Integrating with Version Control Systems</A>
+<UL>
+<LI><A NAME="TOC240" HREF="gettext_13.html#SEC240">13.6.1  Avoiding version mismatch in distributed development</A>
+<LI><A NAME="TOC241" HREF="gettext_13.html#SEC241">13.6.2  Files to put under version control</A>
+<LI><A NAME="TOC242" HREF="gettext_13.html#SEC242">13.6.3  Put PO Files under Version Control</A>
+<LI><A NAME="TOC243" HREF="gettext_13.html#SEC243">13.6.4  Invoking the <CODE>autopoint</CODE> Program</A>
+<UL>
+<LI><A NAME="TOC244" HREF="gettext_13.html#SEC244">13.6.4.1  Options</A>
+<LI><A NAME="TOC245" HREF="gettext_13.html#SEC245">13.6.4.2  Informative output</A>
+</UL>
+</UL>
+<LI><A NAME="TOC246" HREF="gettext_13.html#SEC246">13.7  Creating a Distribution Tarball</A>
+</UL>
+<LI><A NAME="TOC247" HREF="gettext_14.html#SEC247">14  The Installer's and Distributor's View</A>
+<LI><A NAME="TOC248" HREF="gettext_15.html#SEC248">15  Other Programming Languages</A>
+<UL>
+<LI><A NAME="TOC249" HREF="gettext_15.html#SEC249">15.1  The Language Implementor's View</A>
+<LI><A NAME="TOC250" HREF="gettext_15.html#SEC250">15.2  The Programmer's View</A>
+<LI><A NAME="TOC251" HREF="gettext_15.html#SEC251">15.3  The Translator's View</A>
+<UL>
+<LI><A NAME="TOC252" HREF="gettext_15.html#SEC252">15.3.1  C Format Strings</A>
+<LI><A NAME="TOC253" HREF="gettext_15.html#SEC253">15.3.2  Objective C Format Strings</A>
+<LI><A NAME="TOC254" HREF="gettext_15.html#SEC254">15.3.3  Shell Format Strings</A>
+<LI><A NAME="TOC255" HREF="gettext_15.html#SEC255">15.3.4  Python Format Strings</A>
+<LI><A NAME="TOC256" HREF="gettext_15.html#SEC256">15.3.5  Lisp Format Strings</A>
+<LI><A NAME="TOC257" HREF="gettext_15.html#SEC257">15.3.6  Emacs Lisp Format Strings</A>
+<LI><A NAME="TOC258" HREF="gettext_15.html#SEC258">15.3.7  librep Format Strings</A>
+<LI><A NAME="TOC259" HREF="gettext_15.html#SEC259">15.3.8  Scheme Format Strings</A>
+<LI><A NAME="TOC260" HREF="gettext_15.html#SEC260">15.3.9  Smalltalk Format Strings</A>
+<LI><A NAME="TOC261" HREF="gettext_15.html#SEC261">15.3.10  Java Format Strings</A>
+<LI><A NAME="TOC262" HREF="gettext_15.html#SEC262">15.3.11  C# Format Strings</A>
+<LI><A NAME="TOC263" HREF="gettext_15.html#SEC263">15.3.12  awk Format Strings</A>
+<LI><A NAME="TOC264" HREF="gettext_15.html#SEC264">15.3.13  Object Pascal Format Strings</A>
+<LI><A NAME="TOC265" HREF="gettext_15.html#SEC265">15.3.14  YCP Format Strings</A>
+<LI><A NAME="TOC266" HREF="gettext_15.html#SEC266">15.3.15  Tcl Format Strings</A>
+<LI><A NAME="TOC267" HREF="gettext_15.html#SEC267">15.3.16  Perl Format Strings</A>
+<LI><A NAME="TOC268" HREF="gettext_15.html#SEC268">15.3.17  PHP Format Strings</A>
+<LI><A NAME="TOC269" HREF="gettext_15.html#SEC269">15.3.18  GCC internal Format Strings</A>
+<LI><A NAME="TOC270" HREF="gettext_15.html#SEC270">15.3.19  GFC internal Format Strings</A>
+<LI><A NAME="TOC271" HREF="gettext_15.html#SEC271">15.3.20  Qt Format Strings</A>
+<LI><A NAME="TOC272" HREF="gettext_15.html#SEC272">15.3.21  Qt Format Strings</A>
+<LI><A NAME="TOC273" HREF="gettext_15.html#SEC273">15.3.22  KDE Format Strings</A>
+<LI><A NAME="TOC274" HREF="gettext_15.html#SEC274">15.3.23  KUIT Format Strings</A>
+<LI><A NAME="TOC275" HREF="gettext_15.html#SEC275">15.3.24  Boost Format Strings</A>
+<LI><A NAME="TOC276" HREF="gettext_15.html#SEC276">15.3.25  Lua Format Strings</A>
+<LI><A NAME="TOC277" HREF="gettext_15.html#SEC277">15.3.26  JavaScript Format Strings</A>
+</UL>
+<LI><A NAME="TOC278" HREF="gettext_15.html#SEC278">15.4  The Maintainer's View</A>
+<LI><A NAME="TOC279" HREF="gettext_15.html#SEC279">15.5  Individual Programming Languages</A>
+<UL>
+<LI><A NAME="TOC280" HREF="gettext_15.html#SEC280">15.5.1  C, C++, Objective C</A>
+<LI><A NAME="TOC281" HREF="gettext_15.html#SEC281">15.5.2  sh - Shell Script</A>
+<UL>
+<LI><A NAME="TOC282" HREF="gettext_15.html#SEC282">15.5.2.1  Preparing Shell Scripts for Internationalization</A>
+<LI><A NAME="TOC283" HREF="gettext_15.html#SEC283">15.5.2.2  Contents of <CODE>gettext.sh</CODE></A>
+<LI><A NAME="TOC284" HREF="gettext_15.html#SEC284">15.5.2.3  Invoking the <CODE>gettext</CODE> program</A>
+<LI><A NAME="TOC285" HREF="gettext_15.html#SEC285">15.5.2.4  Invoking the <CODE>ngettext</CODE> program</A>
+<LI><A NAME="TOC286" HREF="gettext_15.html#SEC286">15.5.2.5  Invoking the <CODE>envsubst</CODE> program</A>
+<LI><A NAME="TOC287" HREF="gettext_15.html#SEC287">15.5.2.6  Invoking the <CODE>eval_gettext</CODE> function</A>
+<LI><A NAME="TOC288" HREF="gettext_15.html#SEC288">15.5.2.7  Invoking the <CODE>eval_ngettext</CODE> function</A>
+</UL>
+<LI><A NAME="TOC289" HREF="gettext_15.html#SEC289">15.5.3  bash - Bourne-Again Shell Script</A>
+<LI><A NAME="TOC290" HREF="gettext_15.html#SEC290">15.5.4  Python</A>
+<LI><A NAME="TOC291" HREF="gettext_15.html#SEC291">15.5.5  GNU clisp - Common Lisp</A>
+<LI><A NAME="TOC292" HREF="gettext_15.html#SEC292">15.5.6  GNU clisp C sources</A>
+<LI><A NAME="TOC293" HREF="gettext_15.html#SEC293">15.5.7  Emacs Lisp</A>
+<LI><A NAME="TOC294" HREF="gettext_15.html#SEC294">15.5.8  librep</A>
+<LI><A NAME="TOC295" HREF="gettext_15.html#SEC295">15.5.9  GNU guile - Scheme</A>
+<LI><A NAME="TOC296" HREF="gettext_15.html#SEC296">15.5.10  GNU Smalltalk</A>
+<LI><A NAME="TOC297" HREF="gettext_15.html#SEC297">15.5.11  Java</A>
+<LI><A NAME="TOC298" HREF="gettext_15.html#SEC298">15.5.12  C#</A>
+<LI><A NAME="TOC299" HREF="gettext_15.html#SEC299">15.5.13  GNU awk</A>
+<LI><A NAME="TOC300" HREF="gettext_15.html#SEC300">15.5.14  Pascal - Free Pascal Compiler</A>
+<LI><A NAME="TOC301" HREF="gettext_15.html#SEC301">15.5.15  wxWidgets library</A>
+<LI><A NAME="TOC302" HREF="gettext_15.html#SEC302">15.5.16  YCP - YaST2 scripting language</A>
+<LI><A NAME="TOC303" HREF="gettext_15.html#SEC303">15.5.17  Tcl - Tk's scripting language</A>
+<LI><A NAME="TOC304" HREF="gettext_15.html#SEC304">15.5.18  Perl</A>
+<UL>
+<LI><A NAME="TOC305" HREF="gettext_15.html#SEC305">15.5.18.1  General Problems Parsing Perl Code</A>
+<LI><A NAME="TOC306" HREF="gettext_15.html#SEC306">15.5.18.2  Which keywords will xgettext look for?</A>
+<LI><A NAME="TOC307" HREF="gettext_15.html#SEC307">15.5.18.3  How to Extract Hash Keys</A>
+<LI><A NAME="TOC308" HREF="gettext_15.html#SEC308">15.5.18.4  What are Strings And Quote-like Expressions?</A>
+<LI><A NAME="TOC309" HREF="gettext_15.html#SEC309">15.5.18.5  Invalid Uses Of String Interpolation</A>
+<LI><A NAME="TOC310" HREF="gettext_15.html#SEC310">15.5.18.6  Valid Uses Of String Interpolation</A>
+<LI><A NAME="TOC311" HREF="gettext_15.html#SEC311">15.5.18.7  When To Use Parentheses</A>
+<LI><A NAME="TOC312" HREF="gettext_15.html#SEC312">15.5.18.8  How To Grok with Long Lines</A>
+<LI><A NAME="TOC313" HREF="gettext_15.html#SEC313">15.5.18.9  Bugs, Pitfalls, And Things That Do Not Work</A>
+</UL>
+<LI><A NAME="TOC314" HREF="gettext_15.html#SEC314">15.5.19  PHP Hypertext Preprocessor</A>
+<LI><A NAME="TOC315" HREF="gettext_15.html#SEC315">15.5.20  Pike</A>
+<LI><A NAME="TOC316" HREF="gettext_15.html#SEC316">15.5.21  GNU Compiler Collection sources</A>
+<LI><A NAME="TOC317" HREF="gettext_15.html#SEC317">15.5.22  Lua</A>
+<LI><A NAME="TOC318" HREF="gettext_15.html#SEC318">15.5.23  JavaScript</A>
+<LI><A NAME="TOC319" HREF="gettext_15.html#SEC319">15.5.24  Vala</A>
+</UL>
+<LI><A NAME="TOC320" HREF="gettext_15.html#SEC320">15.6  Internationalizable Data</A>
+<UL>
+<LI><A NAME="TOC321" HREF="gettext_15.html#SEC321">15.6.1  POT - Portable Object Template</A>
+<LI><A NAME="TOC322" HREF="gettext_15.html#SEC322">15.6.2  Resource String Table</A>
+<LI><A NAME="TOC323" HREF="gettext_15.html#SEC323">15.6.3  Glade - GNOME user interface description</A>
+<LI><A NAME="TOC324" HREF="gettext_15.html#SEC324">15.6.4  GSettings - GNOME user configuration schema</A>
+<LI><A NAME="TOC325" HREF="gettext_15.html#SEC325">15.6.5  AppData - freedesktop.org application description</A>
+<LI><A NAME="TOC326" HREF="gettext_15.html#SEC326">15.6.6  Preparing Rules for XML Internationalization</A>
+<UL>
+<LI><A NAME="TOC327" HREF="gettext_15.html#SEC327">15.6.6.1  Two Use-cases of Translated Strings in XML</A>
+</UL>
+</UL>
+</UL>
+<LI><A NAME="TOC328" HREF="gettext_16.html#SEC328">16  Concluding Remarks</A>
+<UL>
+<LI><A NAME="TOC329" HREF="gettext_16.html#SEC329">16.1  History of GNU <CODE>gettext</CODE></A>
+<LI><A NAME="TOC330" HREF="gettext_16.html#SEC330">16.2  Related Readings</A>
+</UL>
+<LI><A NAME="TOC331" HREF="gettext_17.html#SEC331">A  Language Codes</A>
+<UL>
+<LI><A NAME="TOC332" HREF="gettext_17.html#SEC332">A.1  Usual Language Codes</A>
+<LI><A NAME="TOC333" HREF="gettext_17.html#SEC333">A.2  Rare Language Codes</A>
+</UL>
+<LI><A NAME="TOC334" HREF="gettext_18.html#SEC334">B  Country Codes</A>
+<LI><A NAME="TOC335" HREF="gettext_19.html#SEC335">C  Licenses</A>
+<UL>
+<LI><A NAME="TOC336" HREF="gettext_19.html#SEC336">C.1  GNU GENERAL PUBLIC LICENSE</A>
+<LI><A NAME="TOC337" HREF="gettext_19.html#SEC337">C.2  GNU LESSER GENERAL PUBLIC LICENSE</A>
+<LI><A NAME="TOC338" HREF="gettext_19.html#SEC338">C.3  GNU Free Documentation License</A>
+</UL>
+<LI><A NAME="TOC339" HREF="gettext_20.html#SEC339">Program Index</A>
+<LI><A NAME="TOC340" HREF="gettext_21.html#SEC340">Option Index</A>
+<LI><A NAME="TOC341" HREF="gettext_22.html#SEC341">Variable Index</A>
+<LI><A NAME="TOC342" HREF="gettext_23.html#SEC342">PO Mode Index</A>
+<LI><A NAME="TOC343" HREF="gettext_24.html#SEC343">Autoconf Macro Index</A>
+<LI><A NAME="TOC344" HREF="gettext_25.html#SEC344">General Index</A>
 </UL>
 <P><HR><P>
-This document was generated on 24 December 2014 using the
+This document was generated on 28 December 2015 using the
 <A HREF="http://wwwinfo.cern.ch/dis/texi2html/">texi2html</A>
 translator version 1.52b.</P>
 </BODY>
diff --git a/gettext-tools/doc/msgexec.texi b/gettext-tools/doc/msgexec.texi
index a190072..ac9dacb 100644
--- a/gettext-tools/doc/msgexec.texi
+++ b/gettext-tools/doc/msgexec.texi
@@ -17,6 +17,13 @@ A special builtin command called @samp{0} outputs the translation, followed
 by a null byte.  The output of @samp{msgexec 0} is suitable as input for
 @samp{xargs -0}.
 
+@table @samp
+@item --newline
+@opindex --newline@r{, @code{msgfilter} option}
+Add newline at the end of each input line.
+
+@end table
+
 @vindex MSGEXEC_MSGCTXT@r{, environment variable}
 @vindex MSGEXEC_MSGID@r{, environment variable}
 @vindex MSGEXEC_MSGID_PLURAL@r{, environment variable}
diff --git a/gettext-tools/doc/msgfilter.texi b/gettext-tools/doc/msgfilter.texi
index 1fae251..61c2f57 100644
--- a/gettext-tools/doc/msgfilter.texi
+++ b/gettext-tools/doc/msgfilter.texi
@@ -73,6 +73,14 @@ input and writes a modified translation to standard output.  A frequently
 used filter is @samp{sed}.  A few particular built-in filters are also
 recognized.
 
+@table @samp
+@item --newline
+@opindex --newline@r{, @code{msgfilter} option}
+Add newline at the end of each input line and also strip the ending
+newline from the output line.
+
+@end table
+
 @cindex @code{msgfilter} filter and catalog encoding
 Note: If the filter is not a built-in filter, you have to care about encodings:
 It is your responsibility to ensure that the @var{filter} can cope
@@ -86,13 +94,14 @@ you can first convert the translation catalog to UTF-8 using the
 locale, by using the @code{LC_ALL} environment variable.
 
 @cindex portability problems with @code{sed}
-Note: Most translations in a translation catalog don't end with a newline
-character.  For this reason, it is important that the @var{filter}
-recognizes its last input line even if it ends without a newline, and that
-it doesn't add an undesired trailing newline at the end.  The @samp{sed}
-program on some platforms is known to ignore the last line of input if it
-is not terminated with a newline.  You can use GNU @code{sed} instead; it
-does not have this limitation.
+Note: Most translations in a translation catalog don't end with a
+newline character.  For this reason, unless the @code{--newline}
+option is used, it is important that the @var{filter} recognizes its
+last input line even if it ends without a newline, and that it doesn't
+add an undesired trailing newline at the end.  The @samp{sed} program on
+some platforms is known to ignore the last line of input if it is not
+terminated with a newline.  You can use GNU @code{sed} instead; it does
+not have this limitation.
 
 @subsection Useful @var{filter-option}s when the @var{filter} is @samp{sed}
 
diff --git a/gettext-tools/doc/msgfmt.texi b/gettext-tools/doc/msgfmt.texi
index 402bc1a..a6fefcd 100644
--- a/gettext-tools/doc/msgfmt.texi
+++ b/gettext-tools/doc/msgfmt.texi
@@ -65,6 +65,11 @@ Qt mode: generate a Qt @file{.qm} file.
 @cindex Desktop Entry mode, and @code{msgfmt} program
 Desktop Entry mode: generate a @file{.desktop} file.
 
+@item --xml
+@opindex --xml@r{, @code{msgfmt} option}
+@cindex XML mode, and @code{msgfmt} program
+XML mode: generate an XML file.
+
 @end table
 
 @subsection Output file location
@@ -190,7 +195,8 @@ or a combined language and country specification of the form @var{ll_CC}.
 
 @item -d @var{directory}
 @opindex -d@r{, @code{msgfmt} option}
-Specify the base directory of @file{.msg} message catalogs.
+Specify the directory where PO files are read.  The directory must
+contain the @samp{LINGUAS} file.
 
 @end table
 
@@ -202,11 +208,8 @@ msgfmt --desktop --template=@var{template} --locale=@var{locale} \
   -o @var{file} @var{filename}.po @dots{}
 @end example
 
-On the other hand, when using msgfmt from a Makefile, it is cumbersome
-to loop over all locales under a particular directory.  msgfmt
-provides a special operation mode for this use-case.  To generate a
-@samp{.desktop} file from multiple @samp{.po} files under a directory,
-specify the directory with the @samp{-d} option.
+msgfmt provides a special "bulk" operation mode to process multiple
+@file{.po} files at a time.
 
 @example
 msgfmt --desktop --template=@var{template} -d @var{directory} -o @var{file}
@@ -220,6 +223,55 @@ variable.
 For either operation modes, the @samp{-o} and @samp{--template}
 options are mandatory.
 
+@subsection XML mode operations
+
+@table @samp
+@item --template=@var{template}
+@opindex --template@r{, @code{msgfmt} option}
+Specify an XML file used as a template.
+
+@item -L @var{name}
+@itemx --language=@var{name}
+@opindex -L@r{, @code{msgfmt} option}
+@opindex --language@r{, @code{msgfmt} option}
+@cindex supported languages, @code{msgfmt}
+Specifies the language of the input files.
+
+@item -l @var{locale}
+@itemx --locale=@var{locale}
+@opindex -l@r{, @code{msgfmt} option}
+@opindex --locale@r{, @code{msgfmt} option}
+Specify the locale name, either a language specification of the form @var{ll}
+or a combined language and country specification of the form @var{ll_CC}.
+
+@item -d @var{directory}
+@opindex -d@r{, @code{msgfmt} option}
+Specify the base directory of @file{.po} message catalogs.
+
+@end table
+
+To generate an XML file for a single locale, you can use it as follows.
+
+@example
+msgfmt --xml --template=@var{template} --locale=@var{locale} \
+  -o @var{file} @var{filename}.po @dots{}
+@end example
+
+msgfmt provides a special "bulk" operation mode to process multiple
+@file{.po} files at a time.
+
+@example
+msgfmt --xml --template=@var{template} -d @var{directory} -o @var{file}
+@end example
+
+msgfmt first reads the @samp{LINGUAS} file under @var{directory}, and
+then processes all @samp{.po} files listed there.  You can also limit
+the locales to a subset, through the @samp{LINGUAS} environment
+variable.
+
+For either operation modes, the @samp{-o} and @samp{--template}
+options are mandatory.
+
 @subsection Input file syntax
 
 @table @samp
diff --git a/gettext-tools/doc/msginit.texi b/gettext-tools/doc/msginit.texi
index 889887d..3be6e17 100644
--- a/gettext-tools/doc/msginit.texi
+++ b/gettext-tools/doc/msginit.texi
@@ -9,6 +9,42 @@ msginit [@var{option}]
 The @code{msginit} program creates a new PO file, initializing the meta
 information with values from the user's environment.
 
+Here are more details.  The following header fields of a PO file are
+automatically filled, when possible.
+
+@table @samp
+@item Project-Id-Version
+The value is guessed from the @code{configure} script or any other files
+in the current directory.
+
+@item PO-Revision-Date
+The value is taken from the @code{PO-Creation-Data} in the input POT
+file, or the current date is used.
+
+@item Last-Translator
+The value is taken from user's password file entry and the mailer
+configuration files.
+
+@item Language-Team, Language
+These values are set according to the current locale and the predefined
+list of translation teams.
+
+@item MIME-Version, Content-Type, Content-Transfer-Encoding
+These values are set according to the content of the POT file and the
+current locale.  If the POT file contains charset=UTF-8, it means that
+the POT file contains non-ASCII characters, and we keep the UTF-8
+encoding.  Otherwise, when the POT file is plain ASCII, we use the
+locale's encoding.
+
+@item Plural-Forms
+The value is first looked up from the embedded table.
+
+As an experimental feature, you can instruct @code{msginit} to use the
+information from Unicode CLDR, by setting the @code{GETTEXTCLDRDIR}
+environment variable.
+
+@end table
+
 @subsection Input file location
 
 @table @samp
diff --git a/gettext-tools/doc/stamp-vti b/gettext-tools/doc/stamp-vti
index 8f1ac5f..c151d9f 100644
--- a/gettext-tools/doc/stamp-vti
+++ b/gettext-tools/doc/stamp-vti
@@ -1,4 +1,5 @@
-@set UPDATED 9 December 2014
-@set UPDATED-MONTH December 2014
-@set EDITION 0.19.4
-@set VERSION 0.19.4
+@set UPDATED 8 December 2015
+@set UPDATED-MONTH December 2015
+@set EDITION 0.19.7
+@set VERSION 0.19.7
+@set ARCHIVE-VERSION 0.19.7
diff --git a/gettext-tools/doc/texi2html b/gettext-tools/doc/texi2html
index 9e7e82c..7c94d5b 100755
--- a/gettext-tools/doc/texi2html
+++ b/gettext-tools/doc/texi2html
@@ -1561,7 +1561,7 @@ sub update_sec_num {
     $level--; # here we start at 0
     if ($name =~ /^appendix/) {
 	# appendix style
-	if (defined(@appendix_sec_num)) {
+	if (@appendix_sec_num) {
 	    &incr_sec_num($level, @appendix_sec_num);
 	} else {
 	    @appendix_sec_num = ('A', 0, 0, 0);
@@ -1569,7 +1569,7 @@ sub update_sec_num {
 	return(join('.', @appendix_sec_num[0..$level]));
     } else {
 	# normal style
-	if (defined(@normal_sec_num)) {
+	if (@normal_sec_num) {
 	    &incr_sec_num($level, @normal_sec_num);
 	} else {
 	    @normal_sec_num = (1, 0, 0, 0);
diff --git a/gettext-tools/doc/version.texi b/gettext-tools/doc/version.texi
index 8f1ac5f..c151d9f 100644
--- a/gettext-tools/doc/version.texi
+++ b/gettext-tools/doc/version.texi
@@ -1,4 +1,5 @@
-@set UPDATED 9 December 2014
-@set UPDATED-MONTH December 2014
-@set EDITION 0.19.4
-@set VERSION 0.19.4
+@set UPDATED 8 December 2015
+@set UPDATED-MONTH December 2015
+@set EDITION 0.19.7
+@set VERSION 0.19.7
+@set ARCHIVE-VERSION 0.19.7
diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi
index 451e25f..d6a5f01 100644
--- a/gettext-tools/doc/xgettext.texi
+++ b/gettext-tools/doc/xgettext.texi
@@ -144,6 +144,60 @@ gettext (
 The second comment line will not be extracted, because there is one
 blank line between the comment line and the keyword.
 
+@item --check[=@var{CHECK}]
+@opindex --check@r{, @code{xgettext} option}
+@cindex supported syntax checks, @code{xgettext}
+Perform a syntax check on msgid and msgid_plural.  The supported checks
+are:
+
+@table @samp
+@item ellipsis-unicode
+Prefer Unicode ellipsis character over ASCII @code{...}
+
+@item space-ellipsis
+Prohibit whitespace before an ellipsis character
+
+@item quote-unicode
+Prefer Unicode quotation marks over ASCII @code{"'`}
+
+@end table
+
+The option has an effect on all input files.  To enable or disable
+checks for a certain string, you can mark it with an @code{xgettext:}
+special comment in the source file.  For example, if you specify the
+@code{--check=space-ellipsis} option, but want to suppress the check on
+a particular string, add the following comment:
+
+@example
+/* xgettext: no-space-ellipsis-check */
+gettext ("We really want a space before ellipsis here ...");
+@end example
+
+The @code{xgettext:} comment can be followed by flags separated with a
+comma.  The possible flags are of the form @samp{[no-]@var{name}-check},
+where @var{name} is the name of a valid syntax check.  If a flag is
+prefixed by @code{no-}, the meaning is negated.
+
+Some tests apply the checks to each sentence within the msgid, rather
+than the whole string.  xgettext detects the end of sentence by
+performing a pattern match, which usually looks for a period followed by
+a certain number of spaces.  The number is specified with the
+@code{--sentence-end} option.
+
+@item --sentence-end[=@var{TYPE}]
+@opindex --sentence-end@r{, @code{xgettext} option}
+@cindex sentence end markers, @code{xgettext}
+The supported values are:
+
+@table @samp
+@item single-space
+Expect at least one whitespace after a period
+
+@item double-space
+Expect at least two whitespaces after a period
+
+@end table
+
 @end table
 
 @subsection Language specific options
@@ -373,7 +427,7 @@ This option has an effect only with the language C++.
 @cindex debugging messages marked as format strings
 Use the flags @code{c-format} and @code{possible-c-format} to show who was
 responsible for marking a message as a format string.  The latter form is
-used if the @code{xgettext} program decided, the format form is used if
+used if the @code{xgettext} program decided, the former form is used if
 the programmer prescribed it.
 
 By default only the @code{c-format} form is used.  The translator should
@@ -446,6 +500,16 @@ obsolete messages.
 Write out a NeXTstep/GNUstep localized resource file in @code{.strings} syntax.
 Note that this file format doesn't support plural forms.
 
+@item --its=@var{file}
+@opindex --its@r{, @code{xgettext} option}
+Use ITS rules defined in @var{file}.
+Note that this is only effective with XML files.
+
+@item --itstool
+@opindex --itstool@r{, @code{xgettext} option}
+Write out comments recognized by itstool (@uref{http://itstool.org}).
+Note that this is only effective with XML files.
+
 @item -w @var{number}
 @itemx --width=@var{number}
 @opindex -w@r{, @code{xgettext} option}
@@ -523,7 +587,7 @@ Set the reporting address for msgid bugs.  This is the email address or URL
 to which the translators shall report bugs in the untranslated strings:
 
 @itemize -
-@item Strings which are not entire sentences, see the maintainer guidelines
+@item Strings which are not entire sentences; see the maintainer guidelines
 in @ref{Preparing Strings}.
 @item Strings which use unclear terms or require additional context to be
 understood.
author	Lorry Tar Creator <lorry-tar-importer@lorry>	2015-12-28 00:06:36 +0000
committer	Lorry Tar Creator <lorry-tar-importer@lorry>	2015-12-28 00:06:36 +0000
commit	6eb5949dd99d174393465069c2fd0bab32deddcc (patch)
tree	d104f72ac2dcb0f592b1c8e06a5af6790bd4080c /gettext-tools/doc
parent	482840e61f86ca321838a91e902c41d40c098bbb (diff)
download	gettext-tarball-6eb5949dd99d174393465069c2fd0bab32deddcc.tar.gz